diff options
| author | Marc Alff <marc.alff@sun.com> | 2008-07-07 15:53:20 -0600 |
|---|---|---|
| committer | Marc Alff <marc.alff@sun.com> | 2008-07-07 15:53:20 -0600 |
| commit | e59c5656ff41a1ef2c9f9c0db3d113cf56b760c1 (patch) | |
| tree | b1b9220fc9e099b361f84152b88dae41d33f35b2 /mysql-test/r/comments.result | |
| parent | 574eefeb9de6cc857a97ad5653c782f9ec5c7870 (diff) | |
| parent | 2b28546787eaaf705e1246efe4a6e076c9d9ad8a (diff) | |
| download | mariadb-git-e59c5656ff41a1ef2c9f9c0db3d113cf56b760c1.tar.gz | |
Manual merge of bug#26030 in mysql-5.1-bugteam
Diffstat (limited to 'mysql-test/r/comments.result')
| -rw-r--r-- | mysql-test/r/comments.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/comments.result b/mysql-test/r/comments.result index d8ac68e2468..99fab38d7a7 100644 --- a/mysql-test/r/comments.result +++ b/mysql-test/r/comments.result @@ -45,7 +45,7 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp prepare bar from "DELETE FROM table_28779 WHERE a = 7 OR 1=1/*! AND 2=2;"; ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 prepare bar from "DELETE FROM table_28779 WHERE a = 7 OR 1=1/*! AND 2=2;*"; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ';*' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '*' at line 1 prepare bar from "DELETE FROM table_28779 WHERE a = 7 OR 1=1/*!98765' AND b = 'bar';"; ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '/*!98765' AND b = 'bar'' at line 1 prepare bar from "DELETE FROM table_28779 WHERE a = 7 OR 1=1/*!98765' AND b = 'bar';*"; |