added order by to give same order results on different endian and different sized clusters

mysql-test/include/ps_query.inc

@@ -104,13 +104,13 @@ prepare stmt1 from ' select substr(''MySQL'',1,?) from t1 where a=1 ' ;
 execute stmt1 using @arg00 ;
 # variations on 'concat'
 set @arg00='MySQL' ;
-select a , concat(@arg00,b) from t1 ;
+select a , concat(@arg00,b) from t1 order by a;
 # BUG#3796 Prepared statement, select concat(<parameter>,<column>),wrong result
-prepare stmt1 from ' select a , concat(?,b) from t1 ' ;
+prepare stmt1 from ' select a , concat(?,b) from t1 order by a ' ;
 execute stmt1 using @arg00;
 #
-select a , concat(b,@arg00) from t1 ;
-prepare stmt1 from ' select a , concat(b,?) from t1 ' ;
+select a , concat(b,@arg00) from t1 order by a ;
+prepare stmt1 from ' select a , concat(b,?) from t1 order by a ' ;
 execute stmt1 using @arg00;
 
 # variations on 'group_concat'
@@ -147,7 +147,7 @@ create table t5 (id1 int(11) not null default '0',
        value2 varchar(100), value1 varchar(100)) ;
 insert into t5 values (1,'hh','hh'),(2,'hh','hh'),
                   (1,'ii','ii'),(2,'ii','ii') ;
-prepare stmt1 from ' select id1,value1 from t5 where id1=? or value1=? ' ;
+prepare stmt1 from ' select id1,value1 from t5 where id1=? or value1=? order by id1,value1 ' ;
 set @arg00=1 ;
 set @arg01='hh' ;
 execute stmt1 using @arg00, @arg01 ;
@@ -216,8 +216,8 @@ execute stmt1 using @arg00 ;
 # parameter in IN
 set @arg00=2 ;
 set @arg01=3 ;
-select a FROM t1 where a in (@arg00,@arg01);
-prepare stmt1 from ' select a FROM t1 where a in (?,?) ';
+select a FROM t1 where a in (@arg00,@arg01) order by a;
+prepare stmt1 from ' select a FROM t1 where a in (?,?) order by a ';
 execute stmt1 using @arg00, @arg01;
 # case derived from client_test.c: test_bug1500()
 set @arg00= 'one' ;
@@ -270,9 +270,9 @@ execute stmt1 using @arg00 ;
 ##### parameter used in having clause
 set @arg00='two' ;
 select a,b FROM t1 where a is not NULL
-AND b is not NULL having b <> @arg00 ;
+AND b is not NULL having b <> @arg00 order by a ;
 prepare stmt1 from ' select a,b FROM t1 where a is not NULL
-AND b is not NULL having b <> ? ' ;
+AND b is not NULL having b <> ? order by a ' ;
 execute stmt1 using @arg00 ;
 
 ##### parameter used in order clause
@@ -327,10 +327,10 @@ select '------ join tests ------' as test_sequence ;
 # no parameter
 select first.a as a1, second.a as a2 
 from t1 first, t1 second
-where first.a = second.a ;
+where first.a = second.a order by a1 ;
 prepare stmt1 from ' select first.a as a1, second.a as a2 
         from t1 first, t1 second
-        where first.a = second.a ';
+        where first.a = second.a order by a1 ';
 execute stmt1 ;
 
 # some parameters
@@ -350,15 +350,15 @@ execute stmt1 using @arg00, @arg01, @arg02;
 drop table if exists t2 ;
 --enable_warnings
 create table t2 as select * from t1 ;
-set @query1= 'SELECT * FROM t2 join t1 on (t1.a=t2.a) ' ;
-set @query2= 'SELECT * FROM t2 natural join t1 ' ;
-set @query3= 'SELECT * FROM t2 join t1 using(a) ' ;
-set @query4= 'SELECT * FROM t2 left join t1 on(t1.a=t2.a) ' ;
-set @query5= 'SELECT * FROM t2 natural left join t1 ' ;
-set @query6= 'SELECT * FROM t2 left join t1 using(a) ' ;
-set @query7= 'SELECT * FROM t2 right join t1 on(t1.a=t2.a) ' ;
-set @query8= 'SELECT * FROM t2 natural right join t1 ' ;
-set @query9= 'SELECT * FROM t2 right join t1 using(a) ' ;
+set @query1= 'SELECT * FROM t2 join t1 on (t1.a=t2.a) order by t2.a ' ;
+set @query2= 'SELECT * FROM t2 natural join t1 order by t2.a ' ;
+set @query3= 'SELECT * FROM t2 join t1 using(a) order by t2.a ' ;
+set @query4= 'SELECT * FROM t2 left join t1 on(t1.a=t2.a) order by t2.a ' ;
+set @query5= 'SELECT * FROM t2 natural left join t1 order by t2.a ' ;
+set @query6= 'SELECT * FROM t2 left join t1 using(a) order by t2.a ' ;
+set @query7= 'SELECT * FROM t2 right join t1 on(t1.a=t2.a) order by t2.a ' ;
+set @query8= 'SELECT * FROM t2 natural right join t1 order by t2.a ' ;
+set @query9= 'SELECT * FROM t2 right join t1 using(a) order by t2.a ' ;
 let $1= 9 ;
 while ($1)
 {
@@ -424,7 +424,7 @@ execute stmt1 using @arg00, @arg01, @arg02, @arg03 ;
 ######## correlated subquery
 # no parameter
 prepare stmt1 from ' select a, b FROM t1 outer_table where
-   a = (select a from t1 where b = outer_table.b ) ';
+   a = (select a from t1 where b = outer_table.b ) order by a ';
 # also Bug#4000 (only BDB tables)
 # Bug#4106 : ndb table, query with correlated subquery, wrong result
 execute stmt1 ;

mysql-test/r/ps_2myisam.result

@@ -165,26 +165,26 @@ execute stmt1 using @arg00 ;
 substr('MySQL',1,?)
 MyS
 set @arg00='MySQL' ;
-select a , concat(@arg00,b) from t1 ;
+select a , concat(@arg00,b) from t1 order by a;
 a	concat(@arg00,b)
 1	MySQLone
 2	MySQLtwo
 3	MySQLthree
 4	MySQLfour
-prepare stmt1 from ' select a , concat(?,b) from t1 ' ;
+prepare stmt1 from ' select a , concat(?,b) from t1 order by a ' ;
 execute stmt1 using @arg00;
 a	concat(?,b)
 1	MySQLone
 2	MySQLtwo
 3	MySQLthree
 4	MySQLfour
-select a , concat(b,@arg00) from t1 ;
+select a , concat(b,@arg00) from t1 order by a ;
 a	concat(b,@arg00)
 1	oneMySQL
 2	twoMySQL
 3	threeMySQL
 4	fourMySQL
-prepare stmt1 from ' select a , concat(b,?) from t1 ' ;
+prepare stmt1 from ' select a , concat(b,?) from t1 order by a ' ;
 execute stmt1 using @arg00;
 a	concat(b,?)
 1	oneMySQL
@@ -234,14 +234,14 @@ create table t5 (id1 int(11) not null default '0',
 value2 varchar(100), value1 varchar(100)) ;
 insert into t5 values (1,'hh','hh'),(2,'hh','hh'),
 (1,'ii','ii'),(2,'ii','ii') ;
-prepare stmt1 from ' select id1,value1 from t5 where id1=? or value1=? ' ;
+prepare stmt1 from ' select id1,value1 from t5 where id1=? or value1=? order by id1,value1 ' ;
 set @arg00=1 ;
 set @arg01='hh' ;
 execute stmt1 using @arg00, @arg01 ;
 id1	value1
 1	hh
-2	hh
 1	ii
+2	hh
 drop table t5 ;
 drop table if exists t5 ;
 create table t5(session_id  char(9) not null) ;
@@ -307,11 +307,11 @@ execute stmt1 using @arg00 ;
 a
 set @arg00=2 ;
 set @arg01=3 ;
-select a FROM t1 where a in (@arg00,@arg01);
+select a FROM t1 where a in (@arg00,@arg01) order by a;
 a
 2
 3
-prepare stmt1 from ' select a FROM t1 where a in (?,?) ';
+prepare stmt1 from ' select a FROM t1 where a in (?,?) order by a ';
 execute stmt1 using @arg00, @arg01;
 a
 2
@@ -385,13 +385,13 @@ a	b
 4	four
 set @arg00='two' ;
 select a,b FROM t1 where a is not NULL
-AND b is not NULL having b <> @arg00 ;
+AND b is not NULL having b <> @arg00 order by a ;
 a	b
 1	one
 3	three
 4	four
 prepare stmt1 from ' select a,b FROM t1 where a is not NULL
-AND b is not NULL having b <> ? ' ;
+AND b is not NULL having b <> ? order by a ' ;
 execute stmt1 using @arg00 ;
 a	b
 1	one
@@ -470,7 +470,7 @@ test_sequence
 ------ join tests ------
 select first.a as a1, second.a as a2 
 from t1 first, t1 second
-where first.a = second.a ;
+where first.a = second.a order by a1 ;
 a1	a2
 1	1
 2	2
@@ -478,7 +478,7 @@ a1	a2
 4	4
 prepare stmt1 from ' select first.a as a1, second.a as a2 
         from t1 first, t1 second
-        where first.a = second.a ';
+        where first.a = second.a order by a1 ';
 execute stmt1 ;
 a1	a2
 1	1
@@ -517,17 +517,17 @@ a	?	a
 4	ABC	4
 drop table if exists t2 ;
 create table t2 as select * from t1 ;
-set @query1= 'SELECT * FROM t2 join t1 on (t1.a=t2.a) ' ;
-set @query2= 'SELECT * FROM t2 natural join t1 ' ;
-set @query3= 'SELECT * FROM t2 join t1 using(a) ' ;
-set @query4= 'SELECT * FROM t2 left join t1 on(t1.a=t2.a) ' ;
-set @query5= 'SELECT * FROM t2 natural left join t1 ' ;
-set @query6= 'SELECT * FROM t2 left join t1 using(a) ' ;
-set @query7= 'SELECT * FROM t2 right join t1 on(t1.a=t2.a) ' ;
-set @query8= 'SELECT * FROM t2 natural right join t1 ' ;
-set @query9= 'SELECT * FROM t2 right join t1 using(a) ' ;
+set @query1= 'SELECT * FROM t2 join t1 on (t1.a=t2.a) order by t2.a ' ;
+set @query2= 'SELECT * FROM t2 natural join t1 order by t2.a ' ;
+set @query3= 'SELECT * FROM t2 join t1 using(a) order by t2.a ' ;
+set @query4= 'SELECT * FROM t2 left join t1 on(t1.a=t2.a) order by t2.a ' ;
+set @query5= 'SELECT * FROM t2 natural left join t1 order by t2.a ' ;
+set @query6= 'SELECT * FROM t2 left join t1 using(a) order by t2.a ' ;
+set @query7= 'SELECT * FROM t2 right join t1 on(t1.a=t2.a) order by t2.a ' ;
+set @query8= 'SELECT * FROM t2 natural right join t1 order by t2.a ' ;
+set @query9= 'SELECT * FROM t2 right join t1 using(a) order by t2.a ' ;
 the join statement is:
-SELECT * FROM t2 right join t1 using(a) 
+SELECT * FROM t2 right join t1 using(a) order by t2.a 
 prepare stmt1 from @query9  ;
 execute stmt1 ;
 a	b	a	b
@@ -548,7 +548,7 @@ a	b	a	b
 3	three	3	three
 4	four	4	four
 the join statement is:
-SELECT * FROM t2 natural right join t1 
+SELECT * FROM t2 natural right join t1 order by t2.a 
 prepare stmt1 from @query8 ;
 execute stmt1 ;
 a	b	a	b
@@ -569,7 +569,7 @@ a	b	a	b
 3	three	3	three
 4	four	4	four
 the join statement is:
-SELECT * FROM t2 right join t1 on(t1.a=t2.a) 
+SELECT * FROM t2 right join t1 on(t1.a=t2.a) order by t2.a 
 prepare stmt1 from @query7 ;
 execute stmt1 ;
 a	b	a	b
@@ -590,7 +590,7 @@ a	b	a	b
 3	three	3	three
 4	four	4	four
 the join statement is:
-SELECT * FROM t2 left join t1 using(a) 
+SELECT * FROM t2 left join t1 using(a) order by t2.a 
 prepare stmt1 from @query6 ;
 execute stmt1 ;
 a	b	a	b
@@ -611,7 +611,7 @@ a	b	a	b
 3	three	3	three
 4	four	4	four
 the join statement is:
-SELECT * FROM t2 natural left join t1 
+SELECT * FROM t2 natural left join t1 order by t2.a 
 prepare stmt1 from @query5 ;
 execute stmt1 ;
 a	b	a	b
@@ -632,7 +632,7 @@ a	b	a	b
 3	three	3	three
 4	four	4	four
 the join statement is:
-SELECT * FROM t2 left join t1 on(t1.a=t2.a) 
+SELECT * FROM t2 left join t1 on(t1.a=t2.a) order by t2.a 
 prepare stmt1 from @query4 ;
 execute stmt1 ;
 a	b	a	b
@@ -653,7 +653,7 @@ a	b	a	b
 3	three	3	three
 4	four	4	four
 the join statement is:
-SELECT * FROM t2 join t1 using(a) 
+SELECT * FROM t2 join t1 using(a) order by t2.a 
 prepare stmt1 from @query3 ;
 execute stmt1 ;
 a	b	a	b
@@ -674,7 +674,7 @@ a	b	a	b
 3	three	3	three
 4	four	4	four
 the join statement is:
-SELECT * FROM t2 natural join t1 
+SELECT * FROM t2 natural join t1 order by t2.a 
 prepare stmt1 from @query2 ;
 execute stmt1 ;
 a	b
@@ -695,7 +695,7 @@ a	b
 3	three
 4	four
 the join statement is:
-SELECT * FROM t2 join t1 on (t1.a=t2.a) 
+SELECT * FROM t2 join t1 on (t1.a=t2.a) order by t2.a 
 prepare stmt1 from @query1 ;
 execute stmt1 ;
 a	b	a	b
@@ -769,7 +769,7 @@ execute stmt1 using @arg00, @arg01, @arg02, @arg03 ;
 a	?	b
 2	1	two
 prepare stmt1 from ' select a, b FROM t1 outer_table where
-   a = (select a from t1 where b = outer_table.b ) ';
+   a = (select a from t1 where b = outer_table.b ) order by a ';
 execute stmt1 ;
 a	b
 1	one

mysql-test/r/ps_3innodb.result

@@ -165,26 +165,26 @@ execute stmt1 using @arg00 ;
 substr('MySQL',1,?)
 MyS
 set @arg00='MySQL' ;
-select a , concat(@arg00,b) from t1 ;
+select a , concat(@arg00,b) from t1 order by a;
 a	concat(@arg00,b)
 1	MySQLone
 2	MySQLtwo
 3	MySQLthree
 4	MySQLfour
-prepare stmt1 from ' select a , concat(?,b) from t1 ' ;
+prepare stmt1 from ' select a , concat(?,b) from t1 order by a ' ;
 execute stmt1 using @arg00;
 a	concat(?,b)
 1	MySQLone
 2	MySQLtwo
 3	MySQLthree
 4	MySQLfour
-select a , concat(b,@arg00) from t1 ;
+select a , concat(b,@arg00) from t1 order by a ;
 a	concat(b,@arg00)
 1	oneMySQL
 2	twoMySQL
 3	threeMySQL
 4	fourMySQL
-prepare stmt1 from ' select a , concat(b,?) from t1 ' ;
+prepare stmt1 from ' select a , concat(b,?) from t1 order by a ' ;
 execute stmt1 using @arg00;
 a	concat(b,?)
 1	oneMySQL
@@ -234,14 +234,14 @@ create table t5 (id1 int(11) not null default '0',
 value2 varchar(100), value1 varchar(100)) ;
 insert into t5 values (1,'hh','hh'),(2,'hh','hh'),
 (1,'ii','ii'),(2,'ii','ii') ;
-prepare stmt1 from ' select id1,value1 from t5 where id1=? or value1=? ' ;
+prepare stmt1 from ' select id1,value1 from t5 where id1=? or value1=? order by id1,value1 ' ;
 set @arg00=1 ;
 set @arg01='hh' ;
 execute stmt1 using @arg00, @arg01 ;
 id1	value1
 1	hh
-2	hh
 1	ii
+2	hh
 drop table t5 ;
 drop table if exists t5 ;
 create table t5(session_id  char(9) not null) ;
@@ -307,11 +307,11 @@ execute stmt1 using @arg00 ;
 a
 set @arg00=2 ;
 set @arg01=3 ;
-select a FROM t1 where a in (@arg00,@arg01);
+select a FROM t1 where a in (@arg00,@arg01) order by a;
 a
 2
 3
-prepare stmt1 from ' select a FROM t1 where a in (?,?) ';
+prepare stmt1 from ' select a FROM t1 where a in (?,?) order by a ';
 execute stmt1 using @arg00, @arg01;
 a
 2
@@ -385,13 +385,13 @@ a	b
 4	four
 set @arg00='two' ;
 select a,b FROM t1 where a is not NULL
-AND b is not NULL having b <> @arg00 ;
+AND b is not NULL having b <> @arg00 order by a ;
 a	b
 1	one
 3	three
 4	four
 prepare stmt1 from ' select a,b FROM t1 where a is not NULL
-AND b is not NULL having b <> ? ' ;
+AND b is not NULL having b <> ? order by a ' ;
 execute stmt1 using @arg00 ;
 a	b
 1	one
@@ -470,7 +470,7 @@ test_sequence
 ------ join tests ------
 select first.a as a1, second.a as a2 
 from t1 first, t1 second
-where first.a = second.a ;
+where first.a = second.a order by a1 ;
 a1	a2
 1	1
 2	2
@@ -478,7 +478,7 @@ a1	a2
 4	4
 prepare stmt1 from ' select first.a as a1, second.a as a2 
         from t1 first, t1 second
-        where first.a = second.a ';
+        where first.a = second.a order by a1 ';
 execute stmt1 ;
 a1	a2
 1	1
@@ -517,17 +517,17 @@ a	?	a
 4	ABC	4
 drop table if exists t2 ;
 create table t2 as select * from t1 ;
-set @query1= 'SELECT * FROM t2 join t1 on (t1.a=t2.a) ' ;
-set @query2= 'SELECT * FROM t2 natural join t1 ' ;
-set @query3= 'SELECT * FROM t2 join t1 using(a) ' ;
-set @query4= 'SELECT * FROM t2 left join t1 on(t1.a=t2.a) ' ;
-set @query5= 'SELECT * FROM t2 natural left join t1 ' ;
-set @query6= 'SELECT * FROM t2 left join t1 using(a) ' ;
-set @query7= 'SELECT * FROM t2 right join t1 on(t1.a=t2.a) ' ;
-set @query8= 'SELECT * FROM t2 natural right join t1 ' ;
-set @query9= 'SELECT * FROM t2 right join t1 using(a) ' ;
+set @query1= 'SELECT * FROM t2 join t1 on (t1.a=t2.a) order by t2.a ' ;
+set @query2= 'SELECT * FROM t2 natural join t1 order by t2.a ' ;
+set @query3= 'SELECT * FROM t2 join t1 using(a) order by t2.a ' ;
+set @query4= 'SELECT * FROM t2 left join t1 on(t1.a=t2.a) order by t2.a ' ;
+set @query5= 'SELECT * FROM t2 natural left join t1 order by t2.a ' ;
+set @query6= 'SELECT * FROM t2 left join t1 using(a) order by t2.a ' ;
+set @query7= 'SELECT * FROM t2 right join t1 on(t1.a=t2.a) order by t2.a ' ;
+set @query8= 'SELECT * FROM t2 natural right join t1 order by t2.a ' ;
+set @query9= 'SELECT * FROM t2 right join t1 using(a) order by t2.a ' ;
 the join statement is:
-SELECT * FROM t2 right join t1 using(a) 
+SELECT * FROM t2 right join t1 using(a) order by t2.a 
 prepare stmt1 from @query9  ;
 execute stmt1 ;
 a	b	a	b
@@ -548,7 +548,7 @@ a	b	a	b
 3	three	3	three
 4	four	4	four
 the join statement is:
-SELECT * FROM t2 natural right join t1 
+SELECT * FROM t2 natural right join t1 order by t2.a 
 prepare stmt1 from @query8 ;
 execute stmt1 ;
 a	b	a	b
@@ -569,7 +569,7 @@ a	b	a	b
 3	three	3	three
 4	four	4	four
 the join statement is:
-SELECT * FROM t2 right join t1 on(t1.a=t2.a) 
+SELECT * FROM t2 right join t1 on(t1.a=t2.a) order by t2.a 
 prepare stmt1 from @query7 ;
 execute stmt1 ;
 a	b	a	b
@@ -590,7 +590,7 @@ a	b	a	b
 3	three	3	three
 4	four	4	four
 the join statement is:
-SELECT * FROM t2 left join t1 using(a) 
+SELECT * FROM t2 left join t1 using(a) order by t2.a 
 prepare stmt1 from @query6 ;
 execute stmt1 ;
 a	b	a	b
@@ -611,7 +611,7 @@ a	b	a	b
 3	three	3	three
 4	four	4	four
 the join statement is:
-SELECT * FROM t2 natural left join t1 
+SELECT * FROM t2 natural left join t1 order by t2.a 
 prepare stmt1 from @query5 ;
 execute stmt1 ;
 a	b	a	b
@@ -632,7 +632,7 @@ a	b	a	b
 3	three	3	three
 4	four	4	four
 the join statement is:
-SELECT * FROM t2 left join t1 on(t1.a=t2.a) 
+SELECT * FROM t2 left join t1 on(t1.a=t2.a) order by t2.a 
 prepare stmt1 from @query4 ;
 execute stmt1 ;
 a	b	a	b
@@ -653,7 +653,7 @@ a	b	a	b
 3	three	3	three
 4	four	4	four
 the join statement is:
-SELECT * FROM t2 join t1 using(a) 
+SELECT * FROM t2 join t1 using(a) order by t2.a 
 prepare stmt1 from @query3 ;
 execute stmt1 ;
 a	b	a	b
@@ -674,7 +674,7 @@ a	b	a	b
 3	three	3	three
 4	four	4	four
 the join statement is:
-SELECT * FROM t2 natural join t1 
+SELECT * FROM t2 natural join t1 order by t2.a 
 prepare stmt1 from @query2 ;
 execute stmt1 ;
 a	b
@@ -695,7 +695,7 @@ a	b
 3	three
 4	four
 the join statement is:
-SELECT * FROM t2 join t1 on (t1.a=t2.a) 
+SELECT * FROM t2 join t1 on (t1.a=t2.a) order by t2.a 
 prepare stmt1 from @query1 ;
 execute stmt1 ;
 a	b	a	b
@@ -769,7 +769,7 @@ execute stmt1 using @arg00, @arg01, @arg02, @arg03 ;
 a	?	b
 2	1	two
 prepare stmt1 from ' select a, b FROM t1 outer_table where
-   a = (select a from t1 where b = outer_table.b ) ';
+   a = (select a from t1 where b = outer_table.b ) order by a ';
 execute stmt1 ;
 a	b
 1	one

mysql-test/r/ps_4heap.result

@@ -166,26 +166,26 @@ execute stmt1 using @arg00 ;
 substr('MySQL',1,?)
 MyS
 set @arg00='MySQL' ;
-select a , concat(@arg00,b) from t1 ;
+select a , concat(@arg00,b) from t1 order by a;
 a	concat(@arg00,b)
 1	MySQLone
 2	MySQLtwo
 3	MySQLthree
 4	MySQLfour
-prepare stmt1 from ' select a , concat(?,b) from t1 ' ;
+prepare stmt1 from ' select a , concat(?,b) from t1 order by a ' ;
 execute stmt1 using @arg00;
 a	concat(?,b)
 1	MySQLone
 2	MySQLtwo
 3	MySQLthree
 4	MySQLfour
-select a , concat(b,@arg00) from t1 ;
+select a , concat(b,@arg00) from t1 order by a ;
 a	concat(b,@arg00)
 1	oneMySQL
 2	twoMySQL
 3	threeMySQL
 4	fourMySQL
-prepare stmt1 from ' select a , concat(b,?) from t1 ' ;
+prepare stmt1 from ' select a , concat(b,?) from t1 order by a ' ;
 execute stmt1 using @arg00;
 a	concat(b,?)
 1	oneMySQL
@@ -235,14 +235,14 @@ create table t5 (id1 int(11) not null default '0',
 value2 varchar(100), value1 varchar(100)) ;
 insert into t5 values (1,'hh','hh'),(2,'hh','hh'),
 (1,'ii','ii'),(2,'ii','ii') ;
-prepare stmt1 from ' select id1,value1 from t5 where id1=? or value1=? ' ;
+prepare stmt1 from ' select id1,value1 from t5 where id1=? or value1=? order by id1,value1 ' ;
 set @arg00=1 ;
 set @arg01='hh' ;
 execute stmt1 using @arg00, @arg01 ;
 id1	value1
 1	hh
-2	hh
 1	ii
+2	hh
 drop table t5 ;
 drop table if exists t5 ;
 create table t5(session_id  char(9) not null) ;
@@ -308,11 +308,11 @@ execute stmt1 using @arg00 ;
 a
 set @arg00=2 ;
 set @arg01=3 ;
-select a FROM t1 where a in (@arg00,@arg01);
+select a FROM t1 where a in (@arg00,@arg01) order by a;
 a
 2
 3
-prepare stmt1 from ' select a FROM t1 where a in (?,?) ';
+prepare stmt1 from ' select a FROM t1 where a in (?,?) order by a ';
 execute stmt1 using @arg00, @arg01;
 a
 2
@@ -386,13 +386,13 @@ a	b
 4	four
 set @arg00='two' ;
 select a,b FROM t1 where a is not NULL
-AND b is not NULL having b <> @arg00 ;
+AND b is not NULL having b <> @arg00 order by a ;
 a	b
 1	one
 3	three
 4	four
 prepare stmt1 from ' select a,b FROM t1 where a is not NULL
-AND b is not NULL having b <> ? ' ;
+AND b is not NULL having b <> ? order by a ' ;
 execute stmt1 using @arg00 ;
 a	b
 1	one
@@ -471,7 +471,7 @@ test_sequence
 ------ join tests ------
 select first.a as a1, second.a as a2 
 from t1 first, t1 second
-where first.a = second.a ;
+where first.a = second.a order by a1 ;
 a1	a2
 1	1
 2	2
@@ -479,7 +479,7 @@ a1	a2
 4	4
 prepare stmt1 from ' select first.a as a1, second.a as a2 
         from t1 first, t1 second
-        where first.a = second.a ';
+        where first.a = second.a order by a1 ';
 execute stmt1 ;
 a1	a2
 1	1
@@ -518,17 +518,17 @@ a	?	a
 4	ABC	4
 drop table if exists t2 ;
 create table t2 as select * from t1 ;
-set @query1= 'SELECT * FROM t2 join t1 on (t1.a=t2.a) ' ;
-set @query2= 'SELECT * FROM t2 natural join t1 ' ;
-set @query3= 'SELECT * FROM t2 join t1 using(a) ' ;
-set @query4= 'SELECT * FROM t2 left join t1 on(t1.a=t2.a) ' ;
-set @query5= 'SELECT * FROM t2 natural left join t1 ' ;
-set @query6= 'SELECT * FROM t2 left join t1 using(a) ' ;
-set @query7= 'SELECT * FROM t2 right join t1 on(t1.a=t2.a) ' ;
-set @query8= 'SELECT * FROM t2 natural right join t1 ' ;
-set @query9= 'SELECT * FROM t2 right join t1 using(a) ' ;
+set @query1= 'SELECT * FROM t2 join t1 on (t1.a=t2.a) order by t2.a ' ;
+set @query2= 'SELECT * FROM t2 natural join t1 order by t2.a ' ;
+set @query3= 'SELECT * FROM t2 join t1 using(a) order by t2.a ' ;
+set @query4= 'SELECT * FROM t2 left join t1 on(t1.a=t2.a) order by t2.a ' ;
+set @query5= 'SELECT * FROM t2 natural left join t1 order by t2.a ' ;
+set @query6= 'SELECT * FROM t2 left join t1 using(a) order by t2.a ' ;
+set @query7= 'SELECT * FROM t2 right join t1 on(t1.a=t2.a) order by t2.a ' ;
+set @query8= 'SELECT * FROM t2 natural right join t1 order by t2.a ' ;
+set @query9= 'SELECT * FROM t2 right join t1 using(a) order by t2.a ' ;
 the join statement is:
-SELECT * FROM t2 right join t1 using(a) 
+SELECT * FROM t2 right join t1 using(a) order by t2.a 
 prepare stmt1 from @query9  ;
 execute stmt1 ;
 a	b	a	b
@@ -549,7 +549,7 @@ a	b	a	b
 3	three	3	three
 4	four	4	four
 the join statement is:
-SELECT * FROM t2 natural right join t1 
+SELECT * FROM t2 natural right join t1 order by t2.a 
 prepare stmt1 from @query8 ;
 execute stmt1 ;
 a	b	a	b
@@ -570,7 +570,7 @@ a	b	a	b
 3	three	3	three
 4	four	4	four
 the join statement is:
-SELECT * FROM t2 right join t1 on(t1.a=t2.a) 
+SELECT * FROM t2 right join t1 on(t1.a=t2.a) order by t2.a 
 prepare stmt1 from @query7 ;
 execute stmt1 ;
 a	b	a	b
@@ -591,7 +591,7 @@ a	b	a	b
 3	three	3	three
 4	four	4	four
 the join statement is:
-SELECT * FROM t2 left join t1 using(a) 
+SELECT * FROM t2 left join t1 using(a) order by t2.a 
 prepare stmt1 from @query6 ;
 execute stmt1 ;
 a	b	a	b
@@ -612,7 +612,7 @@ a	b	a	b
 3	three	3	three
 4	four	4	four
 the join statement is:
-SELECT * FROM t2 natural left join t1 
+SELECT * FROM t2 natural left join t1 order by t2.a 
 prepare stmt1 from @query5 ;
 execute stmt1 ;
 a	b	a	b
@@ -633,7 +633,7 @@ a	b	a	b
 3	three	3	three
 4	four	4	four
 the join statement is:
-SELECT * FROM t2 left join t1 on(t1.a=t2.a) 
+SELECT * FROM t2 left join t1 on(t1.a=t2.a) order by t2.a 
 prepare stmt1 from @query4 ;
 execute stmt1 ;
 a	b	a	b
@@ -654,7 +654,7 @@ a	b	a	b
 3	three	3	three
 4	four	4	four
 the join statement is:
-SELECT * FROM t2 join t1 using(a) 
+SELECT * FROM t2 join t1 using(a) order by t2.a 
 prepare stmt1 from @query3 ;
 execute stmt1 ;
 a	b	a	b
@@ -675,7 +675,7 @@ a	b	a	b
 3	three	3	three
 4	four	4	four
 the join statement is:
-SELECT * FROM t2 natural join t1 
+SELECT * FROM t2 natural join t1 order by t2.a 
 prepare stmt1 from @query2 ;
 execute stmt1 ;
 a	b
@@ -696,7 +696,7 @@ a	b
 3	three
 4	four
 the join statement is:
-SELECT * FROM t2 join t1 on (t1.a=t2.a) 
+SELECT * FROM t2 join t1 on (t1.a=t2.a) order by t2.a 
 prepare stmt1 from @query1 ;
 execute stmt1 ;
 a	b	a	b
@@ -770,7 +770,7 @@ execute stmt1 using @arg00, @arg01, @arg02, @arg03 ;
 a	?	b
 2	1	two
 prepare stmt1 from ' select a, b FROM t1 outer_table where
-   a = (select a from t1 where b = outer_table.b ) ';
+   a = (select a from t1 where b = outer_table.b ) order by a ';
 execute stmt1 ;
 a	b
 1	one

mysql-test/r/ps_6bdb.result

@@ -165,26 +165,26 @@ execute stmt1 using @arg00 ;
 substr('MySQL',1,?)
 MyS
 set @arg00='MySQL' ;
-select a , concat(@arg00,b) from t1 ;
+select a , concat(@arg00,b) from t1 order by a;
 a	concat(@arg00,b)
 1	MySQLone
 2	MySQLtwo
 3	MySQLthree
 4	MySQLfour
-prepare stmt1 from ' select a , concat(?,b) from t1 ' ;
+prepare stmt1 from ' select a , concat(?,b) from t1 order by a ' ;
 execute stmt1 using @arg00;
 a	concat(?,b)
 1	MySQLone
 2	MySQLtwo
 3	MySQLthree
 4	MySQLfour
-select a , concat(b,@arg00) from t1 ;
+select a , concat(b,@arg00) from t1 order by a ;
 a	concat(b,@arg00)
 1	oneMySQL
 2	twoMySQL
 3	threeMySQL
 4	fourMySQL
-prepare stmt1 from ' select a , concat(b,?) from t1 ' ;
+prepare stmt1 from ' select a , concat(b,?) from t1 order by a ' ;
 execute stmt1 using @arg00;
 a	concat(b,?)
 1	oneMySQL
@@ -234,14 +234,14 @@ create table t5 (id1 int(11) not null default '0',
 value2 varchar(100), value1 varchar(100)) ;
 insert into t5 values (1,'hh','hh'),(2,'hh','hh'),
 (1,'ii','ii'),(2,'ii','ii') ;
-prepare stmt1 from ' select id1,value1 from t5 where id1=? or value1=? ' ;
+prepare stmt1 from ' select id1,value1 from t5 where id1=? or value1=? order by id1,value1 ' ;
 set @arg00=1 ;
 set @arg01='hh' ;
 execute stmt1 using @arg00, @arg01 ;
 id1	value1
 1	hh
-2	hh
 1	ii
+2	hh
 drop table t5 ;
 drop table if exists t5 ;
 create table t5(session_id  char(9) not null) ;
@@ -307,11 +307,11 @@ execute stmt1 using @arg00 ;
 a
 set @arg00=2 ;
 set @arg01=3 ;
-select a FROM t1 where a in (@arg00,@arg01);
+select a FROM t1 where a in (@arg00,@arg01) order by a;
 a
 2
 3
-prepare stmt1 from ' select a FROM t1 where a in (?,?) ';
+prepare stmt1 from ' select a FROM t1 where a in (?,?) order by a ';
 execute stmt1 using @arg00, @arg01;
 a
 2
@@ -385,13 +385,13 @@ a	b
 4	four
 set @arg00='two' ;
 select a,b FROM t1 where a is not NULL
-AND b is not NULL having b <> @arg00 ;
+AND b is not NULL having b <> @arg00 order by a ;
 a	b
 1	one
 3	three
 4	four
 prepare stmt1 from ' select a,b FROM t1 where a is not NULL
-AND b is not NULL having b <> ? ' ;
+AND b is not NULL having b <> ? order by a ' ;
 execute stmt1 using @arg00 ;
 a	b
 1	one
@@ -470,7 +470,7 @@ test_sequence
 ------ join tests ------
 select first.a as a1, second.a as a2 
 from t1 first, t1 second
-where first.a = second.a ;
+where first.a = second.a order by a1 ;
 a1	a2
 1	1
 2	2
@@ -478,7 +478,7 @@ a1	a2
 4	4
 prepare stmt1 from ' select first.a as a1, second.a as a2 
         from t1 first, t1 second
-        where first.a = second.a ';
+        where first.a = second.a order by a1 ';
 execute stmt1 ;
 a1	a2
 1	1
@@ -517,17 +517,17 @@ a	?	a
 4	ABC	4
 drop table if exists t2 ;
 create table t2 as select * from t1 ;
-set @query1= 'SELECT * FROM t2 join t1 on (t1.a=t2.a) ' ;
-set @query2= 'SELECT * FROM t2 natural join t1 ' ;
-set @query3= 'SELECT * FROM t2 join t1 using(a) ' ;
-set @query4= 'SELECT * FROM t2 left join t1 on(t1.a=t2.a) ' ;
-set @query5= 'SELECT * FROM t2 natural left join t1 ' ;
-set @query6= 'SELECT * FROM t2 left join t1 using(a) ' ;
-set @query7= 'SELECT * FROM t2 right join t1 on(t1.a=t2.a) ' ;
-set @query8= 'SELECT * FROM t2 natural right join t1 ' ;
-set @query9= 'SELECT * FROM t2 right join t1 using(a) ' ;
+set @query1= 'SELECT * FROM t2 join t1 on (t1.a=t2.a) order by t2.a ' ;
+set @query2= 'SELECT * FROM t2 natural join t1 order by t2.a ' ;
+set @query3= 'SELECT * FROM t2 join t1 using(a) order by t2.a ' ;
+set @query4= 'SELECT * FROM t2 left join t1 on(t1.a=t2.a) order by t2.a ' ;
+set @query5= 'SELECT * FROM t2 natural left join t1 order by t2.a ' ;
+set @query6= 'SELECT * FROM t2 left join t1 using(a) order by t2.a ' ;
+set @query7= 'SELECT * FROM t2 right join t1 on(t1.a=t2.a) order by t2.a ' ;
+set @query8= 'SELECT * FROM t2 natural right join t1 order by t2.a ' ;
+set @query9= 'SELECT * FROM t2 right join t1 using(a) order by t2.a ' ;
 the join statement is:
-SELECT * FROM t2 right join t1 using(a) 
+SELECT * FROM t2 right join t1 using(a) order by t2.a 
 prepare stmt1 from @query9  ;
 execute stmt1 ;
 a	b	a	b
@@ -548,7 +548,7 @@ a	b	a	b
 3	three	3	three
 4	four	4	four
 the join statement is:
-SELECT * FROM t2 natural right join t1 
+SELECT * FROM t2 natural right join t1 order by t2.a 
 prepare stmt1 from @query8 ;
 execute stmt1 ;
 a	b	a	b
@@ -569,7 +569,7 @@ a	b	a	b
 3	three	3	three
 4	four	4	four
 the join statement is:
-SELECT * FROM t2 right join t1 on(t1.a=t2.a) 
+SELECT * FROM t2 right join t1 on(t1.a=t2.a) order by t2.a 
 prepare stmt1 from @query7 ;
 execute stmt1 ;
 a	b	a	b
@@ -590,7 +590,7 @@ a	b	a	b
 3	three	3	three
 4	four	4	four
 the join statement is:
-SELECT * FROM t2 left join t1 using(a) 
+SELECT * FROM t2 left join t1 using(a) order by t2.a 
 prepare stmt1 from @query6 ;
 execute stmt1 ;
 a	b	a	b
@@ -611,7 +611,7 @@ a	b	a	b
 3	three	3	three
 4	four	4	four
 the join statement is:
-SELECT * FROM t2 natural left join t1 
+SELECT * FROM t2 natural left join t1 order by t2.a 
 prepare stmt1 from @query5 ;
 execute stmt1 ;
 a	b	a	b
@@ -632,7 +632,7 @@ a	b	a	b
 3	three	3	three
 4	four	4	four
 the join statement is:
-SELECT * FROM t2 left join t1 on(t1.a=t2.a) 
+SELECT * FROM t2 left join t1 on(t1.a=t2.a) order by t2.a 
 prepare stmt1 from @query4 ;
 execute stmt1 ;
 a	b	a	b
@@ -653,7 +653,7 @@ a	b	a	b
 3	three	3	three
 4	four	4	four
 the join statement is:
-SELECT * FROM t2 join t1 using(a) 
+SELECT * FROM t2 join t1 using(a) order by t2.a 
 prepare stmt1 from @query3 ;
 execute stmt1 ;
 a	b	a	b
@@ -674,7 +674,7 @@ a	b	a	b
 3	three	3	three
 4	four	4	four
 the join statement is:
-SELECT * FROM t2 natural join t1 
+SELECT * FROM t2 natural join t1 order by t2.a 
 prepare stmt1 from @query2 ;
 execute stmt1 ;
 a	b
@@ -695,7 +695,7 @@ a	b
 3	three
 4	four
 the join statement is:
-SELECT * FROM t2 join t1 on (t1.a=t2.a) 
+SELECT * FROM t2 join t1 on (t1.a=t2.a) order by t2.a 
 prepare stmt1 from @query1 ;
 execute stmt1 ;
 a	b	a	b
@@ -769,7 +769,7 @@ execute stmt1 using @arg00, @arg01, @arg02, @arg03 ;
 a	?	b
 2	1	two
 prepare stmt1 from ' select a, b FROM t1 outer_table where
-   a = (select a from t1 where b = outer_table.b ) ';
+   a = (select a from t1 where b = outer_table.b ) order by a ';
 execute stmt1 ;
 a	b
 1	one

mysql-test/r/ps_7ndb.result

@@ -166,32 +166,32 @@ execute stmt1 using @arg00 ;
 substr('MySQL',1,?)
 MyS
 set @arg00='MySQL' ;
-select a , concat(@arg00,b) from t1 ;
+select a , concat(@arg00,b) from t1 order by a;
 a	concat(@arg00,b)
+1	MySQLone
 2	MySQLtwo
-4	MySQLfour
 3	MySQLthree
-1	MySQLone
-prepare stmt1 from ' select a , concat(?,b) from t1 ' ;
+4	MySQLfour
+prepare stmt1 from ' select a , concat(?,b) from t1 order by a ' ;
 execute stmt1 using @arg00;
 a	concat(?,b)
+1	MySQLone
 2	MySQLtwo
-4	MySQLfour
 3	MySQLthree
-1	MySQLone
-select a , concat(b,@arg00) from t1 ;
+4	MySQLfour
+select a , concat(b,@arg00) from t1 order by a ;
 a	concat(b,@arg00)
+1	oneMySQL
 2	twoMySQL
-4	fourMySQL
 3	threeMySQL
-1	oneMySQL
-prepare stmt1 from ' select a , concat(b,?) from t1 ' ;
+4	fourMySQL
+prepare stmt1 from ' select a , concat(b,?) from t1 order by a ' ;
 execute stmt1 using @arg00;
 a	concat(b,?)
+1	oneMySQL
 2	twoMySQL
-4	fourMySQL
 3	threeMySQL
-1	oneMySQL
+4	fourMySQL
 set @arg00='MySQL' ;
 select group_concat(@arg00,b) from t1 
 group by 'a' ;
@@ -235,14 +235,14 @@ create table t5 (id1 int(11) not null default '0',
 value2 varchar(100), value1 varchar(100)) ;
 insert into t5 values (1,'hh','hh'),(2,'hh','hh'),
 (1,'ii','ii'),(2,'ii','ii') ;
-prepare stmt1 from ' select id1,value1 from t5 where id1=? or value1=? ' ;
+prepare stmt1 from ' select id1,value1 from t5 where id1=? or value1=? order by id1,value1 ' ;
 set @arg00=1 ;
 set @arg01='hh' ;
 execute stmt1 using @arg00, @arg01 ;
 id1	value1
 1	hh
-2	hh
 1	ii
+2	hh
 drop table t5 ;
 drop table if exists t5 ;
 create table t5(session_id  char(9) not null) ;
@@ -308,11 +308,11 @@ execute stmt1 using @arg00 ;
 a
 set @arg00=2 ;
 set @arg01=3 ;
-select a FROM t1 where a in (@arg00,@arg01);
+select a FROM t1 where a in (@arg00,@arg01) order by a;
 a
 2
 3
-prepare stmt1 from ' select a FROM t1 where a in (?,?) ';
+prepare stmt1 from ' select a FROM t1 where a in (?,?) order by a ';
 execute stmt1 using @arg00, @arg01;
 a
 2
@@ -386,18 +386,18 @@ a	b
 4	four
 set @arg00='two' ;
 select a,b FROM t1 where a is not NULL
-AND b is not NULL having b <> @arg00 ;
+AND b is not NULL having b <> @arg00 order by a ;
 a	b
-4	four
-3	three
 1	one
+3	three
+4	four
 prepare stmt1 from ' select a,b FROM t1 where a is not NULL
-AND b is not NULL having b <> ? ' ;
+AND b is not NULL having b <> ? order by a ' ;
 execute stmt1 using @arg00 ;
 a	b
-4	four
-3	three
 1	one
+3	three
+4	four
 set @arg00=1 ;
 select a,b FROM t1 where a is not NULL
 AND b is not NULL order by a - @arg00 ;
@@ -471,21 +471,21 @@ test_sequence
 ------ join tests ------
 select first.a as a1, second.a as a2 
 from t1 first, t1 second
-where first.a = second.a ;
+where first.a = second.a order by a1 ;
 a1	a2
+1	1
 2	2
-4	4
 3	3
-1	1
+4	4
 prepare stmt1 from ' select first.a as a1, second.a as a2 
         from t1 first, t1 second
-        where first.a = second.a ';
+        where first.a = second.a order by a1 ';
 execute stmt1 ;
 a1	a2
+1	1
 2	2
-4	4
 3	3
-1	1
+4	4
 set @arg00='ABC';
 set @arg01='two';
 set @arg02='one';
@@ -518,204 +518,204 @@ a	?	a
 4	ABC	4
 drop table if exists t2 ;
 create table t2 as select * from t1 ;
-set @query1= 'SELECT * FROM t2 join t1 on (t1.a=t2.a) ' ;
-set @query2= 'SELECT * FROM t2 natural join t1 ' ;
-set @query3= 'SELECT * FROM t2 join t1 using(a) ' ;
-set @query4= 'SELECT * FROM t2 left join t1 on(t1.a=t2.a) ' ;
-set @query5= 'SELECT * FROM t2 natural left join t1 ' ;
-set @query6= 'SELECT * FROM t2 left join t1 using(a) ' ;
-set @query7= 'SELECT * FROM t2 right join t1 on(t1.a=t2.a) ' ;
-set @query8= 'SELECT * FROM t2 natural right join t1 ' ;
-set @query9= 'SELECT * FROM t2 right join t1 using(a) ' ;
+set @query1= 'SELECT * FROM t2 join t1 on (t1.a=t2.a) order by t2.a ' ;
+set @query2= 'SELECT * FROM t2 natural join t1 order by t2.a ' ;
+set @query3= 'SELECT * FROM t2 join t1 using(a) order by t2.a ' ;
+set @query4= 'SELECT * FROM t2 left join t1 on(t1.a=t2.a) order by t2.a ' ;
+set @query5= 'SELECT * FROM t2 natural left join t1 order by t2.a ' ;
+set @query6= 'SELECT * FROM t2 left join t1 using(a) order by t2.a ' ;
+set @query7= 'SELECT * FROM t2 right join t1 on(t1.a=t2.a) order by t2.a ' ;
+set @query8= 'SELECT * FROM t2 natural right join t1 order by t2.a ' ;
+set @query9= 'SELECT * FROM t2 right join t1 using(a) order by t2.a ' ;
 the join statement is:
-SELECT * FROM t2 right join t1 using(a) 
+SELECT * FROM t2 right join t1 using(a) order by t2.a 
 prepare stmt1 from @query9  ;
 execute stmt1 ;
 a	b	a	b
+1	one	1	one
 2	two	2	two
-4	four	4	four
 3	three	3	three
-1	one	1	one
+4	four	4	four
 execute stmt1 ;
 a	b	a	b
+1	one	1	one
 2	two	2	two
-4	four	4	four
 3	three	3	three
-1	one	1	one
+4	four	4	four
 execute stmt1 ;
 a	b	a	b
+1	one	1	one
 2	two	2	two
-4	four	4	four
 3	three	3	three
-1	one	1	one
+4	four	4	four
 the join statement is:
-SELECT * FROM t2 natural right join t1 
+SELECT * FROM t2 natural right join t1 order by t2.a 
 prepare stmt1 from @query8 ;
 execute stmt1 ;
 a	b	a	b
+1	one	1	one
 2	two	2	two
-4	four	4	four
 3	three	3	three
-1	one	1	one
+4	four	4	four
 execute stmt1 ;
 a	b	a	b
+1	one	1	one
 2	two	2	two
-4	four	4	four
 3	three	3	three
-1	one	1	one
+4	four	4	four
 execute stmt1 ;
 a	b	a	b
+1	one	1	one
 2	two	2	two
-4	four	4	four
 3	three	3	three
-1	one	1	one
+4	four	4	four
 the join statement is:
-SELECT * FROM t2 right join t1 on(t1.a=t2.a) 
+SELECT * FROM t2 right join t1 on(t1.a=t2.a) order by t2.a 
 prepare stmt1 from @query7 ;
 execute stmt1 ;
 a	b	a	b
+1	one	1	one
 2	two	2	two
-4	four	4	four
 3	three	3	three
-1	one	1	one
+4	four	4	four
 execute stmt1 ;
 a	b	a	b
+1	one	1	one
 2	two	2	two
-4	four	4	four
 3	three	3	three
-1	one	1	one
+4	four	4	four
 execute stmt1 ;
 a	b	a	b
+1	one	1	one
 2	two	2	two
-4	four	4	four
 3	three	3	three
-1	one	1	one
+4	four	4	four
 the join statement is:
-SELECT * FROM t2 left join t1 using(a) 
+SELECT * FROM t2 left join t1 using(a) order by t2.a 
 prepare stmt1 from @query6 ;
 execute stmt1 ;
 a	b	a	b
+1	one	1	one
 2	two	2	two
-4	four	4	four
 3	three	3	three
-1	one	1	one
+4	four	4	four
 execute stmt1 ;
 a	b	a	b
+1	one	1	one
 2	two	2	two
-4	four	4	four
 3	three	3	three
-1	one	1	one
+4	four	4	four
 execute stmt1 ;
 a	b	a	b
+1	one	1	one
 2	two	2	two
-4	four	4	four
 3	three	3	three
-1	one	1	one
+4	four	4	four
 the join statement is:
-SELECT * FROM t2 natural left join t1 
+SELECT * FROM t2 natural left join t1 order by t2.a 
 prepare stmt1 from @query5 ;
 execute stmt1 ;
 a	b	a	b
+1	one	1	one
 2	two	2	two
-4	four	4	four
 3	three	3	three
-1	one	1	one
+4	four	4	four
 execute stmt1 ;
 a	b	a	b
+1	one	1	one
 2	two	2	two
-4	four	4	four
 3	three	3	three
-1	one	1	one
+4	four	4	four
 execute stmt1 ;
 a	b	a	b
+1	one	1	one
 2	two	2	two
-4	four	4	four
 3	three	3	three
-1	one	1	one
+4	four	4	four
 the join statement is:
-SELECT * FROM t2 left join t1 on(t1.a=t2.a) 
+SELECT * FROM t2 left join t1 on(t1.a=t2.a) order by t2.a 
 prepare stmt1 from @query4 ;
 execute stmt1 ;
 a	b	a	b
+1	one	1	one
 2	two	2	two
-4	four	4	four
 3	three	3	three
-1	one	1	one
+4	four	4	four
 execute stmt1 ;
 a	b	a	b
+1	one	1	one
 2	two	2	two
-4	four	4	four
 3	three	3	three
-1	one	1	one
+4	four	4	four
 execute stmt1 ;
 a	b	a	b
+1	one	1	one
 2	two	2	two
-4	four	4	four
 3	three	3	three
-1	one	1	one
+4	four	4	four
 the join statement is:
-SELECT * FROM t2 join t1 using(a) 
+SELECT * FROM t2 join t1 using(a) order by t2.a 
 prepare stmt1 from @query3 ;
 execute stmt1 ;
 a	b	a	b
+1	one	1	one
 2	two	2	two
-4	four	4	four
 3	three	3	three
-1	one	1	one
+4	four	4	four
 execute stmt1 ;
 a	b	a	b
+1	one	1	one
 2	two	2	two
-4	four	4	four
 3	three	3	three
-1	one	1	one
+4	four	4	four
 execute stmt1 ;
 a	b	a	b
+1	one	1	one
 2	two	2	two
-4	four	4	four
 3	three	3	three
-1	one	1	one
+4	four	4	four
 the join statement is:
-SELECT * FROM t2 natural join t1 
+SELECT * FROM t2 natural join t1 order by t2.a 
 prepare stmt1 from @query2 ;
 execute stmt1 ;
 a	b
+1	one
 2	two
-4	four
 3	three
-1	one
+4	four
 execute stmt1 ;
 a	b
+1	one
 2	two
-4	four
 3	three
-1	one
+4	four
 execute stmt1 ;
 a	b
+1	one
 2	two
-4	four
 3	three
-1	one
+4	four
 the join statement is:
-SELECT * FROM t2 join t1 on (t1.a=t2.a) 
+SELECT * FROM t2 join t1 on (t1.a=t2.a) order by t2.a 
 prepare stmt1 from @query1 ;
 execute stmt1 ;
 a	b	a	b
+1	one	1	one
 2	two	2	two
-4	four	4	four
 3	three	3	three
-1	one	1	one
+4	four	4	four
 execute stmt1 ;
 a	b	a	b
+1	one	1	one
 2	two	2	two
-4	four	4	four
 3	three	3	three
-1	one	1	one
+4	four	4	four
 execute stmt1 ;
 a	b	a	b
+1	one	1	one
 2	two	2	two
-4	four	4	four
 3	three	3	three
-1	one	1	one
+4	four	4	four
 drop table t2 ;
 test_sequence
 ------ subquery tests ------
@@ -770,13 +770,13 @@ execute stmt1 using @arg00, @arg01, @arg02, @arg03 ;
 a	?	b
 2	1	two
 prepare stmt1 from ' select a, b FROM t1 outer_table where
-   a = (select a from t1 where b = outer_table.b ) ';
+   a = (select a from t1 where b = outer_table.b ) order by a ';
 execute stmt1 ;
 a	b
+1	one
 2	two
-4	four
 3	three
-1	one
+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) ';
 execute stmt1 ;
@@ -1188,7 +1188,7 @@ c29= 'longblob', c30= 'longtext', c31='two', c32= 'tuesday';
 commit ;
 prepare stmt1 from 'delete from t1 where a=2' ;
 execute stmt1;
-select a,b from t1 where a=2;
+select a,b from t1 where a=2 order by b;
 a	b
 execute stmt1;
 insert into t1 values(0,NULL);
@@ -1474,7 +1474,7 @@ set @arg02=82 ;
 set @arg03='8-2' ;
 prepare stmt1 from 'insert into t1 values(?,?),(?,?)';
 execute stmt1 using @arg00, @arg01, @arg02, @arg03 ;
-select a,b from t1 where a in (@arg00,@arg02) ;
+select a,b from t1 where a in (@arg00,@arg02) order by a ;
 a	b
 81	8-1
 82	8-2

mysql-test/t/ps_7ndb.test

@@ -55,7 +55,7 @@ select '------ delete tests ------' as test_sequence ;
 ## delete without parameter
 prepare stmt1 from 'delete from t1 where a=2' ;
 execute stmt1;
-select a,b from t1 where a=2;
+select a,b from t1 where a=2 order by b;
 # delete with row not found
 execute stmt1;
 
@@ -270,7 +270,7 @@ set @arg02=82 ;
 set @arg03='8-2' ;
 prepare stmt1 from 'insert into t1 values(?,?),(?,?)';
 execute stmt1 using @arg00, @arg01, @arg02, @arg03 ;
-select a,b from t1 where a in (@arg00,@arg02) ;
+select a,b from t1 where a in (@arg00,@arg02) order by a ;
 
 ## insert with two parameter in the set part
 set @arg00=9 ;