Skip to content

Commit 976abe6

Browse files
committed
MDEV-21201: Add --sorted_result to the test, for 10.4
On MariaDB 10.4 (commit 4db4b77), the query results would not be sorted, which creates random result differences. Let us explicitly sort the results already in 10.3 in order to avoid future merge trouble.
1 parent a8458a2 commit 976abe6

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

mysql-test/main/information_schema.test

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1932,6 +1932,7 @@ SELECT SCHEMA_NAME from information_schema.schemata where schema_name=REPEAT('a'
19321932
create table t (i int, constraint a check (i > 0));
19331933

19341934
--disable_warnings
1935+
--sorted_result
19351936
select
19361937
tc.TABLE_SCHEMA,
19371938
tc.TABLE_NAME,
@@ -1941,6 +1942,7 @@ from information_schema.TABLE_CONSTRAINTS tc
19411942
join information_schema.CHECK_CONSTRAINTS cc
19421943
using (CONSTRAINT_CATALOG, CONSTRAINT_SCHEMA, TABLE_NAME, CONSTRAINT_NAME)
19431944
;
1945+
--sorted_result
19441946
select
19451947
tc.TABLE_SCHEMA,
19461948
tc.TABLE_NAME,
@@ -1950,6 +1952,7 @@ from information_schema.CHECK_CONSTRAINTS cc
19501952
join information_schema.TABLE_CONSTRAINTS tc
19511953
using (CONSTRAINT_CATALOG, CONSTRAINT_SCHEMA, TABLE_NAME, CONSTRAINT_NAME)
19521954
;
1955+
--sorted_result
19531956
select
19541957
tc.TABLE_SCHEMA,
19551958
tc.TABLE_NAME,
@@ -1958,6 +1961,7 @@ select
19581961
from information_schema.TABLE_CONSTRAINTS tc
19591962
NATURAL join information_schema.CHECK_CONSTRAINTS cc
19601963
;
1964+
--sorted_result
19611965
select
19621966
tc.TABLE_SCHEMA,
19631967
tc.TABLE_NAME,
@@ -1966,6 +1970,7 @@ select
19661970
from information_schema.CHECK_CONSTRAINTS cc
19671971
NATURAL join information_schema.TABLE_CONSTRAINTS tc
19681972
;
1973+
--sorted_result
19691974
select
19701975
tc.TABLE_SCHEMA,
19711976
tc.TABLE_NAME,

0 commit comments

Comments
 (0)