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 | 85ea3740ffa44454d7d3cb03f90857bfa43d2aad (patch) | |
| tree | 5deae5f5ce529703811f67d6e212ae96f2f48974 /mysql-test/t/mysql.test | |
| parent | a6ac350b3aacb277a15b8c2b03da4af049556bec (diff) | |
| download | mariadb-git-85ea3740ffa44454d7d3cb03f90857bfa43d2aad.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/t/mysql.test')
| -rw-r--r-- | mysql-test/t/mysql.test | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test index 68a01a309d4..594d10e46a5 100644 --- a/mysql-test/t/mysql.test +++ b/mysql-test/t/mysql.test @@ -314,4 +314,21 @@ 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 |