1.8

These changes are required to support INNODB. ISAM will still work