diff options
| author | Chad MILLER <chad@mysql.com> | 2008-12-11 12:26:03 -0500 |
|---|---|---|
| committer | Chad MILLER <chad@mysql.com> | 2008-12-11 12:26:03 -0500 |
| commit | d84690c92d165e0335da16a7e95b10ac5684420e (patch) | |
| tree | 3a6f45eb60eb44c5037ba8c027beb16f6091fa26 /mysql-test/r/mysql.result | |
| parent | d2cd545b53397f36572001def335cf75c86570cf (diff) | |
| download | mariadb-git-d84690c92d165e0335da16a7e95b10ac5684420e.tar.gz | |
Bug#33812: mysql client incorrectly parsing DELIMITER
Fix parsing of mysql client commands, especially in relation to
single-line comments when --comments was specified.
This is a little tricky, because we need to allow single-line
comments in the middle of statements, but we don't want to allow
client commands in the middle of statements. So in
comment-preservation mode, we go ahead and send single-line
comments to the server immediately when we encounter them on their
own.
This is still slightly flawed, in that it does not handle a
single-line comment with leading spaces, followed by a client-side
command when --comment has been enabled. But this isn't a new
problem, and it is quite an edge condition. Fixing it would require
a more extensive overall of how the mysql client parses commands.
Diffstat (limited to 'mysql-test/r/mysql.result')
| -rw-r--r-- | mysql-test/r/mysql.result | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result index eded1a3fc3b..95bdcab6ba1 100644 --- a/mysql-test/r/mysql.result +++ b/mysql-test/r/mysql.result @@ -180,4 +180,10 @@ ERROR at line 1: DELIMITER cannot contain a backslash character 1 This is a file starting with UTF8 BOM 0xEFBBBF This is a file starting with UTF8 BOM 0xEFBBBF +delimiter +1 +2 +2 +2 +2 End of 5.0 tests |