diff options
| author | dlenev@mysql.com <> | 2005-03-04 17:46:45 +0300 |
|---|---|---|
| committer | dlenev@mysql.com <> | 2005-03-04 17:46:45 +0300 |
| commit | 5b16dbf960f0abb90b5ddde001bc72f4efdcfa66 (patch) | |
| tree | bff7a84c42deaf288f2aee7fdb2011a47b92ba6c /sql/sp_rcontext.cc | |
| parent | 9e02be68c8cb0cb914d1de3d58611439c22dcdb2 (diff) | |
| parent | 5a6c7027f070aaa634051870d88bc185fed70878 (diff) | |
| download | mariadb-git-5b16dbf960f0abb90b5ddde001bc72f4efdcfa66.tar.gz | |
Manual merge SP-locking improvements patch with current tree.
Diffstat (limited to 'sql/sp_rcontext.cc')
| -rw-r--r-- | sql/sp_rcontext.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sp_rcontext.cc b/sql/sp_rcontext.cc index 5b177650726..9b29c173856 100644 --- a/sql/sp_rcontext.cc +++ b/sql/sp_rcontext.cc @@ -125,9 +125,9 @@ sp_rcontext::restore_variables(uint fp) } void -sp_rcontext::push_cursor(LEX *lex) +sp_rcontext::push_cursor(sp_lex_keeper *lex_keeper) { - m_cstack[m_ccount++]= new sp_cursor(lex); + m_cstack[m_ccount++]= new sp_cursor(lex_keeper); } void @@ -148,7 +148,7 @@ sp_rcontext::pop_cursors(uint count) // We have split this in two to make it easy for sp_instr_copen // to reuse the sp_instr::exec_stmt() code. -LEX * +sp_lex_keeper* sp_cursor::pre_open(THD *thd) { if (m_isopen) @@ -168,7 +168,7 @@ sp_cursor::pre_open(THD *thd) m_nseof= thd->net.no_send_eof; thd->net.no_send_eof= TRUE; - return m_lex; + return m_lex_keeper; } void |