Commit af2ab040 authored by unknown's avatar unknown
Browse files

BUG#8807 Select crash server 

 - Add function Item_param::fix_fields which will update any subselect they are part of and indicate that the subsleect is not const during prepare phase, and thus should not be executed during prepare.


mysql-test/include/ps_query.inc:
  Adde new test case
mysql-test/r/ps_2myisam.result:
  Update test result
mysql-test/r/ps_3innodb.result:
  Update test result
mysql-test/r/ps_4heap.result:
  Update test result
mysql-test/r/ps_5merge.result:
  Update test result
mysql-test/r/ps_6bdb.result:
  Update test result
mysql-test/r/ps_7ndb.result:
  Update test result
sql/item.cc:
  Add function Item_param::fix_fields, which will mark any subselects they are part of as not being a constant expression unless the param value is specified, ie. it will be not be constant during prepare phase.
sql/item.h:
  Adde Item_param::fix_fields
sql/item_subselect.h:
  Make Item_param::fix_field friend of Item_subselect
parent 8287938b

mysql-test/include/ps_query.inc

+5 −0
Original line number Diff line number Diff line
@@ -421,6 +421,11 @@ prepare stmt1 from ' select a, ?, b FROM t1 outer_table where 
   b=? and a = (select ? from t1 where b = ? ) ' ;

execute stmt1 using @arg00, @arg01, @arg02, @arg03 ;



# Bug#8807

prepare stmt1 from 'select c4 FROM t9 where

    c13 = (select MAX(b) from t1 where a = ?) and c22 = ? ' ;

execute stmt1 using @arg01, @arg02;



######## correlated subquery

# no parameter

prepare stmt1 from ' select a, b FROM t1 outer_table where

mysql-test/r/ps_2myisam.result

+4 −0
Original line number Diff line number Diff line
@@ -768,6 +768,10 @@ prepare stmt1 from ' select a, ?, b FROM t1 outer_table where 
execute stmt1 using @arg00, @arg01, @arg02, @arg03 ;

a	?	b

2	1	two

prepare stmt1 from 'select c4 FROM t9 where

    c13 = (select MAX(b) from t1 where a = ?) and c22 = ? ' ;

execute stmt1 using @arg01, @arg02;

c4

prepare stmt1 from ' select a, b FROM t1 outer_table where

   a = (select a from t1 where b = outer_table.b ) order by a ';

execute stmt1 ;

mysql-test/r/ps_3innodb.result

+4 −0
Original line number Diff line number Diff line
@@ -768,6 +768,10 @@ prepare stmt1 from ' select a, ?, b FROM t1 outer_table where 
execute stmt1 using @arg00, @arg01, @arg02, @arg03 ;

a	?	b

2	1	two

prepare stmt1 from 'select c4 FROM t9 where

    c13 = (select MAX(b) from t1 where a = ?) and c22 = ? ' ;

execute stmt1 using @arg01, @arg02;

c4

prepare stmt1 from ' select a, b FROM t1 outer_table where

   a = (select a from t1 where b = outer_table.b ) order by a ';

execute stmt1 ;

mysql-test/r/ps_4heap.result

+4 −0
Original line number Diff line number Diff line
@@ -769,6 +769,10 @@ prepare stmt1 from ' select a, ?, b FROM t1 outer_table where 
execute stmt1 using @arg00, @arg01, @arg02, @arg03 ;

a	?	b

2	1	two

prepare stmt1 from 'select c4 FROM t9 where

    c13 = (select MAX(b) from t1 where a = ?) and c22 = ? ' ;

execute stmt1 using @arg01, @arg02;

c4

prepare stmt1 from ' select a, b FROM t1 outer_table where

   a = (select a from t1 where b = outer_table.b ) order by a ';

execute stmt1 ;

mysql-test/r/ps_5merge.result

+8 −0
Original line number Diff line number Diff line
@@ -811,6 +811,10 @@ prepare stmt1 from ' select a, ?, b FROM t1 outer_table where 
execute stmt1 using @arg00, @arg01, @arg02, @arg03 ;

a	?	b

2	1	two

prepare stmt1 from 'select c4 FROM t9 where

    c13 = (select MAX(b) from t1 where a = ?) and c22 = ? ' ;

execute stmt1 using @arg01, @arg02;

c4

prepare stmt1 from ' select a, b FROM t1 outer_table where

   a = (select a from t1 where b = outer_table.b ) order by a ';

execute stmt1 ;
@@ -3821,6 +3825,10 @@ prepare stmt1 from ' select a, ?, b FROM t1 outer_table where 
execute stmt1 using @arg00, @arg01, @arg02, @arg03 ;

a	?	b

2	1	two

prepare stmt1 from 'select c4 FROM t9 where

    c13 = (select MAX(b) from t1 where a = ?) and c22 = ? ' ;

execute stmt1 using @arg01, @arg02;

c4

prepare stmt1 from ' select a, b FROM t1 outer_table where

   a = (select a from t1 where b = outer_table.b ) order by a ';

execute stmt1 ;