diff options
| author | unknown <pem@mysql.comhem.se> | 2005-04-27 16:35:49 +0200 |
|---|---|---|
| committer | unknown <pem@mysql.comhem.se> | 2005-04-27 16:35:49 +0200 |
| commit | 5c44e1acfeebe5e49b32add9a4a19aaf33892455 (patch) | |
| tree | 5959438e6d5f2b1065dacbc28ea4beb9bca2bc9b /mysql-test/t/sp-error.test | |
| parent | 52cb1bc4ff95c76f4327f6158522b293b831ca34 (diff) | |
| download | mariadb-git-5c44e1acfeebe5e49b32add9a4a19aaf33892455.tar.gz | |
Post-review fixes of the patch for BUG#8408: Stored procedure crash if function contains SHOW
(Review on irc by monty)
mysql-test/r/sp-error.result:
Renamed a procedure and function to avoid confusion
mysql-test/t/sp-error.test:
Renamed a procedure and function to avoid confusion
sql/item_func.cc:
Corrected (and better) way to set/reset the client cap. flag in Item_func_sp::execute()
sql/share/errmsg.txt:
Changed the ER_SP_BADSELECT error; more accurate, and includes the procedure name.
sql/sql_parse.cc:
Include the procedure name in the new error message.
Diffstat (limited to 'mysql-test/t/sp-error.test')
| -rw-r--r-- | mysql-test/t/sp-error.test | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/mysql-test/t/sp-error.test b/mysql-test/t/sp-error.test index b2d24167e49..ff317b4ac28 100644 --- a/mysql-test/t/sp-error.test +++ b/mysql-test/t/sp-error.test @@ -835,10 +835,6 @@ end| # BUG#8408: Stored procedure crash if function contains SHOW # BUG#9058: Stored Procedures: Crash if function included SELECT # ---disable_warnings -drop function if exists bug8408| -drop procedure if exists bug8408| ---enable_warnings # Some things are caught when parsing --error ER_SP_NO_RETSET_IN_FUNC @@ -861,21 +857,26 @@ begin return b; end| +--disable_warnings +drop function if exists bug8408_f| +drop procedure if exists bug8408_p| +--enable_warnings + # Some things must be caught at invokation time -create function bug8408() returns int +create function bug8408_f() returns int begin - call bug8408(); + call bug8408_p(); return 0; end| -create procedure bug8408() +create procedure bug8408_p() select * from t1| -call bug8408()| +call bug8408_p()| --error ER_SP_BADSELECT -select bug8408()| +select bug8408_f()| -drop procedure bug8408| -drop function bug8408| +drop procedure bug8408_p| +drop function bug8408_f| # But this is ok create function bug8408() returns int |