fixed merge conflicts in mysql_test.sql