mysql-test fixes