Bug#29833332 MANY MTR TESTS ARE NOT DETERMINISTIC

Post push fix: Make a few more test cases deterministic.

Change-Id: Iaa10cd8fc8f8ba50f6403d3dc5ea266cd3527c54

Author: Erik Froseth

Diff for: mysql-test/include/subquery.inc

@@ -4540,7 +4540,9 @@ SELECT * FROM (SELECT 1 a UNION SELECT 1 a ORDER BY a LIMIT 1) t1a;
 
 # Test of rule
 # table_factor:  '(' get_select_lex query_expression_body ')' opt_table_alias
+--sorted_result
 SELECT * FROM t1 JOIN  (SELECT 1 UNION SELECT 1)  alias ON 1;
+--sorted_result
 SELECT * FROM t1 JOIN ((SELECT 1 UNION SELECT 1)) alias ON 1;
 --error ER_DERIVED_MUST_HAVE_ALIAS
 SELECT * FROM t1 JOIN  (SELECT 1 UNION SELECT 1)  ON 1;

Diff for: mysql-test/r/derived.result

@@ -262,8 +262,8 @@ insert into t1 values (1),(2);
 select * from ( select * from t1 union select * from t1) a,(select * from t1 union select * from t1) b;
 a	a
 1	1
-2	1
 1	2
+2	1
 2	2
 explain select * from ( select * from t1 union select * from t1) a,(select * from t1 union select * from t1) b;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra

Diff for: mysql-test/suite/funcs_1/datadict/is_triggers.inc

@@ -77,6 +77,7 @@ eval SHOW COLUMNS FROM information_schema.$is_table;
 
 # Show that several columns are always NULL.
 --replace_column 17 #
+--sorted_result
 SELECT * FROM information_schema.triggers
 WHERE trigger_catalog IS NOT NULL OR event_object_catalog IS NOT NULL
    OR action_condition IS NOT NULL OR action_reference_old_table IS NOT NULL

Diff for: mysql-test/suite/funcs_1/r/is_triggers.result

@@ -82,10 +82,10 @@ WHERE trigger_catalog IS NOT NULL OR event_object_catalog IS NOT NULL
 OR action_condition IS NOT NULL OR action_reference_old_table IS NOT NULL
 OR action_reference_new_table IS NOT NULL;
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
+def	mtr	gs_insert	INSERT	def	mtr	global_suppressions	1	NULL	BEGIN   DECLARE dummy INT;   SET GLOBAL regexp_time_limit = 0;   SELECT "" REGEXP NEW.pattern INTO dummy;   SET GLOBAL regexp_time_limit = DEFAULT; END	ROW	BEFORE	NULL	NULL	OLD	NEW	#	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	root@localhost	latin1	latin1_swedish_ci	utf8mb4_0900_ai_ci
+def	mtr	ts_insert	INSERT	def	mtr	test_suppressions	1	NULL	BEGIN   DECLARE dummy INT;   SET GLOBAL regexp_time_limit = 0;   SELECT "" REGEXP NEW.pattern INTO dummy;   SET GLOBAL regexp_time_limit = DEFAULT; END	ROW	BEFORE	NULL	NULL	OLD	NEW	#	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	root@localhost	latin1	latin1_swedish_ci	utf8mb4_0900_ai_ci
 def	sys	sys_config_insert_set_user	INSERT	def	sys	sys_config	1	NULL	BEGIN IF @sys.ignore_sys_config_triggers != true AND NEW.set_by IS NULL THEN SET NEW.set_by = USER(); END IF; END	ROW	BEFORE	NULL	NULL	OLD	NEW	#	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	mysql.sys@localhost	utf8mb4	utf8mb4_0900_ai_ci	utf8mb4_0900_ai_ci
 def	sys	sys_config_update_set_user	UPDATE	def	sys	sys_config	1	NULL	BEGIN IF @sys.ignore_sys_config_triggers != true AND NEW.set_by IS NULL THEN SET NEW.set_by = USER(); END IF; END	ROW	BEFORE	NULL	NULL	OLD	NEW	#	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	mysql.sys@localhost	utf8mb4	utf8mb4_0900_ai_ci	utf8mb4_0900_ai_ci
-def	mtr	ts_insert	INSERT	def	mtr	test_suppressions	1	NULL	BEGIN   DECLARE dummy INT;   SET GLOBAL regexp_time_limit = 0;   SELECT "" REGEXP NEW.pattern INTO dummy;   SET GLOBAL regexp_time_limit = DEFAULT; END	ROW	BEFORE	NULL	NULL	OLD	NEW	#	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	root@localhost	latin1	latin1_swedish_ci	utf8mb4_0900_ai_ci
-def	mtr	gs_insert	INSERT	def	mtr	global_suppressions	1	NULL	BEGIN   DECLARE dummy INT;   SET GLOBAL regexp_time_limit = 0;   SELECT "" REGEXP NEW.pattern INTO dummy;   SET GLOBAL regexp_time_limit = DEFAULT; END	ROW	BEFORE	NULL	NULL	OLD	NEW	#	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	root@localhost	latin1	latin1_swedish_ci	utf8mb4_0900_ai_ci
 ##################################################################################
 # Testcase 3.2.18.2 + 3.2.18.3: INFORMATION_SCHEMA.TRIGGERS accessible information
 ##################################################################################

Diff for: mysql-test/suite/funcs_1/r/is_triggers_ci.result

@@ -82,10 +82,10 @@ WHERE trigger_catalog IS NOT NULL OR event_object_catalog IS NOT NULL
 OR action_condition IS NOT NULL OR action_reference_old_table IS NOT NULL
 OR action_reference_new_table IS NOT NULL;
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
+def	mtr	gs_insert	INSERT	def	mtr	global_suppressions	1	NULL	BEGIN   DECLARE dummy INT;   SET GLOBAL regexp_time_limit = 0;   SELECT "" REGEXP NEW.pattern INTO dummy;   SET GLOBAL regexp_time_limit = DEFAULT; END	ROW	BEFORE	NULL	NULL	OLD	NEW	#	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	root@localhost	latin1	latin1_swedish_ci	utf8mb4_0900_ai_ci
+def	mtr	ts_insert	INSERT	def	mtr	test_suppressions	1	NULL	BEGIN   DECLARE dummy INT;   SET GLOBAL regexp_time_limit = 0;   SELECT "" REGEXP NEW.pattern INTO dummy;   SET GLOBAL regexp_time_limit = DEFAULT; END	ROW	BEFORE	NULL	NULL	OLD	NEW	#	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	root@localhost	latin1	latin1_swedish_ci	utf8mb4_0900_ai_ci
 def	sys	sys_config_insert_set_user	INSERT	def	sys	sys_config	1	NULL	BEGIN IF @sys.ignore_sys_config_triggers != true AND NEW.set_by IS NULL THEN SET NEW.set_by = USER(); END IF; END	ROW	BEFORE	NULL	NULL	OLD	NEW	#	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	mysql.sys@localhost	utf8mb4	utf8mb4_0900_ai_ci	utf8mb4_0900_ai_ci
 def	sys	sys_config_update_set_user	UPDATE	def	sys	sys_config	1	NULL	BEGIN IF @sys.ignore_sys_config_triggers != true AND NEW.set_by IS NULL THEN SET NEW.set_by = USER(); END IF; END	ROW	BEFORE	NULL	NULL	OLD	NEW	#	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	mysql.sys@localhost	utf8mb4	utf8mb4_0900_ai_ci	utf8mb4_0900_ai_ci
-def	mtr	ts_insert	INSERT	def	mtr	test_suppressions	1	NULL	BEGIN   DECLARE dummy INT;   SET GLOBAL regexp_time_limit = 0;   SELECT "" REGEXP NEW.pattern INTO dummy;   SET GLOBAL regexp_time_limit = DEFAULT; END	ROW	BEFORE	NULL	NULL	OLD	NEW	#	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	root@localhost	latin1	latin1_swedish_ci	utf8mb4_0900_ai_ci
-def	mtr	gs_insert	INSERT	def	mtr	global_suppressions	1	NULL	BEGIN   DECLARE dummy INT;   SET GLOBAL regexp_time_limit = 0;   SELECT "" REGEXP NEW.pattern INTO dummy;   SET GLOBAL regexp_time_limit = DEFAULT; END	ROW	BEFORE	NULL	NULL	OLD	NEW	#	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	root@localhost	latin1	latin1_swedish_ci	utf8mb4_0900_ai_ci
 ##################################################################################
 # Testcase 3.2.18.2 + 3.2.18.3: INFORMATION_SCHEMA.TRIGGERS accessible information
 ##################################################################################

Diff for: mysql-test/suite/innodb/include/innodb_dict.inc

@@ -5,5 +5,6 @@ INNER JOIN sys_tables st ON i.TABLE_ID=st.TABLE_ID ORDER BY i.NAME,i.POS;
 SELECT si.NAME,i.POS,i.NAME FROM INFORMATION_SCHEMA.INNODB_FIELDS i
 INNER JOIN sys_indexes si ON i.INDEX_ID=si.INDEX_ID ORDER BY si.NAME, i.POS;
 
+--sorted_result
 SELECT i.FOR_COL_NAME, i.REF_COL_NAME, i.POS FROM INFORMATION_SCHEMA.INNODB_FOREIGN_COLS i
 INNER JOIN sys_foreign sf ON i.ID = sf.ID;

Diff for: mysql-test/suite/perfschema/include/digest_execution.inc

@@ -151,10 +151,12 @@ WITH cte (x,y,z)AS (SELECT a,1,1 FROM t1) SELECT 1, cte.*, cte2.* FROM cte, cte
 --sorted_result
 WITH cte (x,y,z)AS (SELECT a,2,2 FROM t1) SELECT 2, cte.*, cte2.* FROM cte, cte AS cte2;
 
+--sorted_result
 WITH RECURSIVE cte (x,y,z) AS
 (SELECT a,1,1 FROM t1 UNION ALL SELECT a+1,a*1,11 FROM t1 WHERE 0)
 SELECT 1, cte.*, cte2.* FROM cte, cte AS cte2;
 
+--sorted_result
 WITH RECURSIVE cte (x,y,z) AS
 (SELECT a,2,2 FROM t1 UNION ALL SELECT a+2,a*2,22 FROM t1 WHERE 0)
 SELECT 2, cte.*, cte2.* FROM cte, cte AS cte2;

Diff for: mysql-test/suite/perfschema/r/digest_table_full.result

@@ -157,16 +157,16 @@ WITH RECURSIVE cte (x,y,z) AS
 SELECT 1, cte.*, cte2.* FROM cte, cte AS cte2;
 1	x	y	z	x	y	z
 1	1	1	1	1	1	1
-1	2	1	1	1	1	1
 1	1	1	1	2	1	1
+1	2	1	1	1	1	1
 1	2	1	1	2	1	1
 WITH RECURSIVE cte (x,y,z) AS
 (SELECT a,2,2 FROM t1 UNION ALL SELECT a+2,a*2,22 FROM t1 WHERE 0)
 SELECT 2, cte.*, cte2.* FROM cte, cte AS cte2;
 2	x	y	z	x	y	z
 2	1	2	2	1	2	2
-2	2	2	2	1	2	2
 2	1	2	2	2	2	2
+2	2	2	2	1	2	2
 2	2	2	2	2	2	2
 ####################################
 # QUERYING PS STATEMENT DIGEST

Diff for: mysql-test/suite/perfschema/r/start_server_no_digests.result

@@ -157,16 +157,16 @@ WITH RECURSIVE cte (x,y,z) AS
 SELECT 1, cte.*, cte2.* FROM cte, cte AS cte2;
 1	x	y	z	x	y	z
 1	1	1	1	1	1	1
-1	2	1	1	1	1	1
 1	1	1	1	2	1	1
+1	2	1	1	1	1	1
 1	2	1	1	2	1	1
 WITH RECURSIVE cte (x,y,z) AS
 (SELECT a,2,2 FROM t1 UNION ALL SELECT a+2,a*2,22 FROM t1 WHERE 0)
 SELECT 2, cte.*, cte2.* FROM cte, cte AS cte2;
 2	x	y	z	x	y	z
 2	1	2	2	1	2	2
-2	2	2	2	1	2	2
 2	1	2	2	2	2	2
+2	2	2	2	1	2	2
 2	2	2	2	2	2	2
 ####################################
 # QUERYING PS STATEMENT DIGEST

Diff for: mysql-test/suite/perfschema/r/statement_digest.result

@@ -158,16 +158,16 @@ WITH RECURSIVE cte (x,y,z) AS
 SELECT 1, cte.*, cte2.* FROM cte, cte AS cte2;
 1	x	y	z	x	y	z
 1	1	1	1	1	1	1
-1	2	1	1	1	1	1
 1	1	1	1	2	1	1
+1	2	1	1	1	1	1
 1	2	1	1	2	1	1
 WITH RECURSIVE cte (x,y,z) AS
 (SELECT a,2,2 FROM t1 UNION ALL SELECT a+2,a*2,22 FROM t1 WHERE 0)
 SELECT 2, cte.*, cte2.* FROM cte, cte AS cte2;
 2	x	y	z	x	y	z
 2	1	2	2	1	2	2
-2	2	2	2	1	2	2
 2	1	2	2	2	2	2
+2	2	2	2	1	2	2
 2	2	2	2	2	2	2
 ####################################
 # QUERYING PS STATEMENT DIGEST

Diff for: mysql-test/suite/perfschema/r/statement_digest_consumers.result

@@ -174,16 +174,16 @@ WITH RECURSIVE cte (x,y,z) AS
 SELECT 1, cte.*, cte2.* FROM cte, cte AS cte2;
 1	x	y	z	x	y	z
 1	1	1	1	1	1	1
-1	2	1	1	1	1	1
 1	1	1	1	2	1	1
+1	2	1	1	1	1	1
 1	2	1	1	2	1	1
 WITH RECURSIVE cte (x,y,z) AS
 (SELECT a,2,2 FROM t1 UNION ALL SELECT a+2,a*2,22 FROM t1 WHERE 0)
 SELECT 2, cte.*, cte2.* FROM cte, cte AS cte2;
 2	x	y	z	x	y	z
 2	1	2	2	1	2	2
-2	2	2	2	1	2	2
 2	1	2	2	2	2	2
+2	2	2	2	1	2	2
 2	2	2	2	2	2	2
 ####################################
 # QUERYING PS STATEMENT DIGEST

Diff for: mysql-test/suite/perfschema/r/statement_digest_consumers2.result

@@ -174,16 +174,16 @@ WITH RECURSIVE cte (x,y,z) AS
 SELECT 1, cte.*, cte2.* FROM cte, cte AS cte2;
 1	x	y	z	x	y	z
 1	1	1	1	1	1	1
-1	2	1	1	1	1	1
 1	1	1	1	2	1	1
+1	2	1	1	1	1	1
 1	2	1	1	2	1	1
 WITH RECURSIVE cte (x,y,z) AS
 (SELECT a,2,2 FROM t1 UNION ALL SELECT a+2,a*2,22 FROM t1 WHERE 0)
 SELECT 2, cte.*, cte2.* FROM cte, cte AS cte2;
 2	x	y	z	x	y	z
 2	1	2	2	1	2	2
-2	2	2	2	1	2	2
 2	1	2	2	2	2	2
+2	2	2	2	1	2	2
 2	2	2	2	2	2	2
 ####################################
 # QUERYING PS STATEMENT DIGEST

Diff for: mysql-test/t/derived.test

@@ -155,6 +155,7 @@ drop table t1;
 
 create table t1 (a int);
 insert into t1 values (1),(2);
+--sorted_result
 select * from ( select * from t1 union select * from t1) a,(select * from t1 union select * from t1) b;
 explain select * from ( select * from t1 union select * from t1) a,(select * from t1 union select * from t1) b;
 drop table t1;