diff options
| author | unknown <kostja@vajra.(none)> | 2007-05-11 17:41:07 +0400 |
|---|---|---|
| committer | unknown <kostja@vajra.(none)> | 2007-05-11 17:41:07 +0400 |
| commit | e62766aea173c4dea4ebcecc402f122540caf0d9 (patch) | |
| tree | 12c1c0ecc66bd6dd5b19946a64a7d21f77c68358 /mysql-test/r/ps_1general.result | |
| parent | e8bf1bad3d3b81cd51a6d2e458dfbf25dee6135c (diff) | |
| parent | a0567199b118f14ec346249d91aabe2ee5d99354 (diff) | |
| download | mariadb-git-e62766aea173c4dea4ebcecc402f122540caf0d9.tar.gz | |
Merge vajra.(none):/opt/local/work/mysql-5.0-runtime
into vajra.(none):/opt/local/work/mysql-5.1-runtime
mysql-test/r/ps.result:
Auto merged
mysql-test/r/ps_1general.result:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysql-test/t/ps_1general.test:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/sql_prepare.cc:
Manual merge.
Diffstat (limited to 'mysql-test/r/ps_1general.result')
| -rw-r--r-- | mysql-test/r/ps_1general.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/ps_1general.result b/mysql-test/r/ps_1general.result index 391d22d232b..14ceac687a8 100644 --- a/mysql-test/r/ps_1general.result +++ b/mysql-test/r/ps_1general.result @@ -374,11 +374,11 @@ drop table t5 ; deallocate prepare stmt_do ; deallocate prepare stmt_set ; prepare stmt1 from ' prepare stmt2 from '' select 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 '' select 1 '' at line 1 +ERROR HY000: This command is not supported in the prepared statement protocol yet prepare stmt1 from ' execute stmt2 ' ; -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 'stmt2' at line 1 +ERROR HY000: This command is not supported in the prepared statement protocol yet prepare stmt1 from ' deallocate prepare never_prepared ' ; -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 'never_prepared' at line 1 +ERROR HY000: This command is not supported in the prepared statement protocol yet prepare stmt4 from ' use test ' ; ERROR HY000: This command is not supported in the prepared statement protocol yet prepare stmt3 from ' create database mysqltest '; |