Commit 0b40c63f authored by gkodinov/kgeorge@magare.gmz's avatar gkodinov/kgeorge@magare.gmz
Browse files

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 

into  magare.gmz:/home/kgeorge/mysql/autopush/B32400-5.0-opt
parents 3f163915 846cbf3c

mysql-test/include/ps_query.inc

+2 −2
Original line number Diff line number Diff line
@@ -434,8 +434,8 @@ execute stmt1 ; 
let $1= 3 ;

while ($1)

{

  prepare stmt1 from ' SELECT a as ccc from t1 where a+1=

                           (SELECT 1+ccc from t1 where ccc+1=a+1 and a=1) ';

  prepare stmt1 from ' SELECT a as ccc from t1 outr where a+1=

                           (SELECT 1+outr.a from t1 where outr.a+1=a+1 and a=1) ';

  execute stmt1 ;

  deallocate prepare stmt1 ;

  dec $1 ;

mysql-test/r/ps_2myisam.result

+6 −6
Original line number Diff line number Diff line
@@ -783,20 +783,20 @@ a b 
2	two

3	three

4	four

prepare stmt1 from ' SELECT a as ccc from t1 where a+1=

                           (SELECT 1+ccc from t1 where ccc+1=a+1 and a=1) ';

prepare stmt1 from ' SELECT a as ccc from t1 outr where a+1=

                           (SELECT 1+outr.a from t1 where outr.a+1=a+1 and a=1) ';

execute stmt1 ;

ccc

1

deallocate prepare stmt1 ;

prepare stmt1 from ' SELECT a as ccc from t1 where a+1=

                           (SELECT 1+ccc from t1 where ccc+1=a+1 and a=1) ';

prepare stmt1 from ' SELECT a as ccc from t1 outr where a+1=

                           (SELECT 1+outr.a from t1 where outr.a+1=a+1 and a=1) ';

execute stmt1 ;

ccc

1

deallocate prepare stmt1 ;

prepare stmt1 from ' SELECT a as ccc from t1 where a+1=

                           (SELECT 1+ccc from t1 where ccc+1=a+1 and a=1) ';

prepare stmt1 from ' SELECT a as ccc from t1 outr where a+1=

                           (SELECT 1+outr.a from t1 where outr.a+1=a+1 and a=1) ';

execute stmt1 ;

ccc

1

mysql-test/r/ps_3innodb.result

+6 −6
Original line number Diff line number Diff line
@@ -783,20 +783,20 @@ a b 
2	two

3	three

4	four

prepare stmt1 from ' SELECT a as ccc from t1 where a+1=

                           (SELECT 1+ccc from t1 where ccc+1=a+1 and a=1) ';

prepare stmt1 from ' SELECT a as ccc from t1 outr where a+1=

                           (SELECT 1+outr.a from t1 where outr.a+1=a+1 and a=1) ';

execute stmt1 ;

ccc

1

deallocate prepare stmt1 ;

prepare stmt1 from ' SELECT a as ccc from t1 where a+1=

                           (SELECT 1+ccc from t1 where ccc+1=a+1 and a=1) ';

prepare stmt1 from ' SELECT a as ccc from t1 outr where a+1=

                           (SELECT 1+outr.a from t1 where outr.a+1=a+1 and a=1) ';

execute stmt1 ;

ccc

1

deallocate prepare stmt1 ;

prepare stmt1 from ' SELECT a as ccc from t1 where a+1=

                           (SELECT 1+ccc from t1 where ccc+1=a+1 and a=1) ';

prepare stmt1 from ' SELECT a as ccc from t1 outr where a+1=

                           (SELECT 1+outr.a from t1 where outr.a+1=a+1 and a=1) ';

execute stmt1 ;

ccc

1

mysql-test/r/ps_4heap.result

+6 −6
Original line number Diff line number Diff line
@@ -784,20 +784,20 @@ a b 
2	two

3	three

4	four

prepare stmt1 from ' SELECT a as ccc from t1 where a+1=

                           (SELECT 1+ccc from t1 where ccc+1=a+1 and a=1) ';

prepare stmt1 from ' SELECT a as ccc from t1 outr where a+1=

                           (SELECT 1+outr.a from t1 where outr.a+1=a+1 and a=1) ';

execute stmt1 ;

ccc

1

deallocate prepare stmt1 ;

prepare stmt1 from ' SELECT a as ccc from t1 where a+1=

                           (SELECT 1+ccc from t1 where ccc+1=a+1 and a=1) ';

prepare stmt1 from ' SELECT a as ccc from t1 outr where a+1=

                           (SELECT 1+outr.a from t1 where outr.a+1=a+1 and a=1) ';

execute stmt1 ;

ccc

1

deallocate prepare stmt1 ;

prepare stmt1 from ' SELECT a as ccc from t1 where a+1=

                           (SELECT 1+ccc from t1 where ccc+1=a+1 and a=1) ';

prepare stmt1 from ' SELECT a as ccc from t1 outr where a+1=

                           (SELECT 1+outr.a from t1 where outr.a+1=a+1 and a=1) ';

execute stmt1 ;

ccc

1

mysql-test/r/ps_5merge.result

+12 −12
Original line number Diff line number Diff line
@@ -826,20 +826,20 @@ a b 
2	two

3	three

4	four

prepare stmt1 from ' SELECT a as ccc from t1 where a+1=

                           (SELECT 1+ccc from t1 where ccc+1=a+1 and a=1) ';

prepare stmt1 from ' SELECT a as ccc from t1 outr where a+1=

                           (SELECT 1+outr.a from t1 where outr.a+1=a+1 and a=1) ';

execute stmt1 ;

ccc

1

deallocate prepare stmt1 ;

prepare stmt1 from ' SELECT a as ccc from t1 where a+1=

                           (SELECT 1+ccc from t1 where ccc+1=a+1 and a=1) ';

prepare stmt1 from ' SELECT a as ccc from t1 outr where a+1=

                           (SELECT 1+outr.a from t1 where outr.a+1=a+1 and a=1) ';

execute stmt1 ;

ccc

1

deallocate prepare stmt1 ;

prepare stmt1 from ' SELECT a as ccc from t1 where a+1=

                           (SELECT 1+ccc from t1 where ccc+1=a+1 and a=1) ';

prepare stmt1 from ' SELECT a as ccc from t1 outr where a+1=

                           (SELECT 1+outr.a from t1 where outr.a+1=a+1 and a=1) ';

execute stmt1 ;

ccc

1
@@ -3848,20 +3848,20 @@ a b 
2	two

3	three

4	four

prepare stmt1 from ' SELECT a as ccc from t1 where a+1=

                           (SELECT 1+ccc from t1 where ccc+1=a+1 and a=1) ';

prepare stmt1 from ' SELECT a as ccc from t1 outr where a+1=

                           (SELECT 1+outr.a from t1 where outr.a+1=a+1 and a=1) ';

execute stmt1 ;

ccc

1

deallocate prepare stmt1 ;

prepare stmt1 from ' SELECT a as ccc from t1 where a+1=

                           (SELECT 1+ccc from t1 where ccc+1=a+1 and a=1) ';

prepare stmt1 from ' SELECT a as ccc from t1 outr where a+1=

                           (SELECT 1+outr.a from t1 where outr.a+1=a+1 and a=1) ';

execute stmt1 ;

ccc

1

deallocate prepare stmt1 ;

prepare stmt1 from ' SELECT a as ccc from t1 where a+1=

                           (SELECT 1+ccc from t1 where ccc+1=a+1 and a=1) ';

prepare stmt1 from ' SELECT a as ccc from t1 outr where a+1=

                           (SELECT 1+outr.a from t1 where outr.a+1=a+1 and a=1) ';

execute stmt1 ;

ccc

1