database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Manual-merge from 5.5-bugfixing.

Browse Source
This commit is contained in:
Ramil Kalimullin
2010-11-18 15:01:50 +03:00
parent 52e8885269 c45458524c
commit 3bae49d64c
386 changed files with 5695 additions and 22684 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/item_func.cc
View File

@@ -178,7 +178,14 @@ Item_func::fix_fields(THD *thd, Item **ref)
used_tables_cache= not_null_tables_cache= 0;
const_item_cache=1;
if (check_stack_overrun(thd, STACK_MIN_SIZE, buff))
/*
Use stack limit of STACK_MIN_SIZE * 2 since
on some platforms a recursive call to fix_fields
requires more than STACK_MIN_SIZE bytes (e.g. for
MIPS, it takes about 22kB to make one recursive
call to Item_func::fix_fields())
*/
if (check_stack_overrun(thd, STACK_MIN_SIZE * 2, buff))
return TRUE; // Fatal error if flag is set!
if (arg_count)
{ // Print purify happy