diff options
| author | unknown <dlenev@mysql.com> | 2005-03-04 17:46:45 +0300 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2005-03-04 17:46:45 +0300 |
| commit | b1095fb0cd0b42158f6ca3d8f157df5d23bec423 (patch) | |
| tree | bff7a84c42deaf288f2aee7fdb2011a47b92ba6c /sql/sp_rcontext.cc | |
| parent | d6949b3e9f8164e28bb24b7c1d948cdce12db005 (diff) | |
| parent | ac9f68b9fac716ebc09b9f31b4348b0db135519b (diff) | |
| download | mariadb-git-b1095fb0cd0b42158f6ca3d8f157df5d23bec423.tar.gz | |
Manual merge SP-locking improvements patch with current tree.
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_rcontext.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.h:
Auto merged
sql/sp_head.cc:
Manual merge.
sql/sql_class.cc:
Manual merge.
sql/sql_parse.cc:
Manual merge.
sql/sql_yacc.yy:
Manual merge.
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 |