Commit 5b3444d2 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/home/my/mysql-4.1
parents 92c90128 1d7ae133

mysql-test/include/ps_query.inc

+1 −1
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ execute stmt1 using @arg00; 


##### parameter used in limit clause

set @arg00=1;

prepare stmt1 from ' select a,b from t1

prepare stmt1 from ' select a,b from t1 order by a

limit 1 ';

execute stmt1 ;

# currently (May 2004, Version 4.1) it is impossible

mysql-test/r/ps_2myisam.result

+1 −1
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ set @arg00=0 ; 
execute stmt1 using @arg00;

ERROR 42S22: Unknown column '?' in 'order clause'

set @arg00=1;

prepare stmt1 from ' select a,b from t1

prepare stmt1 from ' select a,b from t1 order by a

limit 1 ';

execute stmt1 ;

a	b

mysql-test/r/ps_3innodb.result

+1 −1
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ set @arg00=0 ; 
execute stmt1 using @arg00;

ERROR 42S22: Unknown column '?' in 'order clause'

set @arg00=1;

prepare stmt1 from ' select a,b from t1

prepare stmt1 from ' select a,b from t1 order by a

limit 1 ';

execute stmt1 ;

a	b

mysql-test/r/ps_4heap.result

+1 −1
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ set @arg00=0 ; 
execute stmt1 using @arg00;

ERROR 42S22: Unknown column '?' in 'order clause'

set @arg00=1;

prepare stmt1 from ' select a,b from t1

prepare stmt1 from ' select a,b from t1 order by a

limit 1 ';

execute stmt1 ;

a	b

mysql-test/r/ps_5merge.result

+2 −2
Original line number Diff line number Diff line
@@ -482,7 +482,7 @@ set @arg00=0 ; 
execute stmt1 using @arg00;

ERROR 42S22: Unknown column '?' in 'order clause'

set @arg00=1;

prepare stmt1 from ' select a,b from t1

prepare stmt1 from ' select a,b from t1 order by a

limit 1 ';

execute stmt1 ;

a	b
@@ -3490,7 +3490,7 @@ set @arg00=0 ; 
execute stmt1 using @arg00;

ERROR 42S22: Unknown column '?' in 'order clause'

set @arg00=1;

prepare stmt1 from ' select a,b from t1

prepare stmt1 from ' select a,b from t1 order by a

limit 1 ';

execute stmt1 ;

a	b