Merge 10.3 into 10.4

Author: dr-m

mysql-test/main/information_schema.result

@@ -2233,8 +2233,8 @@ join information_schema.CHECK_CONSTRAINTS cc
 using (CONSTRAINT_CATALOG, CONSTRAINT_SCHEMA, TABLE_NAME, CONSTRAINT_NAME)
 ;
 TABLE_SCHEMA	TABLE_NAME	CONSTRAINT_NAME	CHECK_CLAUSE
-test	t	a	`i` > 0
 mysql	global_priv	Priv	json_valid(`Priv`)
+test	t	a	`i` > 0
 select
 tc.TABLE_SCHEMA,
 tc.TABLE_NAME,
@@ -2245,8 +2245,8 @@ join information_schema.TABLE_CONSTRAINTS tc
 using (CONSTRAINT_CATALOG, CONSTRAINT_SCHEMA, TABLE_NAME, CONSTRAINT_NAME)
 ;
 TABLE_SCHEMA	TABLE_NAME	CONSTRAINT_NAME	CHECK_CLAUSE
-test	t	a	`i` > 0
 mysql	global_priv	Priv	json_valid(`Priv`)
+test	t	a	`i` > 0
 select
 tc.TABLE_SCHEMA,
 tc.TABLE_NAME,
@@ -2256,8 +2256,8 @@ from information_schema.TABLE_CONSTRAINTS tc
 NATURAL join information_schema.CHECK_CONSTRAINTS cc
 ;
 TABLE_SCHEMA	TABLE_NAME	CONSTRAINT_NAME	CHECK_CLAUSE
-test	t	a	`i` > 0
 mysql	global_priv	Priv	json_valid(`Priv`)
+test	t	a	`i` > 0
 select
 tc.TABLE_SCHEMA,
 tc.TABLE_NAME,
@@ -2267,8 +2267,8 @@ from information_schema.CHECK_CONSTRAINTS cc
 NATURAL join information_schema.TABLE_CONSTRAINTS tc
 ;
 TABLE_SCHEMA	TABLE_NAME	CONSTRAINT_NAME	CHECK_CLAUSE
-test	t	a	`i` > 0
 mysql	global_priv	Priv	json_valid(`Priv`)
+test	t	a	`i` > 0
 select
 tc.TABLE_SCHEMA,
 tc.TABLE_NAME,
@@ -2281,8 +2281,8 @@ join information_schema.CHECK_CONSTRAINTS cc
 using (CONSTRAINT_CATALOG, CONSTRAINT_SCHEMA, TABLE_NAME, CONSTRAINT_NAME)
 ;
 TABLE_SCHEMA	TABLE_NAME	CONSTRAINT_NAME	CHECK_CLAUSE	CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA
-test	t	a	`i` > 0	def	test
 mysql	global_priv	Priv	json_valid(`Priv`)	def	mysql
+test	t	a	`i` > 0	def	test
 drop table t;
 #
 # End of 10.3 tests

mysql-test/main/information_schema.test

@@ -1933,6 +1933,7 @@ SELECT SCHEMA_NAME from information_schema.schemata where schema_name=REPEAT('a'
 create table t (i int, constraint a check (i > 0));
 
 --disable_warnings
+--sorted_result
 select
   tc.TABLE_SCHEMA,
   tc.TABLE_NAME,
@@ -1942,6 +1943,7 @@ from information_schema.TABLE_CONSTRAINTS tc
   join information_schema.CHECK_CONSTRAINTS cc
     using (CONSTRAINT_CATALOG, CONSTRAINT_SCHEMA, TABLE_NAME, CONSTRAINT_NAME)
 ;
+--sorted_result
 select
   tc.TABLE_SCHEMA,
   tc.TABLE_NAME,
@@ -1951,6 +1953,7 @@ from information_schema.CHECK_CONSTRAINTS cc
   join information_schema.TABLE_CONSTRAINTS tc
     using (CONSTRAINT_CATALOG, CONSTRAINT_SCHEMA, TABLE_NAME, CONSTRAINT_NAME)
 ;
+--sorted_result
 select
   tc.TABLE_SCHEMA,
   tc.TABLE_NAME,
@@ -1959,6 +1962,7 @@ select
 from information_schema.TABLE_CONSTRAINTS tc
   NATURAL join information_schema.CHECK_CONSTRAINTS cc
 ;
+--sorted_result
 select
   tc.TABLE_SCHEMA,
   tc.TABLE_NAME,
@@ -1967,6 +1971,7 @@ select
 from information_schema.CHECK_CONSTRAINTS cc
   NATURAL join information_schema.TABLE_CONSTRAINTS tc
 ;
+--sorted_result
 select
   tc.TABLE_SCHEMA,
   tc.TABLE_NAME,