Order results to be deterministic. (6accbba0) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/r/mysqlcheck.result

+2 −1

Original line number	Diff line number	Diff line
		@@ -70,7 +70,8 @@ insert into t_bug25347 values (1),(2),(3);
		flush tables;
		removing and creating
		d_bug25347.t_bug25347
		error : Incorrect file format 't_bug25347'
		Error : Incorrect file format 't_bug25347'
		error : Corrupt
		insert into t_bug25347 values (4),(5),(6);
		ERROR HY000: Incorrect file format 't_bug25347'
		d_bug25347.t_bug25347

mysql-test/suite/rpl/r/rpl_invoked_features.result

+12 −12

Original line number	Diff line number	Diff line
		@@ -116,23 +116,23 @@ t12
		t13
		t2
		t3
		SELECT table_name FROM information_schema.views WHERE table_schema='test';
		SELECT table_name FROM information_schema.views WHERE table_schema='test' order by table_name;
		table_name
		v1
		v11
		SELECT trigger_name, event_manipulation, event_object_table FROM information_schema.triggers WHERE trigger_schema='test';
		SELECT trigger_name, event_manipulation, event_object_table FROM information_schema.triggers WHERE trigger_schema='test' order by trigger_name;
		trigger_name event_manipulation event_object_table
		t1_tr1 INSERT t1
		t1_tr2 UPDATE t1
		t11_tr1 INSERT t11
		t11_tr2 UPDATE t11
		SELECT routine_type, routine_name FROM information_schema.routines WHERE routine_schema='test';
		t1_tr1 INSERT t1
		t1_tr2 UPDATE t1
		SELECT routine_type, routine_name FROM information_schema.routines WHERE routine_schema='test' order by routine_name;
		routine_type routine_name
		FUNCTION f1
		FUNCTION f2
		PROCEDURE p1
		PROCEDURE p11
		SELECT event_name, status FROM information_schema.events WHERE event_schema='test';
		SELECT event_name, status FROM information_schema.events WHERE event_schema='test' order by event_name;
		event_name status
		e1 DISABLED
		e11 DISABLED
		@@ -276,23 +276,23 @@ t12
		t13
		t2
		t3
		SELECT table_name FROM information_schema.views WHERE table_schema='test';
		SELECT table_name FROM information_schema.views WHERE table_schema='test' order by table_name;
		table_name
		v1
		v11
		SELECT trigger_name, event_manipulation, event_object_table FROM information_schema.triggers WHERE trigger_schema='test';
		SELECT trigger_name, event_manipulation, event_object_table FROM information_schema.triggers WHERE trigger_schema='test' order by trigger_name;
		trigger_name event_manipulation event_object_table
		t1_tr1 INSERT t1
		t1_tr2 UPDATE t1
		t11_tr1 INSERT t11
		t11_tr2 UPDATE t11
		SELECT routine_type, routine_name FROM information_schema.routines WHERE routine_schema='test';
		t1_tr1 INSERT t1
		t1_tr2 UPDATE t1
		SELECT routine_type, routine_name FROM information_schema.routines WHERE routine_schema='test' order by routine_name;
		routine_type routine_name
		FUNCTION f1
		FUNCTION f2
		PROCEDURE p1
		PROCEDURE p11
		SELECT event_name, status FROM information_schema.events WHERE event_schema='test';
		SELECT event_name, status FROM information_schema.events WHERE event_schema='test' order by event_name;
		event_name status
		e1 SLAVESIDE_DISABLED
		e11 SLAVESIDE_DISABLED

mysql-test/suite/rpl/t/rpl_invoked_features.test

+8 −8

Original line number	Diff line number	Diff line
		@@ -202,10 +202,10 @@ SET GLOBAL EVENT_SCHEDULER = off;
		# Check original objects
		--echo
		SHOW TABLES LIKE 't%';
		SELECT table_name FROM information_schema.views WHERE table_schema='test';
		SELECT trigger_name, event_manipulation, event_object_table FROM information_schema.triggers WHERE trigger_schema='test';
		SELECT routine_type, routine_name FROM information_schema.routines WHERE routine_schema='test';
		SELECT event_name, status FROM information_schema.events WHERE event_schema='test';
		SELECT table_name FROM information_schema.views WHERE table_schema='test' order by table_name;
		SELECT trigger_name, event_manipulation, event_object_table FROM information_schema.triggers WHERE trigger_schema='test' order by trigger_name;
		SELECT routine_type, routine_name FROM information_schema.routines WHERE routine_schema='test' order by routine_name;
		SELECT event_name, status FROM information_schema.events WHERE event_schema='test' order by event_name;

		# Check original data
		--echo
		@@ -229,10 +229,10 @@ SELECT a,b FROM v11 ORDER BY a;
		# Check replicated objects
		--echo
		SHOW TABLES LIKE 't%';
		SELECT table_name FROM information_schema.views WHERE table_schema='test';
		SELECT trigger_name, event_manipulation, event_object_table FROM information_schema.triggers WHERE trigger_schema='test';
		SELECT routine_type, routine_name FROM information_schema.routines WHERE routine_schema='test';
		SELECT event_name, status FROM information_schema.events WHERE event_schema='test';
		SELECT table_name FROM information_schema.views WHERE table_schema='test' order by table_name;
		SELECT trigger_name, event_manipulation, event_object_table FROM information_schema.triggers WHERE trigger_schema='test' order by trigger_name;
		SELECT routine_type, routine_name FROM information_schema.routines WHERE routine_schema='test' order by routine_name;
		SELECT event_name, status FROM information_schema.events WHERE event_schema='test' order by event_name;

		# Check replicated data
		--echo