Removed references to ISAM and MERGE
Use LONG_TIMEOUT (one year) instead of ~0 for long timeouts Fixed error messages. Fixed problem with const propagation when comparing columns of different types
Fix bug in isamlog Add argument types to function declarations.