summaryrefslogtreecommitdiff
path: root/sql/sp_head.cc
diff options
context:
space:
mode:
authorAlexander Nozdrin <alexander.nozdrin@oracle.com>2010-10-13 13:34:02 +0400
committerAlexander Nozdrin <alexander.nozdrin@oracle.com>2010-10-13 13:34:02 +0400
commit609bc2c4077f4c1244763a796aa52a5d9d363e15 (patch)
tree9ef2771d9086b64b58e462b0ad85c3ef69c16469 /sql/sp_head.cc
parent333434d23b9c4a5df3d1d26e26dfedb808e4b6ff (diff)
downloadmariadb-git-609bc2c4077f4c1244763a796aa52a5d9d363e15.tar.gz
Reverting a patch for Bug#45445 (cannot execute procedures with thread_stack set to 128k).
Some platforms don't work with 4 * STACK_MIN_SIZE. Thus, reverting back to 8 * STACK_MIN_SIZE and waiting for another fix.
Diffstat (limited to 'sql/sp_head.cc')
-rw-r--r--sql/sp_head.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc
index 52f658cbe0e..1fd4e9302c4 100644
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
@@ -1233,8 +1233,11 @@ sp_head::execute(THD *thd)
The same with db_load_routine() required circa 7k bytes and
14k bytes accordingly. Hence, here we book the stack with some
reasonable margin.
+
+ Reverting back to 8 * STACK_MIN_SIZE until further fix.
+ 8 * STACK_MIN_SIZE is required on some exotic platforms.
*/
- if (check_stack_overrun(thd, 4 * STACK_MIN_SIZE, (uchar*)&old_packet))
+ if (check_stack_overrun(thd, 8 * STACK_MIN_SIZE, (uchar*)&old_packet))
DBUG_RETURN(TRUE);
/* init per-instruction memroot */