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 | 8454773a97de2b40b1988676708b53f50d84e3ef (patch) | |
| tree | b1b9220fc9e099b361f84152b88dae41d33f35b2 /mysql-test/r/ps.result | |
| parent | 0a638f6b0d3324d1809e765839b397458942a1e3 (diff) | |
| parent | f3ff1aeb9c04c3cf26e1373f9a92fc2f2edcff4d (diff) | |
| download | mariadb-git-8454773a97de2b40b1988676708b53f50d84e3ef.tar.gz | |
Manual merge of bug#26030 in mysql-5.1-bugteam
Diffstat (limited to 'mysql-test/r/ps.result')
| -rw-r--r-- | mysql-test/r/ps.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result index 4cae3928097..05b2d18889b 100644 --- a/mysql-test/r/ps.result +++ b/mysql-test/r/ps.result @@ -85,9 +85,9 @@ NULL NULL NULL prepare stmt6 from 'select 1; select2'; -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 '; select2' 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 'select2' at line 1 prepare stmt6 from 'insert into t1 values (5,"five"); select2'; -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 '; select2' 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 'select2' at line 1 explain prepare stmt6 from 'insert into t1 values (5,"five"); select2'; 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 'from 'insert into t1 values (5,"five"); select2'' at line 1 create table t2 |