bk commit into 5.0 tree (mskold:1.1935)

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.0 repository of marty. When marty does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1935 05/06/14 16:40:50 mskold@stripped +7 -0
  Added order by for failing ps_7ndb test

  mysql-test/r/ps_7ndb.result
    1.31 05/06/14 16:40:26 mskold@stripped +2 -2
    Added order by for failing ps_7ndb test

  mysql-test/r/ps_6bdb.result
    1.31 05/06/14 16:40:26 mskold@stripped +1 -1
    Added order by for failing ps_7ndb test

  mysql-test/r/ps_5merge.result
    1.28 05/06/14 16:40:26 mskold@stripped +2 -2
    Added order by for failing ps_7ndb test

  mysql-test/r/ps_4heap.result
    1.27 05/06/14 16:40:26 mskold@stripped +1 -1
    Added order by for failing ps_7ndb test

  mysql-test/r/ps_3innodb.result
    1.31 05/06/14 16:40:26 mskold@stripped +1 -1
    Added order by for failing ps_7ndb test

  mysql-test/r/ps_2myisam.result
    1.28 05/06/14 16:40:26 mskold@stripped +1 -1
    Added order by for failing ps_7ndb test

  mysql-test/include/ps_query.inc
    1.13 05/06/14 16:40:26 mskold@stripped +1 -1
    Added order by for failing ps_7ndb test

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mskold
# Host:	blowfish.ndb.mysql.com
# Root:	/usr/local/home/marty/MySQL/mysql-5.0

--- 1.12/mysql-test/include/ps_query.inc	Tue Jun  7 12:11:28 2005
+++ 1.13/mysql-test/include/ps_query.inc	Tue Jun 14 16:40:26 2005
@@ -300,7 +300,7 @@
 prepare stmt1 from ' select a,b from t1 order by a
 limit 1 ';
 execute stmt1 ;
-prepare stmt1 from ' select a,b from t1 limit ? ';
+prepare stmt1 from ' select a,b from t1 order by a limit ? ';
 execute stmt1 using @arg00;
 
 ##### parameter used in many places

--- 1.27/mysql-test/r/ps_2myisam.result	Tue Jun  7 15:37:56 2005
+++ 1.28/mysql-test/r/ps_2myisam.result	Tue Jun 14 16:40:26 2005
@@ -444,7 +444,7 @@
 execute stmt1 ;
 a	b
 1	one
-prepare stmt1 from ' select a,b from t1 limit ? ';
+prepare stmt1 from ' select a,b from t1 order by a limit ? ';
 execute stmt1 using @arg00;
 a	b
 1	one

--- 1.30/mysql-test/r/ps_3innodb.result	Tue Jun  7 15:37:56 2005
+++ 1.31/mysql-test/r/ps_3innodb.result	Tue Jun 14 16:40:26 2005
@@ -444,7 +444,7 @@
 execute stmt1 ;
 a	b
 1	one
-prepare stmt1 from ' select a,b from t1 limit ? ';
+prepare stmt1 from ' select a,b from t1 order by a limit ? ';
 execute stmt1 using @arg00;
 a	b
 1	one

--- 1.26/mysql-test/r/ps_4heap.result	Tue Jun  7 15:37:56 2005
+++ 1.27/mysql-test/r/ps_4heap.result	Tue Jun 14 16:40:26 2005
@@ -445,7 +445,7 @@
 execute stmt1 ;
 a	b
 1	one
-prepare stmt1 from ' select a,b from t1 limit ? ';
+prepare stmt1 from ' select a,b from t1 order by a limit ? ';
 execute stmt1 using @arg00;
 a	b
 1	one

--- 1.27/mysql-test/r/ps_5merge.result	Tue Jun  7 15:37:56 2005
+++ 1.28/mysql-test/r/ps_5merge.result	Tue Jun 14 16:40:26 2005
@@ -487,7 +487,7 @@
 execute stmt1 ;
 a	b
 1	one
-prepare stmt1 from ' select a,b from t1 limit ? ';
+prepare stmt1 from ' select a,b from t1 order by a limit ? ';
 execute stmt1 using @arg00;
 a	b
 1	one
@@ -3499,7 +3499,7 @@
 execute stmt1 ;
 a	b
 1	one
-prepare stmt1 from ' select a,b from t1 limit ? ';
+prepare stmt1 from ' select a,b from t1 order by a limit ? ';
 execute stmt1 using @arg00;
 a	b
 1	one

--- 1.30/mysql-test/r/ps_6bdb.result	Fri Jun 10 20:12:03 2005
+++ 1.31/mysql-test/r/ps_6bdb.result	Tue Jun 14 16:40:26 2005
@@ -444,7 +444,7 @@
 execute stmt1 ;
 a	b
 1	one
-prepare stmt1 from ' select a,b from t1 limit ? ';
+prepare stmt1 from ' select a,b from t1 order by a limit ? ';
 execute stmt1 using @arg00;
 a	b
 1	one

--- 1.30/mysql-test/r/ps_7ndb.result	Fri Jun 10 20:12:04 2005
+++ 1.31/mysql-test/r/ps_7ndb.result	Tue Jun 14 16:40:26 2005
@@ -444,10 +444,10 @@
 execute stmt1 ;
 a	b
 1	one
-prepare stmt1 from ' select a,b from t1 limit ? ';
+prepare stmt1 from ' select a,b from t1 order by a limit ? ';
 execute stmt1 using @arg00;
 a	b
-3	three
+1	one
 set @arg00='b' ;
 set @arg01=0 ;
 set @arg02=2 ;