From 152943f39f487795f3d1d6910d1ee9f736feae44 Mon Sep 17 00:00:00 2001
From: Georgi Kodinov <joro@sun.com>
Date: Wed, 19 Aug 2009 17:53:43 +0300
Subject: [PATCH] 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.
---
 sql/opt_range.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index 32f9b0df4c0..d007009d62c 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -2063,7 +2063,7 @@ int SQL_SELECT::test_quick_select(THD *thd, key_map keys_to_use,
     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 */