From: Dmitry Shulga
Date: November 10 2010 6:04am
Subject: bzr push into mysql-trunk-bugfixing branch (Dmitry.Shulga:3343 to 3344)
 Bug#57386
List-Archive: http://lists.mysql.com/commits/123359
X-Bug: 57386
Message-Id: <201011100605.oAA4wRCw006483@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0065079216=="

--===============0065079216==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

 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


--===============0065079216==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/dmitry.shulga@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dmitry.shulga@stripped\
#   dy1uac9y802b9i5j
# target_branch: file:///Users/shulga/projects/mysql/mysql-trunk-\
#   bugfixing/
# testament_sha1: d3592f228c0765514ded93e31706becbb8418e07
# timestamp: 2010-11-10 12:05:02 +0600
# source_branch: file:///Users/shulga/projects/mysql/mysql-5.5-\
#   bugteam/
# base_revision_id: davi.arnaut@stripped\
#   9v5zp68j3dq6ngju
# 
# Begin bundle
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
Gc9I73sc/SujMlrxf/F3JFOFCQnZmc3g


--===============0065079216==--