summaryrefslogtreecommitdiff
path: root/mysql-test/t/mysql.test
diff options
context:
space:
mode:
authorGeorgi Kodinov <kgeorge@mysql.com>2009-02-25 11:09:41 +0200
committerGeorgi Kodinov <kgeorge@mysql.com>2009-02-25 11:09:41 +0200
commit1a292ee535dc25611a5829d5594eddf9460c8898 (patch)
tree2f512709d536402bd08a4a5be7b918069a3088ac /mysql-test/t/mysql.test
parent592a05fdb51af3a09900dcaa69cbece2dc5ae145 (diff)
parent5cc8c6f380eae530ef80ed63c4809e5630516b4c (diff)
downloadmariadb-git-1a292ee535dc25611a5829d5594eddf9460c8898.tar.gz
merged bug 31060 to 5.1-bugteam
Diffstat (limited to 'mysql-test/t/mysql.test')
-rw-r--r--mysql-test/t/mysql.test17
1 files changed, 17 insertions, 0 deletions
diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test
index a182da5fbea..40e87ee1cb0 100644
--- a/mysql-test/t/mysql.test
+++ b/mysql-test/t/mysql.test
@@ -315,6 +315,23 @@ remove_file $MYSQLTEST_VARDIR/tmp/bug38158.sql;
#
--exec $MYSQL -e "select @z:='1',@z=database()"
+
+#
+# Bug #31060: MySQL CLI parser bug 2
+#
+
+--write_file $MYSQLTEST_VARDIR/tmp/bug31060.sql
+;DELIMITER DELIMITER
+;
+SELECT 1DELIMITER
+DELIMITER ;
+SELECT 1;
+EOF
+
+--exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug31060.sql 2>&1
+
+remove_file $MYSQLTEST_VARDIR/tmp/bug31060.sql;
+
--echo End of 5.0 tests
#