diff options
| author | unknown <konstantin@mysql.com> | 2005-06-07 14:50:45 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2005-06-07 14:50:45 +0400 |
| commit | edb38786c9c5af2a1d48b524c6c292271ce8ee81 (patch) | |
| tree | d468527d5a1d3495eeb23ba14c41ce8980271729 /sql/sp_head.cc | |
| parent | c7787f8af1be3b64e22fd00659b453972b94476c (diff) | |
| parent | 5188f031ae9b8b7eca9092b82d454a567154737a (diff) | |
| download | mariadb-git-edb38786c9c5af2a1d48b524c6c292271ce8ee81.tar.gz | |
Manual merge.
sql/item.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index 1e5bd5b5b8c..f3459e5b104 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -319,7 +319,7 @@ sp_head::sp_head() *sp_lex_sp_key(const byte *ptr, uint *plen, my_bool first); DBUG_ENTER("sp_head::sp_head"); - state= INITIALIZED; + state= INITIALIZED_FOR_SP; m_backpatch.empty(); m_lex.empty(); hash_init(&m_sptabs, system_charset_info, 0, 0, 0, sp_table_key, 0, 0); @@ -1077,7 +1077,7 @@ sp_head::restore_thd_mem_root(THD *thd) DBUG_ENTER("sp_head::restore_thd_mem_root"); Item *flist= free_list; // The old list set_item_arena(thd); // Get new free_list and mem_root - state= INITIALIZED; + state= INITIALIZED_FOR_SP; DBUG_PRINT("info", ("mem_root 0x%lx returned from thd mem root 0x%lx", (ulong) &mem_root, (ulong) &thd->mem_root)); |