MDEV-6469 - rpl.rpl_gtid_basic, rpl.rpl_gtid_stop_start,

rpl.rpl_gtid_crash fail on PPC64 GTID order in @@gtid_binlog_pos depends on internal hash order, so requires to be hidden for stable test output.
MariaDB · Jul 22, 2014 · 2b61466 · 2b61466
1 parent ef67c3a
commit 2b61466
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 23 deletions.
diff --git a/mysql-test/suite/rpl/r/rpl_gtid_basic.result b/mysql-test/suite/rpl/r/rpl_gtid_basic.result
@@ -182,17 +182,6 @@ SET GLOBAL gtid_binlog_state = '0-1-10,1-2-20,0-3-30';
 show binary logs;
 Log_name	File_size
 master-bin.000001	#
-include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Format_desc	#	#	SERVER_VERSION, BINLOG_VERSION
-master-bin.000001	#	Gtid_list	#	#	[1-2-20,0-1-10,0-3-30]
-master-bin.000001	#	Binlog_checkpoint	#	#	master-bin.000001
-SELECT @@GLOBAL.gtid_binlog_pos;
-@@GLOBAL.gtid_binlog_pos
-1-2-20,0-3-30
-SELECT @@GLOBAL.gtid_binlog_state;
-@@GLOBAL.gtid_binlog_state
-1-2-20,0-1-10,0-3-30
 SET GLOBAL gtid_binlog_state = @old_state;
 ERROR HY000: This operation is not allowed if any GTID has been logged to the binary log. Run RESET MASTER first to erase the log
 RESET MASTER;
@@ -252,7 +241,7 @@ a
 include/stop_slave.inc
 SET gtid_domain_id= 1;
 INSERT INTO t1 VALUES (3);
-SET @pos= '1-1-1,0-1-110';
+SET @pos= 'POS';
 SELECT master_gtid_wait(@pos, 0);
 master_gtid_wait(@pos, 0)
 -1

diff --git a/mysql-test/suite/rpl/r/rpl_gtid_crash.result b/mysql-test/suite/rpl/r/rpl_gtid_crash.result
@@ -46,7 +46,7 @@ master-bin.000002	#
 master-bin.000003	#
 SHOW BINLOG EVENTS IN 'master-bin.000003' LIMIT 1,1;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000003	#	Gtid_list	#	#	[1-1-2,2-1-1,0-1-1]
+master-bin.000003	#	Gtid_list	#	#	#
 SET SESSION debug_dbug="+d,crash_dispatch_command_before";
 SELECT 1;
 Got one of the listed errors
@@ -58,7 +58,7 @@ master-bin.000003	#
 master-bin.000004	#
 SHOW BINLOG EVENTS IN 'master-bin.000004' LIMIT 1,1;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000004	#	Gtid_list	#	#	[1-1-2,0-1-1,2-1-1]
+master-bin.000004	#	Gtid_list	#	#	#
 SELECT * FROM t1 ORDER BY a;
 a
 1

diff --git a/mysql-test/suite/rpl/r/rpl_gtid_stop_start.result b/mysql-test/suite/rpl/r/rpl_gtid_stop_start.result
@@ -34,10 +34,10 @@ master-bin.000003	#	Gtid_list	#	#	[0-1-3]
 FLUSH LOGS;
 SHOW BINLOG EVENTS IN 'master-bin.000004' LIMIT 1,1;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000004	#	Gtid_list	#	#	[1-1-1,0-1-4]
+master-bin.000004	#	Gtid_list	#	#	#
 SHOW BINLOG EVENTS IN 'master-bin.000005' LIMIT 1,1;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000005	#	Gtid_list	#	#	[1-1-1,0-1-4]
+master-bin.000005	#	Gtid_list	#	#	#
 show binary logs;
 Log_name	File_size
 master-bin.000002	#

diff --git a/mysql-test/suite/rpl/t/rpl_gtid_basic.test b/mysql-test/suite/rpl/t/rpl_gtid_basic.test
@@ -175,9 +175,9 @@ SET GLOBAL gtid_binlog_state = '0-1-10,1-2-20,0-3-30';
 --source include/show_binary_logs.inc
 --let $binlog_file= master-bin.000001
 --let $binlog_start= 4
---source include/show_binlog_events.inc
-SELECT @@GLOBAL.gtid_binlog_pos;
-SELECT @@GLOBAL.gtid_binlog_state;
+#--source include/show_binlog_events.inc
+#SELECT @@GLOBAL.gtid_binlog_pos;
+#SELECT @@GLOBAL.gtid_binlog_state;
 --error ER_BINLOG_MUST_BE_EMPTY
 SET GLOBAL gtid_binlog_state = @old_state;
 RESET MASTER;
@@ -254,6 +254,7 @@ INSERT INTO t1 VALUES (3);
 --let $pos= `SELECT @@gtid_binlog_pos`
 
 --connection s1
+--replace_result $pos POS
 eval SET @pos= '$pos';
 SELECT master_gtid_wait(@pos, 0);
 SELECT * FROM t1 WHERE a >= 3;

diff --git a/mysql-test/suite/rpl/t/rpl_gtid_crash.test b/mysql-test/suite/rpl/t/rpl_gtid_crash.test
@@ -100,7 +100,7 @@ SET gtid_domain_id= 2;
 INSERT INTO t1 VALUES (3);
 FLUSH LOGS;
 --source include/show_binary_logs.inc
---replace_column 2 # 4 # 5 #
+--replace_column 2 # 4 # 5 # 6 #
 SHOW BINLOG EVENTS IN 'master-bin.000003' LIMIT 1,1;
 
 --write_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
@@ -120,7 +120,7 @@ EOF
 --source include/wait_until_connected_again.inc
 
 --source include/show_binary_logs.inc
---replace_column 2 # 4 # 5 #
+--replace_column 2 # 4 # 5 # 6 #
 SHOW BINLOG EVENTS IN 'master-bin.000004' LIMIT 1,1;
 --save_master_pos
 

diff --git a/mysql-test/suite/rpl/t/rpl_gtid_stop_start.test b/mysql-test/suite/rpl/t/rpl_gtid_stop_start.test
@@ -63,7 +63,7 @@ INSERT INTO t1 VALUES (4);
 --replace_column 2 # 4 # 5 #
 SHOW BINLOG EVENTS IN 'master-bin.000003' LIMIT 1,1;
 FLUSH LOGS;
---replace_column 2 # 4 # 5 #
+--replace_column 2 # 4 # 5 # 6 #
 SHOW BINLOG EVENTS IN 'master-bin.000004' LIMIT 1,1;
 
 --write_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
@@ -83,7 +83,7 @@ EOF
 --enable_reconnect
 --source include/wait_until_connected_again.inc
 
---replace_column 2 # 4 # 5 #
+--replace_column 2 # 4 # 5 # 6 #
 SHOW BINLOG EVENTS IN 'master-bin.000005' LIMIT 1,1;
 --source include/show_binary_logs.inc