#At file:///Users/kgeorge/mysql/work/B46807-5.0-bugteam/ based on revid:joro@stripped
2794 Georgi Kodinov 2009-08-19
Bug #46807: subselect test fails on PB-2 with a crash
The check for stack overflow was independent of the size of the
structure stored in the heap.
Fixed by adding sizeof(PARAM) to the requested free heap size.
modified:
sql/opt_range.cc
=== modified file 'sql/opt_range.cc'
--- a/sql/opt_range.cc 2009-07-16 12:37:38 +0000
+++ b/sql/opt_range.cc 2009-08-19 14:53:43 +0000
@@ -2063,7 +2063,7 @@ int SQL_SELECT::test_quick_select(THD *t
KEY *key_info;
PARAM param;
- if (check_stack_overrun(thd, 2*STACK_MIN_SIZE, buff))
+ if (check_stack_overrun(thd, 2*STACK_MIN_SIZE + sizeof(PARAM), buff))
DBUG_RETURN(0); // Fatal error flag is set
/* set up parameter that is passed to all functions */
Attachment: [text/bzr-bundle] bzr/joro@sun.com-20090819145343-6zwt81jfkypa751n.bundle
Thread |
---|
• bzr commit into mysql-5.0-bugteam branch (joro:2794) Bug#46807 | Georgi Kodinov | 21 Aug |