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

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

7 files changed, 9 insertions, 9 deletions

diff --git a/mysql-test/include/ps_query.inc b/mysql-test/include/ps_query.inc
index d1c54464b54..27ab85410c8 100644
--- a/mysql-test/include/ps_query.inc
+++ b/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
diff --git a/mysql-test/r/ps_2myisam.result b/mysql-test/r/ps_2myisam.result
index a6c2c65a25e..63463baabfd 100644
--- a/mysql-test/r/ps_2myisam.result
+++ b/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
diff --git a/mysql-test/r/ps_3innodb.result b/mysql-test/r/ps_3innodb.result
index ebba84f1a6c..70ba4a109d7 100644
--- a/mysql-test/r/ps_3innodb.result
+++ 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
diff --git a/mysql-test/r/ps_4heap.result b/mysql-test/r/ps_4heap.result
index f82fc1a8312..4c68f0c8593 100644
--- a/mysql-test/r/ps_4heap.result
+++ 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
diff --git a/mysql-test/r/ps_5merge.result b/mysql-test/r/ps_5merge.result
index 86f0fe874fd..af5d08d5eb4 100644
--- a/mysql-test/r/ps_5merge.result
+++ 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
diff --git a/mysql-test/r/ps_6bdb.result b/mysql-test/r/ps_6bdb.result
index 0982baccd6a..75358bd201b 100644
--- a/mysql-test/r/ps_6bdb.result
+++ 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
diff --git a/mysql-test/r/ps_7ndb.result b/mysql-test/r/ps_7ndb.result
index e274329388c..e33bbd7002c 100644
--- a/mysql-test/r/ps_7ndb.result
+++ 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