diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2010-03-21 23:06:04 +0300 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2010-03-21 23:06:04 +0300 |
| commit | 3be133eb4deaaa7479179dd6813b85d080c8c5ca (patch) | |
| tree | 81d56b5eb1d6f46d3ba43b691b186207b2fe6914 /mysql-test | |
| parent | 6777a11b2451f512321f057e43d80f88c1c6e116 (diff) | |
| download | mariadb-git-3be133eb4deaaa7479179dd6813b85d080c8c5ca.tar.gz | |
Make test result stable (had different result orderings, on some platforms, both
of which satisfied the ORDER BY clause).
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/join_outer.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/join_outer_jcl6.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/join_outer.test | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/r/join_outer.result b/mysql-test/r/join_outer.result index 0efed3b6c3a..9dca5ace31f 100644 --- a/mysql-test/r/join_outer.result +++ b/mysql-test/r/join_outer.result @@ -416,10 +416,10 @@ n m o n m o 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); diff --git a/mysql-test/r/join_outer_jcl6.result b/mysql-test/r/join_outer_jcl6.result index e6164ce7d50..60191bb3957 100644 --- a/mysql-test/r/join_outer_jcl6.result +++ b/mysql-test/r/join_outer_jcl6.result @@ -420,10 +420,10 @@ n m o n m o 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); diff --git a/mysql-test/t/join_outer.test b/mysql-test/t/join_outer.test index aeaa69657c6..c670944c9b2 100644 --- a/mysql-test/t/join_outer.test +++ b/mysql-test/t/join_outer.test @@ -308,6 +308,7 @@ insert into t1 values (1, 2, 11), (1, 2, 7), (2, 2, 8), (1,2,9),(1,3,9); 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; |