diff options
author | unknown <sergefp@mysql.com> | 2004-06-07 12:09:10 +0400 |
---|---|---|
committer | unknown <sergefp@mysql.com> | 2004-06-07 12:09:10 +0400 |
commit | 2f9a9e553239e0c4d00f81f0989e0622cc26fe6d (patch) | |
tree | d9e21b580f2c05293aaca3cb0c7ad13a850f0bad /mysql-test/r/ps.result | |
parent | 6fa41b0ab5c7b71dd437a526a507c4af57ec4c3d (diff) | |
download | mariadb-git-2f9a9e553239e0c4d00f81f0989e0622cc26fe6d.tar.gz |
Post review fixes for "SQL Syntax for Prepared Statements".
mysql-test/r/ps.result:
Better error message
mysys/my_error.c:
Comments added
sql/item.cc:
Moved a chunk of code from sql_prepare.cc to Item_param::set_from_user_var
sql/item.h:
Moved a chunk of code from sql_prepare.cc to Item_param::set_from_user_var
sql/item_func.cc:
Code cleanup
sql/mysql_priv.h:
Code cleanup
sql/sql_class.cc:
Code cleanup
sql/sql_parse.cc:
use user_var_entry::val_str in PREPARE stmt FROM @var.
sql/sql_prepare.cc:
Post-review fixes and code cleanup.
sql/sql_yacc.yy:
Coding style fixes
Diffstat (limited to 'mysql-test/r/ps.result')
-rw-r--r-- | mysql-test/r/ps.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result index 6c228327b8d..ccf855a927b 100644 --- a/mysql-test/r/ps.result +++ b/mysql-test/r/ps.result @@ -23,7 +23,7 @@ a b deallocate prepare no_such_statement; ERROR HY000: Unknown prepared statement handler (no_such_statement) given to DEALLOCATE PREPARE execute stmt1; -ERROR HY000: Wrong arguments to mysql_execute +ERROR HY000: Wrong arguments to EXECUTE prepare stmt2 from 'prepare nested_stmt 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 prepare stmt2 from 'execute stmt1'; |