post-merge fixes.

most tests pass.
5.3 merge is next

1 files changed, 12 insertions, 0 deletions

diff --git a/mysql-test/t/select.test b/mysql-test/t/select.test
index ab0487e6acf..534f39d631b 100644
--- a/mysql-test/t/select.test
+++ b/mysql-test/t/select.test
@@ -1855,7 +1855,9 @@ select * from t1 inner join (t1 as t2 left join t1 as t3 using (a)) on t1.a>1;
 select * from (t1 as t2 left join t1 as t3 using (a)) inner join t1 using ( a );
 select * from t1 inner join (t1 as t2 left join t1 as t3 using (a)) using ( a );
 # left [outer] join on
+--sorted_result
 select * from (t1 as t2 left join t1 as t3 using (a)) left outer join t1 on t1.a>1;
+--sorted_result
 select * from t1 left outer join (t1 as t2 left join t1 as t3 using (a)) on t1.a>1;
 # left join using
 select * from (t1 as t2 left join t1 as t3 using (a)) left join t1 using ( a );
@@ -1864,7 +1866,9 @@ select * from t1 left join (t1 as t2 left join t1 as t3 using (a)) using ( a );
 select * from (t1 as t2 left join t1 as t3 using (a)) natural left join t1;
 select * from t1 natural left join (t1 as t2 left join t1 as t3 using (a));
 # right join on
+--sorted_result
 select * from (t1 as t2 left join t1 as t3 using (a)) right join t1 on t1.a>1;
+--sorted_result
 select * from t1 right join (t1 as t2 left join t1 as t3 using (a)) on t1.a>1;
 # right [outer] joing using
 select * from (t1 as t2 left join t1 as t3 using (a)) right outer join t1 using ( a );
@@ -2535,10 +2539,14 @@ insert into t1 values(1),(2);
 insert into t2 values(1),(2);
 create view v2 (c) as select a1 from t1;
 
+--sorted_result
 select * from t1 natural left join t2;
+--sorted_result
 select * from t1 natural right join t2;
 
+--sorted_result
 select * from v2 natural left join t2;
+--sorted_result
 select * from v2 natural right join t2;
 
 drop table t1, t2;
@@ -2707,16 +2715,20 @@ create view v3 as select (t1.id+2) as id from t1 natural left join t2;
 # all queries must return the same result
 select t1.id from t1 left join v2 using (id);
 select t1.id from v2 right join t1 using (id);
+--sorted_result
 select t1.id from t1 left join v3 using (id);
 select * from t1 left join v2 using (id);
 select * from v2 right join t1 using (id);
+--sorted_result
 select * from t1 left join v3 using (id);
 
 select v1.id from v1 left join v2 using (id);
 select v1.id from v2 right join v1 using (id);
+--sorted_result
 select v1.id from v1 left join v3 using (id);
 select * from v1 left join v2 using (id);
 select * from v2 right join v1 using (id);
+--sorted_result
 select * from v1 left join v3 using (id);
 
 drop table t1, t2;