From: Dmitry Shulga
Date: November 9 2010 3:47am
Subject: bzr commit into mysql-5.1-bugteam branch (Dmitry.Shulga:3499) Bug#57386
List-Archive: http://lists.mysql.com/commits/123163
X-Bug: 57386
Message-Id: <201011090348.oA8GWAef002701@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0308029384=="

--===============0308029384==
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:horst.hunger@stripped

 3499 Dmitry Shulga	2010-11-09
      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-09 03:47:08 +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


--===============0308029384==
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\
#   sw4ob5e2ruo6mfz2
# target_branch: file:///Users/shulga/projects/mysql/5.1-bugteam-\
#   bug57386/
# testament_sha1: ba1ecd552fb1d48cf44e313280acb0f285150097
# timestamp: 2010-11-09 09:47:16 +0600
# base_revision_id: horst.hunger@stripped\
#   mjzx88pfgyb4reoz
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZ4eAWUAAc1fgEAQWHf/938v
ThC////wUASB4FEiqAADJAjQjBT0wmqeU9PSeo9U00DNDI0nqPKDmEwCYATCYTTAAAJk00DHMJgE
wAmEwmmAAATJpoGOYTAJgBMJhNMAAAmTTQMJJCYgATQTInoNDRTNT1PRNNADT1FH8IKbnpwoHRtv
xLEP3FpqrELHzAC5qmssXbwpJKwB55n4hr0r3RoiDjwHJj0NQXL1tU13pvvin2KvpC6WaYETCuGq
N3ZE7a90grqD9a1CfisO2Tvge4KgPfqovrsk7cgpAfaaawpgOz5ZDFx0R+a5j8AirqKsM9tmc4nj
bLQCyrK1miCdFdqZL6Odct8Rc9CL46bOEUYto3NOy10PlmmQOQu9luE0ijmPHTpFRBBChVlLEFOC
hRCNZJl49kRKxlfUUoLzo1RQbnwnCzbUx2dqb+p1Ky7Aybq0Ms9nLwWJWYX62Ur/cuYZqRHPbPnl
KnWthva6+OO9UwDojpjVxhL4Xe63bRTwMS1XD7zqj1RFBUe9RCBxK26AvVFi0ab5FTydbrpaWJhd
L8mdUPqiffAX+qGbrC+XYlCQ9K5TYHtGryyiZcdVNmcRA5jjTLhCizRIEniws7+q+HFZPsprzmp0
dos8dqysWQtRKwoT6jrXFfAfdLZg9WrOOQq2Dbhia6L1J2q+VlFtqiqMcHsrknZ6OeoUqyEqmZrn
0Fk5VOLRnXujbU13AfW91SpZ48m5QdNnF1DgIHpR+hhNHonWg7vDw/2snE/w7M0RRE8pd5t9eZgt
ZyIxKofcxdD7s5EcwwrA/Ly5x/p5m/6G4mdetRFY472BY9b4B4dnfyUUoH1l4elf2ZdwEL+RZgUB
kSb7einqozk6qxEaT8Xuu9fyWHL2F7enhAtdr+w3xDQNERuPRQK17ROVJ4BgND6zrfvl/EE9jcMB
NIx8p0JdPzz+FNRJdNBVCw7nUjUNI3C8JNIXt4GO7QjtuXXPTtcQLU7YfUdwNTh9dEPGFl/aeLqy
YdMLnDHmZ4v109XF0cL2xbpKtec2ajkrMZyZRYUNKEfWVrDI4a2TQvrKgKWmVjb5qiJRMaQnhAee
HJ1RrxB3cvz6+Td4x5cB6fpSnTS0FbrbiBcKNSx24yyctLm3g4peMvWAmtWajrYssLfPIGtCOrcn
ojAzoM73cAuq0r5btUaVY2w6gps8bF4wQSMl93GUF0B+/FwaOg7YG/9k+a8zgFYPcvl17XrtLgGW
wDXWG55VyEQaaUSXFQoqIHxFF33OItN66KuUyussOhWSoc7AZk53R5pk5U0JURZEBh6sccqqMkQk
5OV3WDUiw8BNyqt2pG9nb60O5wiiv7gWhXdAPiuqhZfLy7iapxC/ezA8n2eyZUWbIyr1qojUqxtr
hOBXNqsNcUbU/bC3tgTqzcr24aQvwUjMknNuJi2qmAyTcY62c0HNSP/7VfidTYd4oagwNVFha0ef
Nqq29VeVqRUP2RDimmLNY7MfFp6KUX9xALWHd0kfU1fORXUO9PN/DTIxkF4YBcA0WTtcd3b9GO88
QOu+ssT0oJ4n95g2x2ivME84BsmLTzVaevJUqTb05alKQzIHutWdSxFlVcMzT91/4u5IpwoSE8PA
LKA=


--===============0308029384==--