mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 04:53:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse source 
into rurik.mysql.com:/home/igor/mysql-5.0
This commit is contained in:
igor@rurik.mysql.com 2005-06-28 12:04:46 -07:00
commit 230fe0d77e
2 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sql/opt_range.cc
View file

@ -3703,7 +3703,7 @@ get_mm_leaf(PARAM *param, COND *conf_func, Field *field, KEY_PART *key_part,
/*
We need to restore the runtime mem_root of the thread in this
function becuase it evaluates the value of its argument, while
function because it evaluates the value of its argument, while
the argument can be any, e.g. a subselect. The subselect
items, in turn, assume that all the memory allocated during
the evaluation has the same life span as the item itself.

7
sql/sp_head.cc
View file

@ -1474,13 +1474,6 @@ sp_lex_keeper::reset_lex_and_exec_core(THD *thd, uint *nextp,
they want to store some value in local variable, pass return value and
etc... So their life time should be longer than one instruction.
Probably we can call destructors for most of them then we are leaving
routine. But this won't help much as they are allocated in main query
MEM_ROOT anyway. So they all go to global thd->free_list.
May be we can use some other MEM_ROOT for this purprose ???
What else should we do for cleanup ?
cleanup_items() is called in sp_head::execute()
*/
return res;