Commit 3f163915 authored by evgen@moonbone.local's avatar evgen@moonbone.local
Browse files

opt_range.cc: 

  Fix for the bug#31048 for 64bit platforms.
subselect.test, subselect.result:
  Corrected text case for the bug#31048.
parent 2a5d804f

mysql-test/r/subselect.result

+6 −9
Original line number Diff line number Diff line
@@ -4148,9 +4148,8 @@ 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 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 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 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 key key_len ref rows Extra 
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> (

mysql-test/t/subselect.test

+4 −6
Original line number Diff line number Diff line
@@ -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)

sql/opt_range.cc

+1 −1
Original line number Diff line number Diff line
@@ -1987,7 +1987,7 @@ int SQL_SELECT::test_quick_select(THD *thd, key_map keys_to_use, 
    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 */