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

6affa021 · Marc Alff · d61bc87c · 6affa021 · d61bc87c · 6affa021
Commit 6affa021 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