Commit c1338937 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 

into neptunus.(none):/home/msvensson/mysql/mysql-4.1-synced
parents 5ac4670b ed4022bd

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 ;