Fix mysql-test errors. refs #1909