bk commit into 5.0 tree (evgen:1.2580) BUG#31048

[eugene]

Below is the list of changes that have just been committed into a local
5.0 repository of evgen. When evgen does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-11-23 00:16:17+03:00, evgen@stripped +3 -0
  opt_range.cc:
    Fix for the bug#31048 for 64bit platforms.
  subselect.test, subselect.result:
    Corrected text case for the bug#31048.

  mysql-test/r/subselect.result@stripped, 2007-11-23 00:13:32+03:00, evgen@stripped +6 -9
    Corrected text case for the bug#31048.

  mysql-test/t/subselect.test@stripped, 2007-11-23 00:12:16+03:00, evgen@stripped +4 -6
    Corrected text case for the bug#31048.

  sql/opt_range.cc@stripped, 2007-11-23 00:14:47+03:00, evgen@stripped +1 -1
    Fix for the bug#31048 for 64bit platforms.

diff -Nrup a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result
--- a/mysql-test/r/subselect.result	2007-11-21 12:46:14 +03:00
+++ b/mysql-test/r/subselect.result	2007-11-23 00:13:32 +03:00
@@ -4148,9 +4148,8 @@ select sum(a) from t1 where a> ( select 
 select sum(a) from t1 where a> ( select sum(a) from t1 where a> (
 select sum(a) from t1 where a> ( select sum(a) from t1 where a> (
 select sum(a) from t1 where a> ( select sum(a) from t1 where a> (
-select sum(a) from t1 where a> ( select sum(a) from t1 where a> (
-select sum(a) from t1
-)group by b limit 1)group by b limit 1)group by b limit 1
+select sum(a) from t1 where a> ( select sum(a) from t1
+)group by b limit 1)group by b limit 1
 )group by b limit 1)group by b limit 1)group by b limit 1
 )group by b limit 1)group by b limit 1)group by b limit 1
 )group by b limit 1)group by b limit 1)group by b limit 1) 
@@ -4191,9 +4190,8 @@ select sum(a) from t1 where a> ( select 
 select sum(a) from t1 where a> ( select sum(a) from t1 where a> (
 select sum(a) from t1 where a> ( select sum(a) from t1 where a> (
 select sum(a) from t1 where a> ( select sum(a) from t1 where a> (
-select sum(a) from t1 where a> ( select sum(a) from t1 where a> (
-select sum(a) from t1
-)group by b limit 1)group by b limit 1)group by b limit 1
+select sum(a) from t1 where a> ( select sum(a) from t1 
+)group by b limit 1)group by b limit 1
 )group by b limit 1)group by b limit 1)group by b limit 1
 )group by b limit 1)group by b limit 1)group by b limit 1
 )group by b limit 1)group by b limit 1)group by b limit 1) 
@@ -4210,9 +4208,8 @@ id	select_type	table	type	possible_keys	
 9	SUBQUERY	t1	range	a	a	5	NULL	9	Using where; Using temporary; Using filesort
 10	SUBQUERY	t1	range	a	a	5	NULL	9	Using where; Using temporary; Using filesort
 11	SUBQUERY	t1	range	a	a	5	NULL	9	Using where; Using temporary; Using filesort
-12	SUBQUERY	t1	range	a	a	5	NULL	9	Using where; Using temporary; Using filesort
-13	SUBQUERY	t1	range	a	a	5	NULL	1	Using where; Using temporary; Using filesort
-14	SUBQUERY	t1	index	NULL	a	5	NULL	9	Using index
+12	SUBQUERY	t1	range	a	a	5	NULL	1	Using where; Using temporary; Using filesort
+13	SUBQUERY	t1	index	NULL	a	5	NULL	9	Using index
 explain select sum(a),a from t1 where a> (
 select sum(a) from t1 where a> ( select sum(a) from t1 where a> (
 select sum(a) from t1 where a> ( select sum(a) from t1 where a> (
diff -Nrup a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test
--- a/mysql-test/t/subselect.test	2007-11-21 12:46:14 +03:00
+++ b/mysql-test/t/subselect.test	2007-11-23 00:12:16 +03:00
@@ -3000,9 +3000,8 @@ select sum(a),a from t1 where a> (
   select sum(a) from t1 where a> ( select sum(a) from t1 where a> (
   select sum(a) from t1 where a> ( select sum(a) from t1 where a> (
   select sum(a) from t1 where a> ( select sum(a) from t1 where a> (
-  select sum(a) from t1 where a> ( select sum(a) from t1 where a> (
-  select sum(a) from t1
-  )group by b limit 1)group by b limit 1)group by b limit 1
+  select sum(a) from t1 where a> ( select sum(a) from t1
+  )group by b limit 1)group by b limit 1
   )group by b limit 1)group by b limit 1)group by b limit 1
   )group by b limit 1)group by b limit 1)group by b limit 1
   )group by b limit 1)group by b limit 1)group by b limit 1) 
@@ -3044,9 +3043,8 @@ explain select sum(a),a from t1 where a>
   select sum(a) from t1 where a> ( select sum(a) from t1 where a> (
   select sum(a) from t1 where a> ( select sum(a) from t1 where a> (
   select sum(a) from t1 where a> ( select sum(a) from t1 where a> (
-  select sum(a) from t1 where a> ( select sum(a) from t1 where a> (
-  select sum(a) from t1
-  )group by b limit 1)group by b limit 1)group by b limit 1
+  select sum(a) from t1 where a> ( select sum(a) from t1 
+  )group by b limit 1)group by b limit 1
   )group by b limit 1)group by b limit 1)group by b limit 1
   )group by b limit 1)group by b limit 1)group by b limit 1
   )group by b limit 1)group by b limit 1)group by b limit 1) 
diff -Nrup a/sql/opt_range.cc b/sql/opt_range.cc
--- a/sql/opt_range.cc	2007-11-19 22:59:00 +03:00
+++ b/sql/opt_range.cc	2007-11-23 00:14:47 +03:00
@@ -1987,7 +1987,7 @@ int SQL_SELECT::test_quick_select(THD *t
     KEY *key_info;
     PARAM param;
 
-    if (check_stack_overrun(thd, STACK_MIN_SIZE, buff))
+    if (check_stack_overrun(thd, 2*STACK_MIN_SIZE, buff))
       DBUG_RETURN(0);                           // Fatal error flag is set
 
     /* set up parameter that is passed to all functions */