From: Dmitry Shulga
Date: November 10 2010 5:49am
Subject: bzr commit into mysql-5.1-bugteam branch (Dmitry.Shulga:3501) Bug#57386
List-Archive: http://lists.mysql.com/commits/123355
X-Bug: 57386
Message-Id: <201011100550.oA9NFdTj019621@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2101621986=="

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

#At file:///Users/shulga/projects/mysql/5.1-bugteam-bug57386/ based on revid:davi.arnaut@stripped

 3501 Dmitry Shulga	2010-11-10
      Fixed Bug#57386 - main.execution_constants segfault on MIPS64EL.
     @ sql/item_func.cc
        Item_func::fix_fields modified: increased minimal required stack
        size in call to check_stack_overrun().

    modified:
      sql/item_func.cc
=== modified file 'sql/item_func.cc'
--- a/sql/item_func.cc	2010-10-05 08:11:56 +0000
+++ b/sql/item_func.cc	2010-11-10 05:49:37 +0000
@@ -157,7 +157,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


--===============2101621986==
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\
#   qqndtntsaes91tpl
# target_branch: file:///Users/shulga/projects/mysql/5.1-bugteam-\
#   bug57386/
# testament_sha1: de21acc14a47b63917fd1266938e49878186ccf7
# timestamp: 2010-11-10 11:49:45 +0600
# base_revision_id: davi.arnaut@stripped\
#   jyd3wxt6xhgbhqgr
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUdQAe8AAcLfgEAQWHf/938v
ThC////wUASGvHSTQuwAAMkgTEYU9T02oxQ8UzRDQBtJtTNIaBlTRo0yDTSniI2p6j0nqPUwQyDQ
ADDVMSfpNCGI9TIMgA00ABoAAOYTAJgBMJhNMAAAmTTQMJJAmgmCDIhoxAak9DQBDQwRR80Emd1N
+4c2pOMLwwenlcFDLsQAnWppnMw1fISWABdkftDTqTbciIg4Xjky6hlDEVjSmm92+h6OpVEgYkZn
cRLJmluFibLAonRCsKtoOH7iAS31JUQOliaSCzDEWOUHMGOkUKylY7adQ0NmXLtYjPEEQ9JVXBmX
Ae88NAOeK2bXOtxyhaUaEj43uhEXlsIvjsM4oubW1iclvg98bkyBwkzKbXkNQwnjZweoxUqQgoUx
JwapHjwfATIXjJym4grTLS8UkHXyjLoqlcV4LMpXLUm/2u3DSa26shTXZhH1FwQGsmdkQaqQaoRQ
GyAhmK1JGKlLsLAudN9EA20X8Y79X6V1KmWpxvqGfX078KdP6YTiimZJsgmrlKuzFh+DtRdY8LFN
4n4uTt1BDGJL8Tx7NJbBfeLx+woBvNwaKt2KYIzaxyxWcJ3Z4XuJggRfZodxxTlTVroUYm0K5zkL
XwUMMtISb5phILy9cbQ1NjnzK6c0rfmTgcI4UuqqHaNUWqtwZddq8xNDcLZbBUWJn21NAshOg0DO
vcSwgqXX7x9r3RqePJuUHTZxojIKKW0+ht6K842EGrZs54jYTyNeN4oie0G4ru/C4tnAi0qxXl79
N7OBH4IJ4eFKlJfdfhdPmtyWD9rkZHP6QHntu1RDiQS7z9yhP6svkkWcDnaLqYiGBQ319ap0xwod
XYjcqKj2Qd7qlzXp67fSD/PdqNyvfn9BvUFYaEWnmrIFNpGRypPZsD2jR+dTumj7WJ7G4ZImkY+U
4pb9Gnr+HyVhNdck7lVE4zS/ZNGoVC4fAqCOwl+AFv5MHXnRy3XpdXqbANKZX9OkpxQMDuMuutRC
U7gIC2yo4MJhA8hap476ExpM/IG4XmuLR/51qwSrNyZaWM8o6JHY+6iwVWaeGmS5wjv3ZBTxvMXY
uHc6DxqMG8F8+3wbyGO3ePT9dKdNKrY28DktQpY7cO9T08bW3g4pedq7l7pCbYqOC6HF1xl57AbE
JZ9SeiUDKJsudxC6rhX478pUqxtpqCmznYucEFBivy4xkugP78HBrdS7IOHNciFSccRuoNAQcvZD
N67y1IZQyA2VhteVeQiDUpSJ9ihGsgRb8nWLVtn30FNJUZquiLnWjObPvTJypmpJSoZGwUhxuY7a
IYohR2Cenq94Ngcp6M0jczt1KHeqEkU/lIrCuyAdMFd4+HAneFu5mB5RsClEWqylRVqXkqyoU61m
K8dk5OSV7ZmvAyfQh+cL+yBOrW5YtSt2yN+KmbBp7TNTeMk2+O1nNBzhOSmO/Wi7Aya7kKGoLjVG
w0NLv72qrb4K4kUjsooxV+u/uaVfFSkoPNYWMO6Jo+Zj76Cysd/Hvf0bcS/MUwvDBegmvAabIHZT
nx+LHadwHC+sclo7jCKdm/Yri9PJLpDPZzFoVipUmiuhc1BalOYzIHu/a1TVlSl/4u5IpwoSCOoA
PeA=


--===============2101621986==--