Cleanup merge issues in mysql-test/t/parser.test

ea2c408d · Marc Alff · b5a37f55 · ea2c408d · b5a37f55 · ea2c408d
Commit ea2c408d authored Jul 08, 2008 by Marc Alff
4 changed files
--- a/mysql-test/r/parser.result
+++ b/mysql-test/r/parser.result
--- a/mysql-test/r/parser.result.moved
+++ b/mysql-test/r/parser.result.moved
--- a/mysql-test/t/parser.test
+++ b/mysql-test/t/parser.test
--- a/mysql-test/t/parser.test.moved
+++ b/mysql-test/t/parser.test.moved