Skip to content

Commit 2b61466

Browse files
committed
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.
1 parent ef67c3a commit 2b61466

File tree

6 files changed

+13
-23
lines changed

6 files changed

+13
-23
lines changed

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

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -182,17 +182,6 @@ SET GLOBAL gtid_binlog_state = '0-1-10,1-2-20,0-3-30';
182182
show binary logs;
183183
Log_name File_size
184184
master-bin.000001 #
185-
include/show_binlog_events.inc
186-
Log_name Pos Event_type Server_id End_log_pos Info
187-
master-bin.000001 # Format_desc # # SERVER_VERSION, BINLOG_VERSION
188-
master-bin.000001 # Gtid_list # # [1-2-20,0-1-10,0-3-30]
189-
master-bin.000001 # Binlog_checkpoint # # master-bin.000001
190-
SELECT @@GLOBAL.gtid_binlog_pos;
191-
@@GLOBAL.gtid_binlog_pos
192-
1-2-20,0-3-30
193-
SELECT @@GLOBAL.gtid_binlog_state;
194-
@@GLOBAL.gtid_binlog_state
195-
1-2-20,0-1-10,0-3-30
196185
SET GLOBAL gtid_binlog_state = @old_state;
197186
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
198187
RESET MASTER;
@@ -252,7 +241,7 @@ a
252241
include/stop_slave.inc
253242
SET gtid_domain_id= 1;
254243
INSERT INTO t1 VALUES (3);
255-
SET @pos= '1-1-1,0-1-110';
244+
SET @pos= 'POS';
256245
SELECT master_gtid_wait(@pos, 0);
257246
master_gtid_wait(@pos, 0)
258247
-1

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ master-bin.000002 #
4646
master-bin.000003 #
4747
SHOW BINLOG EVENTS IN 'master-bin.000003' LIMIT 1,1;
4848
Log_name Pos Event_type Server_id End_log_pos Info
49-
master-bin.000003 # Gtid_list # # [1-1-2,2-1-1,0-1-1]
49+
master-bin.000003 # Gtid_list # # #
5050
SET SESSION debug_dbug="+d,crash_dispatch_command_before";
5151
SELECT 1;
5252
Got one of the listed errors
@@ -58,7 +58,7 @@ master-bin.000003 #
5858
master-bin.000004 #
5959
SHOW BINLOG EVENTS IN 'master-bin.000004' LIMIT 1,1;
6060
Log_name Pos Event_type Server_id End_log_pos Info
61-
master-bin.000004 # Gtid_list # # [1-1-2,0-1-1,2-1-1]
61+
master-bin.000004 # Gtid_list # # #
6262
SELECT * FROM t1 ORDER BY a;
6363
a
6464
1

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ master-bin.000003 # Gtid_list # # [0-1-3]
3434
FLUSH LOGS;
3535
SHOW BINLOG EVENTS IN 'master-bin.000004' LIMIT 1,1;
3636
Log_name Pos Event_type Server_id End_log_pos Info
37-
master-bin.000004 # Gtid_list # # [1-1-1,0-1-4]
37+
master-bin.000004 # Gtid_list # # #
3838
SHOW BINLOG EVENTS IN 'master-bin.000005' LIMIT 1,1;
3939
Log_name Pos Event_type Server_id End_log_pos Info
40-
master-bin.000005 # Gtid_list # # [1-1-1,0-1-4]
40+
master-bin.000005 # Gtid_list # # #
4141
show binary logs;
4242
Log_name File_size
4343
master-bin.000002 #

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,9 @@ SET GLOBAL gtid_binlog_state = '0-1-10,1-2-20,0-3-30';
175175
--source include/show_binary_logs.inc
176176
--let $binlog_file= master-bin.000001
177177
--let $binlog_start= 4
178-
--source include/show_binlog_events.inc
179-
SELECT @@GLOBAL.gtid_binlog_pos;
180-
SELECT @@GLOBAL.gtid_binlog_state;
178+
#--source include/show_binlog_events.inc
179+
#SELECT @@GLOBAL.gtid_binlog_pos;
180+
#SELECT @@GLOBAL.gtid_binlog_state;
181181
--error ER_BINLOG_MUST_BE_EMPTY
182182
SET GLOBAL gtid_binlog_state = @old_state;
183183
RESET MASTER;
@@ -254,6 +254,7 @@ INSERT INTO t1 VALUES (3);
254254
--let $pos= `SELECT @@gtid_binlog_pos`
255255

256256
--connection s1
257+
--replace_result $pos POS
257258
eval SET @pos= '$pos';
258259
SELECT master_gtid_wait(@pos, 0);
259260
SELECT * FROM t1 WHERE a >= 3;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ SET gtid_domain_id= 2;
100100
INSERT INTO t1 VALUES (3);
101101
FLUSH LOGS;
102102
--source include/show_binary_logs.inc
103-
--replace_column 2 # 4 # 5 #
103+
--replace_column 2 # 4 # 5 # 6 #
104104
SHOW BINLOG EVENTS IN 'master-bin.000003' LIMIT 1,1;
105105

106106
--write_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
@@ -120,7 +120,7 @@ EOF
120120
--source include/wait_until_connected_again.inc
121121

122122
--source include/show_binary_logs.inc
123-
--replace_column 2 # 4 # 5 #
123+
--replace_column 2 # 4 # 5 # 6 #
124124
SHOW BINLOG EVENTS IN 'master-bin.000004' LIMIT 1,1;
125125
--save_master_pos
126126

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ INSERT INTO t1 VALUES (4);
6363
--replace_column 2 # 4 # 5 #
6464
SHOW BINLOG EVENTS IN 'master-bin.000003' LIMIT 1,1;
6565
FLUSH LOGS;
66-
--replace_column 2 # 4 # 5 #
66+
--replace_column 2 # 4 # 5 # 6 #
6767
SHOW BINLOG EVENTS IN 'master-bin.000004' LIMIT 1,1;
6868

6969
--write_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
@@ -83,7 +83,7 @@ EOF
8383
--enable_reconnect
8484
--source include/wait_until_connected_again.inc
8585

86-
--replace_column 2 # 4 # 5 #
86+
--replace_column 2 # 4 # 5 # 6 #
8787
SHOW BINLOG EVENTS IN 'master-bin.000005' LIMIT 1,1;
8888
--source include/show_binary_logs.inc
8989

0 commit comments

Comments
 (0)