database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Make test result stable (had different result orderings, on some platforms, both

Browse Source 
of which satisfied the ORDER BY clause).
This commit is contained in:
Sergey Petrunya
2010-03-21 23:06:04 +03:00
parent 6777a11b24
commit 3be133eb4d
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/join_outer.result
View File

@ -416,10 +416,10 @@ n m o n m o
select t1.*, t2.* from t1 left join t2 on t1.n = t2.n and 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; t1.m = t2.m where t1.n = 1 order by t1.o;
n m o n m o n m o n m o
1 2 11 1 2 3
1 2 7 1 2 3 1 2 7 1 2 3
1 2 9 1 2 3 1 2 9 1 2 3
1 3 9 NULL NULL NULL 1 3 9 NULL NULL NULL
1 2 11 1 2 3
drop table t1,t2; drop table t1,t2;
CREATE TABLE t1 (id1 INT NOT NULL PRIMARY KEY, dat1 CHAR(1), id2 INT); CREATE TABLE t1 (id1 INT NOT NULL PRIMARY KEY, dat1 CHAR(1), id2 INT);
INSERT INTO t1 VALUES (1,'a',1); INSERT INTO t1 VALUES (1,'a',1);

2
mysql-test/r/join_outer_jcl6.result
View File

@ -420,10 +420,10 @@ n m o n m o
select t1.*, t2.* from t1 left join t2 on t1.n = t2.n and 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; t1.m = t2.m where t1.n = 1 order by t1.o;
n m o n m o n m o n m o
1 2 11 1 2 3
1 2 7 1 2 3 1 2 7 1 2 3
1 2 9 1 2 3 1 2 9 1 2 3
1 3 9 NULL NULL NULL 1 3 9 NULL NULL NULL
1 2 11 1 2 3
drop table t1,t2; drop table t1,t2;
CREATE TABLE t1 (id1 INT NOT NULL PRIMARY KEY, dat1 CHAR(1), id2 INT); CREATE TABLE t1 (id1 INT NOT NULL PRIMARY KEY, dat1 CHAR(1), id2 INT);
INSERT INTO t1 VALUES (1,'a',1); INSERT INTO t1 VALUES (1,'a',1);

1
mysql-test/t/join_outer.test
View File

@ -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); 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 select t1.*, t2.* from t1 left join t2 on t1.n = t2.n and
t1.m = t2.m where t1.n = 1; t1.m = t2.m where t1.n = 1;
--sorted_result
select t1.*, t2.* from t1 left join t2 on t1.n = t2.n and 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; t1.m = t2.m where t1.n = 1 order by t1.o;
drop table t1,t2; drop table t1,t2;