diff options
| author | Dmitry Shulga <Dmitry.Shulga@Sun.COM> | 2010-10-12 19:19:33 +0700 |
|---|---|---|
| committer | Dmitry Shulga <Dmitry.Shulga@Sun.COM> | 2010-10-12 19:19:33 +0700 |
| commit | cd81c833a8a27df3cf037e084917a1a58e76f70b (patch) | |
| tree | 465505e044cd8aabde18bd8f80061e4084b8a7d6 /sql/sp_head.cc | |
| parent | 0e1dd99c71360d6a7c9af6cdf7f9929e79758f80 (diff) | |
| download | mariadb-git-cd81c833a8a27df3cf037e084917a1a58e76f70b.tar.gz | |
A follow up for the patch for Bug#45445, increase stack size
to fix an sp-error.test failure on Sun Sparc system.
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index e25b10957ac..52f658cbe0e 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -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 */ |