From 38c78b8bb9ac4615ddb6f45ffb9a1ac0d217af0f Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 18 May 2005 17:10:48 -0700 Subject: 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 --- sql/sp_rcontext.cc | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'sql/sp_rcontext.cc') 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 -- cgit v1.2.1