diff options
| author | unknown <pem@mysql.comhem.se> | 2005-03-30 17:43:52 +0200 |
|---|---|---|
| committer | unknown <pem@mysql.comhem.se> | 2005-03-30 17:43:52 +0200 |
| commit | 66b71ca3785fe9f3dd93c2debeafb5cb19e34bdf (patch) | |
| tree | 60e2dfa1271b73f59fda7362c9be680275cbe247 /sql/share | |
| parent | 3a44dcd1a3b8b9e23200c3527bb43850ffdb8ece (diff) | |
| download | mariadb-git-66b71ca3785fe9f3dd93c2debeafb5cb19e34bdf.tar.gz | |
Fixed BUG#6600: Stored procedure crash after repeated calls with check table.
Sedond attempt: Simply disallow CHECK in SPs, since it can't work.
mysql-test/r/sp-error.result:
New test cast for BUG#6600
mysql-test/r/sp.result:
Removed old test case for BUG#6600
mysql-test/t/sp-error.test:
New test cast for BUG#6600
mysql-test/t/sp.test:
Removed old test case for BUG#6600
sql/share/errmsg.txt:
Made the SP bad statement error message more general.
sql/sp_head.cc:
CHECK is not possible in stored procedures.
sql/sql_parse.cc:
Undid attempt to fix CHECK in stored procedures, it didn't work.
sql/sql_yacc.yy:
CHECK is not possible in stored procedures.
(And updated error messages for LOCK/UNLOCK.)
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 7249605f10c..5f84395e201 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -5094,7 +5094,7 @@ ER_SP_BADSELECT 0A000 ER_SP_BADRETURN 42000 eng "RETURN is only allowed in a FUNCTION" ER_SP_BADSTATEMENT 0A000 - eng "LOCK and UNLOCK tables are not allowed in stored procedures" + eng "%s is not allowed in stored procedures" ER_UPDATE_LOG_DEPRECATED_IGNORED 42000 eng "The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored" ER_UPDATE_LOG_DEPRECATED_TRANSLATED 42000 |