bzr push into mysql-trunk-bugfixing branch (Dmitry.Shulga:3343 to 3344) Bug#57386

[Dmitry Shulga]

 3344 Dmitry Shulga	2010-11-10 [merge]
      Auto-merge from 5.5-bugteam for bug#57386.

    modified:
      sql/item_func.cc
 3343 Davi Arnaut	2010-11-09 [merge]
      Merge of mysql-5.5-bugteam into mysql-trunk-bugfixing.

    modified:
      sql/mysqld.cc
=== modified file 'sql/item_func.cc'
--- a/sql/item_func.cc	2010-10-27 07:31:36 +0000
+++ b/sql/item_func.cc	2010-11-10 06:02:11 +0000
@@ -178,7 +178,14 @@ Item_func::fix_fields(THD *thd, Item **r
   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


Attachment: [text/bzr-bundle] bzr/[e-mail]