summaryrefslogtreecommitdiff
path: root/sql/sp_rcontext.h
diff options
context:
space:
mode:
authorunknown <pem@mysql.comhem.se>2004-09-10 11:11:52 +0200
committerunknown <pem@mysql.comhem.se>2004-09-10 11:11:52 +0200
commit1912148cec19f4a20eddae9d0143124909872173 (patch)
tree177a307bee403859b893521b666bfd245cbef01f /sql/sp_rcontext.h
parent862e78568e43272002dea1a12ff62e3d097be558 (diff)
downloadmariadb-git-1912148cec19f4a20eddae9d0143124909872173.tar.gz
Fixed BUG#3294: Stored procedure crash if table dropped before use.
Dropping the table was not the real problem, the problem was with errors occuring within error handlers. mysql-test/r/sp-error.result: New test case for BUG#3294. mysql-test/t/sp-error.test: New test case for BUG#3294. sql/sp_head.cc: Use hreturn instruction both for continue and exit handlers (a special case of a jump). sql/sp_head.h: Use hreturn instruction both for continue and exit handlers (a special case of a jump). sql/sp_rcontext.cc: Keep track on if we're in a handler already, for error handling. sql/sp_rcontext.h: Keep track on if we're in a handler already, for error handling. sql/sql_yacc.yy: Use hreturn instruction both for continue and exit handlers (a special case of a jump).
Diffstat (limited to 'sql/sp_rcontext.h')
-rw-r--r--sql/sp_rcontext.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sp_rcontext.h b/sql/sp_rcontext.h
index 15a2fe62138..f26b6760310 100644
--- a/sql/sp_rcontext.h
+++ b/sql/sp_rcontext.h
@@ -46,6 +46,8 @@ class sp_rcontext : public Sql_alloc
public:
+ bool in_handler;
+
sp_rcontext(uint fsize, uint hmax, uint cmax);
~sp_rcontext()