At file:///home/psergey/dev/maria-5.3-subqueries-r10/ ------------------------------------------------------------ revno: 2784 revision-id: psergey@askmonty.org-20100321200604-oxw7ri2qu5c9n7gy parent: psergey@askmonty.org-20100321195033-jzl1l091k2nbb6zh committer: Sergey Petrunya <psergey@askmonty.org> branch nick: maria-5.3-subqueries-r10 timestamp: Sun 2010-03-21 23:06:04 +0300 message: Make test result stable (had different result orderings, on some platforms, both of which satisfied the ORDER BY clause). === modified file 'mysql-test/r/join_outer.result' --- a/mysql-test/r/join_outer.result 2010-03-20 12:01:47 +0000 +++ b/mysql-test/r/join_outer.result 2010-03-21 20:06:04 +0000 @@ -416,10 +416,10 @@ select t1.*, t2.* from t1 left join t2 on t1.n = t2.n and t1.m = t2.m where t1.n = 1 order by t1.o; n m o n m o +1 2 11 1 2 3 1 2 7 1 2 3 1 2 9 1 2 3 1 3 9 NULL NULL NULL -1 2 11 1 2 3 drop table t1,t2; CREATE TABLE t1 (id1 INT NOT NULL PRIMARY KEY, dat1 CHAR(1), id2 INT); INSERT INTO t1 VALUES (1,'a',1); === modified file 'mysql-test/r/join_outer_jcl6.result' --- a/mysql-test/r/join_outer_jcl6.result 2010-03-20 12:01:47 +0000 +++ b/mysql-test/r/join_outer_jcl6.result 2010-03-21 20:06:04 +0000 @@ -420,10 +420,10 @@ select t1.*, t2.* from t1 left join t2 on t1.n = t2.n and t1.m = t2.m where t1.n = 1 order by t1.o; n m o n m o +1 2 11 1 2 3 1 2 7 1 2 3 1 2 9 1 2 3 1 3 9 NULL NULL NULL -1 2 11 1 2 3 drop table t1,t2; CREATE TABLE t1 (id1 INT NOT NULL PRIMARY KEY, dat1 CHAR(1), id2 INT); INSERT INTO t1 VALUES (1,'a',1); === modified file 'mysql-test/t/join_outer.test' --- a/mysql-test/t/join_outer.test 2009-12-17 09:55:18 +0000 +++ b/mysql-test/t/join_outer.test 2010-03-21 20:06:04 +0000 @@ -308,6 +308,7 @@ insert into t2 values (1, 2, 3),(2, 2, 8), (4,3,9),(3,2,10); select t1.*, t2.* from t1 left join t2 on t1.n = t2.n and t1.m = t2.m where t1.n = 1; +--sorted_result select t1.*, t2.* from t1 left join t2 on t1.n = t2.n and t1.m = t2.m where t1.n = 1 order by t1.o; drop table t1,t2;