summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorDavi Arnaut <Davi.Arnaut@Sun.COM>2008-07-17 20:19:13 -0300
committerDavi Arnaut <Davi.Arnaut@Sun.COM>2008-07-17 20:19:13 -0300
commit6256bf17b88da0b0e04f5223d67714e687e3738d (patch)
tree397344fc1bf4d9b12ab7298dbb0373a39b84c1f6 /mysql-test
parent2ade957b074c1773deae28fff8608b552fdce10b (diff)
downloadmariadb-git-6256bf17b88da0b0e04f5223d67714e687e3738d.tar.gz
Bug#33812: mysql client incorrectly parsing DELIMITER
Revert fix for this bug as it introduced a regression reported in Bug#38158. client/mysql.cc: Revert fix for Bug#33812 mysql-test/r/mysql.result: Revert fix for Bug#33812 mysql-test/t/mysql_delimiter.sql: Revert fix for Bug#33812
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/mysql.result2
-rw-r--r--mysql-test/t/mysql_delimiter.sql6
2 files changed, 0 insertions, 8 deletions
diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result
index bc50c686ac6..eded1a3fc3b 100644
--- a/mysql-test/r/mysql.result
+++ b/mysql-test/r/mysql.result
@@ -38,8 +38,6 @@ t2
t3
Tables_in_test
t1
-delimiter
-1
_
Test delimiter : from command line
a
diff --git a/mysql-test/t/mysql_delimiter.sql b/mysql-test/t/mysql_delimiter.sql
index 917401275a2..533ac2ce093 100644
--- a/mysql-test/t/mysql_delimiter.sql
+++ b/mysql-test/t/mysql_delimiter.sql
@@ -61,12 +61,6 @@ show tables//
delimiter ; # Reset delimiter
#
-# Bug #33812: mysql client incorrectly parsing DELIMITER
-#
-select a as delimiter from t1
-delimiter ; # Reset delimiter
-
-#
# Bug #36244: MySQL CLI doesn't recognize standalone -- as comment
# before DELIMITER statement
#