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

into mysql.com:/home/my/mysql-4.1

mysql-test/include/ps_query.inc

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

mysql-test/r/ps_6bdb.result

@@ -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_7ndb.result

@@ -440,11 +440,11 @@ 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
-2	two
+1	one
 prepare stmt1 from ' select a,b from t1
 limit ? ';
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '?' at line 2