summaryrefslogtreecommitdiff
path: root/sql/sp_pcontext.h
diff options
context:
space:
mode:
authorunknown <pem@mysql.comhem.se>2004-09-02 17:24:25 +0200
committerunknown <pem@mysql.comhem.se>2004-09-02 17:24:25 +0200
commit339859d261ffaf3d588da247284680a3d4ec3104 (patch)
treecc966e471ebe1e3067e75ef8a5f30688101f8080 /sql/sp_pcontext.h
parent711e8879054f2499b00452762ade52430ce41c44 (diff)
downloadmariadb-git-339859d261ffaf3d588da247284680a3d4ec3104.tar.gz
Fixed BUG#5287: Stored procedure crash if leave outside loop.
Bug in diff_handlers and diff_cursors made it attempt to pop the wrong number at jumps sometimes. mysql-test/r/sp.result: New testcase for BUG#5287. mysql-test/t/sp.test: New testcase for BUG#5287. sql/sp_pcontext.cc: Fixed diff_handlers and diff_cursors methods, they miscounted. sql/sp_pcontext.h: Made m_handlers available for diff_handlers.
Diffstat (limited to 'sql/sp_pcontext.h')
-rw-r--r--sql/sp_pcontext.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sp_pcontext.h b/sql/sp_pcontext.h
index 6db62614aa5..36e4ed06aa7 100644
--- a/sql/sp_pcontext.h
+++ b/sql/sp_pcontext.h
@@ -275,6 +275,7 @@ protected:
uint m_psubsize;
uint m_csubsize;
uint m_hsubsize;
+ uint m_handlers; // No. of handlers in this context
private:
@@ -282,7 +283,6 @@ private:
uint m_poffset; // Variable offset for this context
uint m_coffset; // Cursor offset for this context
- uint m_handlers; // No. of handlers in this context
DYNAMIC_ARRAY m_pvar; // Parameters/variables
DYNAMIC_ARRAY m_cond; // Conditions