summaryrefslogtreecommitdiff
path: root/mysql-test/t/mysql.test
diff options
context:
space:
mode:
authorChad MILLER <chad@mysql.com>2008-12-11 12:46:20 -0500
committerChad MILLER <chad@mysql.com>2008-12-11 12:46:20 -0500
commita633e0b98d0dbd5aab04901856dfd717b916a508 (patch)
tree186a712bab08112017b7d95af55abc0a8847fea6 /mysql-test/t/mysql.test
parent32c1790ba873d528e36b3b6bef34cc7c0cf20362 (diff)
parentd84690c92d165e0335da16a7e95b10ac5684420e (diff)
downloadmariadb-git-a633e0b98d0dbd5aab04901856dfd717b916a508.tar.gz
Merge fix for Bug 33812 from 5.0-bugteam.
Diffstat (limited to 'mysql-test/t/mysql.test')
-rw-r--r--mysql-test/t/mysql.test19
1 files changed, 19 insertions, 0 deletions
diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test
index 528337da77b..f17613a68a5 100644
--- a/mysql-test/t/mysql.test
+++ b/mysql-test/t/mysql.test
@@ -291,6 +291,25 @@ EOF
--exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug29323.sql 2>&1
remove_file $MYSQLTEST_VARDIR/tmp/bug29323.sql;
+#
+# Bug #33812: mysql client incorrectly parsing DELIMITER
+#
+# The space and ; after delimiter are important
+--exec $MYSQL -e "select 1 delimiter ;"
+
+#
+# Bug #38158: mysql client regression, can't read dump files
+#
+--write_file $MYSQLTEST_VARDIR/tmp/bug38158.sql
+-- Testing
+--
+delimiter ||
+select 2 ||
+EOF
+--exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug38158.sql 2>&1
+--exec $MYSQL -c < $MYSQLTEST_VARDIR/tmp/bug38158.sql 2>&1
+remove_file $MYSQLTEST_VARDIR/tmp/bug38158.sql;
+
--echo End of 5.0 tests
#