Fix some bugs.  The tests innodb and innodb-index fail, but that might
be due to an old MySQL source tree being used.