diff options
| author | unknown <jimw@mysql.com> | 2005-05-18 17:10:48 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-05-18 17:10:48 -0700 |
| commit | 38c78b8bb9ac4615ddb6f45ffb9a1ac0d217af0f (patch) | |
| tree | 25aac34fc009cf3cac472a840926494bb545a511 /sql/sp_rcontext.cc | |
| parent | 3e2988d00f8a8db9fbde6571c713e0284c3a373b (diff) | |
| download | mariadb-git-38c78b8bb9ac4615ddb6f45ffb9a1ac0d217af0f.tar.gz | |
Revert fix for Bug #6048: it introduced new problems.
sql/item.cc:
Revert changes
sql/item.h:
Revert changes
sql/sp_head.cc:
Revert changes
sql/sp_rcontext.cc:
Revert changes
Diffstat (limited to 'sql/sp_rcontext.cc')
| -rw-r--r-- | sql/sp_rcontext.cc | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/sql/sp_rcontext.cc b/sql/sp_rcontext.cc index fdffa7fb88d..672491a97f2 100644 --- a/sql/sp_rcontext.cc +++ b/sql/sp_rcontext.cc @@ -43,11 +43,8 @@ sp_rcontext::sp_rcontext(uint fsize, uint hmax, uint cmax) int sp_rcontext::set_item_eval(uint idx, Item **item_addr, enum_field_types type) { - extern Item *sp_eval_func_item(THD *thd, Item **it, enum_field_types type, - MEM_ROOT *mem_root, - Item *reuse); - THD *thd= current_thd; - Item *it= sp_eval_func_item(thd, item_addr, type, thd->mem_root, NULL); + extern Item *sp_eval_func_item(THD *thd, Item **it, enum_field_types type); + Item *it= sp_eval_func_item(current_thd, item_addr, type); if (! it) return -1; @@ -114,12 +111,7 @@ void sp_rcontext::save_variables(uint fp) { while (fp < m_count) - { - Item *it= m_frame[fp]; - - m_frame[fp++]= NULL; // Prevent reuse - m_saved.push_front(it); - } + m_saved.push_front(m_frame[fp++]); } void |