diff options
| author | unknown <pem@mysql.comhem.se> | 2005-04-13 16:57:49 +0200 |
|---|---|---|
| committer | unknown <pem@mysql.comhem.se> | 2005-04-13 16:57:49 +0200 |
| commit | d6c2a1e3d8cb9da48c3d14986b4d02f1cf12031e (patch) | |
| tree | 7b911d75bd5db9fbffd74cc460dc524d0e244efb /sql/sp_pcontext.h | |
| parent | a3aed4d8dcbef5ed21dfc99c973301260bc37531 (diff) | |
| download | mariadb-git-d6c2a1e3d8cb9da48c3d14986b4d02f1cf12031e.tar.gz | |
Fixed BUG#9856: Stored procedures: crash if handler for sqlexception, not found.
mysql-test/r/sp.result:
Added test case for BUG#6129.
mysql-test/t/sp.test:
Added test case for BUG#6129.
sql/sp_pcontext.h:
Only need one handler counter.
sql/sql_yacc.yy:
Count handlers correctly.
Diffstat (limited to 'sql/sp_pcontext.h')
| -rw-r--r-- | sql/sp_pcontext.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sql/sp_pcontext.h b/sql/sp_pcontext.h index dbce191975a..749b99dcf14 100644 --- a/sql/sp_pcontext.h +++ b/sql/sp_pcontext.h @@ -236,12 +236,6 @@ class sp_pcontext : public Sql_alloc // inline void - add_handler() - { - m_handlers+= 1; - } - - inline void push_handler(sp_cond_type_t *cond) { insert_dynamic(&m_handler, (gptr)&cond); @@ -257,7 +251,7 @@ class sp_pcontext : public Sql_alloc } inline void - push_handlers(uint n) + add_handlers(uint n) { m_handlers+= n; } |