diff options
author | Georgi Kodinov <kgeorge@mysql.com> | 2009-02-24 15:06:28 +0200 |
---|---|---|
committer | Georgi Kodinov <kgeorge@mysql.com> | 2009-02-24 15:06:28 +0200 |
commit | 4b05db5cfdfa9d56c7185a8c03ddfaaf4333c963 (patch) | |
tree | 4dfe81a1565d1d9d7fc393906b204b3d46836353 /mysql-test/r/mysql.result | |
parent | 315748a41d5de1ee49e9a2dfaccd4f7dcbbfb8c4 (diff) | |
download | mariadb-git-4b05db5cfdfa9d56c7185a8c03ddfaaf4333c963.tar.gz |
Bug #31060: MySQL CLI parser bug 2
There was a problem when a DELIMITER COMMAND is not the first
command on the line. I this case an extra line feed was added
to the glob buffer and this was causing subsequent attempts
to enter this delimiter to fail.
Fixed by not adding a new line to the glob buffer if the
command being added is a DELIMITER
client/mysql.cc:
Bug #31060: Don't add a new line if DELIMTER is added to
the glob buffer
mysql-test/r/mysql.result:
Bug #31060: test case
mysql-test/t/mysql.test:
Bug #31060: test case
Diffstat (limited to 'mysql-test/r/mysql.result')
-rw-r--r-- | mysql-test/r/mysql.result | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result index 9bad3b9f791..10537f6da16 100644 --- a/mysql-test/r/mysql.result +++ b/mysql-test/r/mysql.result @@ -188,4 +188,8 @@ delimiter 2 @z:='1' @z=database() 1 NULL +1 +1 +1 +1 End of 5.0 tests |