Commit 976abe64 authored by Marko Mäkelä's avatar Marko Mäkelä

MDEV-21201: Add --sorted_result to the test, for 10.4

On MariaDB 10.4 (commit 4db4b773),
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.
parent a8458a23
...@@ -1932,6 +1932,7 @@ SELECT SCHEMA_NAME from information_schema.schemata where schema_name=REPEAT('a' ...@@ -1932,6 +1932,7 @@ SELECT SCHEMA_NAME from information_schema.schemata where schema_name=REPEAT('a'
create table t (i int, constraint a check (i > 0)); create table t (i int, constraint a check (i > 0));
--disable_warnings --disable_warnings
--sorted_result
select select
tc.TABLE_SCHEMA, tc.TABLE_SCHEMA,
tc.TABLE_NAME, tc.TABLE_NAME,
...@@ -1941,6 +1942,7 @@ from information_schema.TABLE_CONSTRAINTS tc ...@@ -1941,6 +1942,7 @@ from information_schema.TABLE_CONSTRAINTS tc
join information_schema.CHECK_CONSTRAINTS cc join information_schema.CHECK_CONSTRAINTS cc
using (CONSTRAINT_CATALOG, CONSTRAINT_SCHEMA, TABLE_NAME, CONSTRAINT_NAME) using (CONSTRAINT_CATALOG, CONSTRAINT_SCHEMA, TABLE_NAME, CONSTRAINT_NAME)
; ;
--sorted_result
select select
tc.TABLE_SCHEMA, tc.TABLE_SCHEMA,
tc.TABLE_NAME, tc.TABLE_NAME,
...@@ -1950,6 +1952,7 @@ from information_schema.CHECK_CONSTRAINTS cc ...@@ -1950,6 +1952,7 @@ from information_schema.CHECK_CONSTRAINTS cc
join information_schema.TABLE_CONSTRAINTS tc join information_schema.TABLE_CONSTRAINTS tc
using (CONSTRAINT_CATALOG, CONSTRAINT_SCHEMA, TABLE_NAME, CONSTRAINT_NAME) using (CONSTRAINT_CATALOG, CONSTRAINT_SCHEMA, TABLE_NAME, CONSTRAINT_NAME)
; ;
--sorted_result
select select
tc.TABLE_SCHEMA, tc.TABLE_SCHEMA,
tc.TABLE_NAME, tc.TABLE_NAME,
...@@ -1958,6 +1961,7 @@ select ...@@ -1958,6 +1961,7 @@ select
from information_schema.TABLE_CONSTRAINTS tc from information_schema.TABLE_CONSTRAINTS tc
NATURAL join information_schema.CHECK_CONSTRAINTS cc NATURAL join information_schema.CHECK_CONSTRAINTS cc
; ;
--sorted_result
select select
tc.TABLE_SCHEMA, tc.TABLE_SCHEMA,
tc.TABLE_NAME, tc.TABLE_NAME,
...@@ -1966,6 +1970,7 @@ select ...@@ -1966,6 +1970,7 @@ select
from information_schema.CHECK_CONSTRAINTS cc from information_schema.CHECK_CONSTRAINTS cc
NATURAL join information_schema.TABLE_CONSTRAINTS tc NATURAL join information_schema.TABLE_CONSTRAINTS tc
; ;
--sorted_result
select select
tc.TABLE_SCHEMA, tc.TABLE_SCHEMA,
tc.TABLE_NAME, tc.TABLE_NAME,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment