diff options
| author | unknown <konstantin@mysql.com> | 2006-06-26 18:49:20 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2006-06-26 18:49:20 +0400 |
| commit | 313b46a0d26c767706bea9c735bd1a968fc49780 (patch) | |
| tree | 3eb6b8b9518132d253033187b9da41802a846746 /sql/sp_head.cc | |
| parent | fee803af179a3adc89f5e87511489bf44df527dd (diff) | |
| parent | 0f0e518e74d91804504af52cf280c566823f6699 (diff) | |
| download | mariadb-git-313b46a0d26c767706bea9c735bd1a968fc49780.tar.gz | |
Merge mysql.com:/opt/local/work/tmp_merge
into mysql.com:/opt/local/work/mysql-5.1-runtime
mysql-test/r/sp-prelocking.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
Auto merged
strings/ctype-mb.c:
Auto merged
mysql-test/t/sp-prelocking.test:
Manual merge.
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index b3c35ad5022..88460337526 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -1091,7 +1091,6 @@ sp_head::execute(THD *thd) thd->net.no_send_error= 0; if (i->free_list) cleanup_items(i->free_list); - i->state= Query_arena::EXECUTED; /* If we've set thd->user_var_events_alloc to mem_root of this SP @@ -2252,6 +2251,9 @@ sp_lex_keeper::reset_lex_and_exec_core(THD *thd, uint *nextp, m_lex->mark_as_requiring_prelocking(NULL); } thd->rollback_item_tree_changes(); + /* Update the state of the active arena. */ + thd->stmt_arena->state= Query_arena::EXECUTED; + /* Unlike for PS we should not call Item's destructors for newly created |