From fda325b943dd56a3762e062570cf081472b046f4 Mon Sep 17 00:00:00 2001
From: "pem@mysql.comhem.se" <>
Date: Thu, 30 Jun 2005 18:07:06 +0200
Subject: Fixed BUG#11529: crash server after use stored procedure Make sure to
 cleanup the items for a cursor query after each open, otherwise it's done too
 late, after the run-time mem_root is freed.

---
 sql/sp_rcontext.cc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'sql/sp_rcontext.cc')

diff --git a/sql/sp_rcontext.cc b/sql/sp_rcontext.cc
index aacb9254753..d0817e43790 100644
--- a/sql/sp_rcontext.cc
+++ b/sql/sp_rcontext.cc
@@ -148,9 +148,9 @@ sp_rcontext::restore_variables(uint fp)
 }
 
 void
-sp_rcontext::push_cursor(sp_lex_keeper *lex_keeper)
+sp_rcontext::push_cursor(sp_lex_keeper *lex_keeper, sp_instr_cpush *i)
 {
-  m_cstack[m_ccount++]= new sp_cursor(lex_keeper);
+  m_cstack[m_ccount++]= new sp_cursor(lex_keeper, i);
 }
 
 void
@@ -169,8 +169,9 @@ sp_rcontext::pop_cursors(uint count)
  *
  */
 
-sp_cursor::sp_cursor(sp_lex_keeper *lex_keeper)
-  :m_lex_keeper(lex_keeper), m_prot(NULL), m_isopen(0), m_current_row(NULL)
+sp_cursor::sp_cursor(sp_lex_keeper *lex_keeper, sp_instr_cpush *i)
+  :m_lex_keeper(lex_keeper), m_prot(NULL), m_isopen(0), m_current_row(NULL),
+   m_i(i)
 {
   /*
     currsor can't be stored in QC, so we should prevent opening QC for
-- 
cgit v1.2.1