bzr push into mysql-trunk-merge branch (Dmitry.Shulga:3264 to 3265) Bug#45445

[Dmitry Shulga]

 3265 Dmitry Shulga	2010-10-12 [merge]
      A follow up for the patch for Bug#45445, increase stack size
      to fix an sp-error.test failure on Sun Sparc system.

    modified:
      sql/sp_head.cc
 3264 Alexander Nozdrin	2010-10-12 [merge]
      Auto-merge from mysql-5.5-bugteam.

    modified:
      mysql-test/mysql-test-run.pl
      sql-common/client.c
      sql/sql_acl.cc
      sql/sql_cache.cc
=== modified file 'sql/sp_head.cc'
--- a/sql/sp_head.cc	2010-10-07 12:47:15 +0000
+++ b/sql/sp_head.cc	2010-10-12 12:27:17 +0000
@@ -1228,12 +1228,13 @@ sp_head::execute(THD *thd)
     parsing and loading of another stored procedure into the cache
     (@sa db_load_routine() and Bug#10100).
     At the time of measuring, a recursive SP invocation required
-    3232 bytes of stack on 32 bit Linux and 6016 bytes on 64 bit Mac.
+    3232 bytes of stack on 32 bit Linux, 6016 bytes on 64 bit Mac
+    and 11152 on 64 bit Solaris sparc.
     The same with db_load_routine() required circa 7k bytes and
     14k bytes accordingly. Hence, here we book the stack with some
     reasonable margin.
   */
-  if (check_stack_overrun(thd, 2 * STACK_MIN_SIZE, (uchar*)&old_packet))
+  if (check_stack_overrun(thd, 4 * STACK_MIN_SIZE, (uchar*)&old_packet))
     DBUG_RETURN(TRUE);
 
   /* init per-instruction memroot */


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