Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions mysql-test/suite/galera/r/MDEV-28053.result
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,4 @@ connection node_2;
STOP SLAVE;
RESET SLAVE ALL;
connection node_3;
include/kill_binlog_dump_threads.inc
RESET MASTER;
include/reset_master.inc
3 changes: 1 addition & 2 deletions mysql-test/suite/galera/r/MDEV-39011.result
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ connection node_1;
connection node_2;
connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3;
connection node_3;
RESET MASTER;
include/reset_master.inc
connection node_2;
SET GLOBAL DEBUG_DBUG = "+d,delay_sql_thread_after_release_run_lock";
START SLAVE;
Expand All @@ -19,7 +19,6 @@ SET GLOBAL DEBUG_DBUG = "";
STOP SLAVE;
RESET SLAVE;
connection node_3;
include/kill_binlog_dump_threads.inc
include/reset_master.inc
disconnect node_3;
disconnect node_2;
Expand Down
6 changes: 2 additions & 4 deletions mysql-test/suite/galera/r/galera_2primary_replica.result
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,9 @@ Note 1938 SLAVE 'stream1' stopped
Note 1938 SLAVE 'stream2' stopped
RESET SLAVE ALL;
connection primary1;
include/kill_binlog_dump_threads.inc
RESET MASTER;
include/reset_master.inc
connection primary2;
include/kill_binlog_dump_threads.inc
RESET MASTER;
include/reset_master.inc
connection node_1;
disconnect primary1;
disconnect primary2;
Expand Down
3 changes: 1 addition & 2 deletions mysql-test/suite/galera/r/galera_as_master.result
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,5 @@ SET GLOBAL gtid_slave_pos = "";
CALL mtr.add_suppression('You need to use --log-bin to make --binlog-format work');
connection node_1;
set global wsrep_on=OFF;
include/kill_binlog_dump_threads.inc
RESET MASTER;
include/reset_master.inc
set global wsrep_on=ON;
3 changes: 1 addition & 2 deletions mysql-test/suite/galera/r/galera_as_slave.result
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,4 @@ STOP SLAVE;
RESET SLAVE ALL;
SET GLOBAL gtid_slave_pos = "";
connection node_3;
include/kill_binlog_dump_threads.inc
RESET MASTER;
include/reset_master.inc
3 changes: 1 addition & 2 deletions mysql-test/suite/galera/r/galera_as_slave_autoinc.result
Original file line number Diff line number Diff line change
Expand Up @@ -98,5 +98,4 @@ STOP SLAVE;
RESET SLAVE ALL;
SET GLOBAL gtid_slave_pos = "";
connection node_3;
include/kill_binlog_dump_threads.inc
RESET MASTER;
include/reset_master.inc
3 changes: 1 addition & 2 deletions mysql-test/suite/galera/r/galera_as_slave_ctas.result
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,4 @@ RESET SLAVE ALL;
SET GLOBAL gtid_slave_pos = "";
call mtr.add_suppression("WSREP: unexpected async replication event: 0");
connection node_3;
include/kill_binlog_dump_threads.inc
RESET MASTER;
include/reset_master.inc
9 changes: 3 additions & 6 deletions mysql-test/suite/galera/r/galera_as_slave_gtid.result
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,11 @@ SET GLOBAL gtid_slave_pos = "";
#cleanup
connection node_1;
set global wsrep_on=OFF;
include/kill_binlog_dump_threads.inc
reset master;
include/reset_master.inc
set global wsrep_on=ON;
connection node_2;
set global wsrep_on=OFF;
include/kill_binlog_dump_threads.inc
reset master;
include/reset_master.inc
set global wsrep_on=ON;
connection node_3;
include/kill_binlog_dump_threads.inc
reset master;
include/reset_master.inc
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,17 @@ SET GLOBAL gtid_slave_pos = "";
#cleanup
connection node_1;
set global wsrep_on=OFF;
include/kill_binlog_dump_threads.inc
reset master;
include/reset_master.inc
set global wsrep_on=ON;
connection node_2;
set global wsrep_on=OFF;
include/kill_binlog_dump_threads.inc
reset master;
include/reset_master.inc
set global wsrep_on=ON;
connection node_3;
include/kill_binlog_dump_threads.inc
reset master;
include/reset_master.inc
connection node_2;
CALL mtr.add_suppression("The automatically created table");
DROP TABLE mysql.gtid_slave_pos_InnoDB;
set global wsrep_on=OFF;
reset master;
include/reset_master.inc
set global wsrep_on=ON;
9 changes: 3 additions & 6 deletions mysql-test/suite/galera/r/galera_as_slave_gtid_myisam.result
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,11 @@ STOP SLAVE;
RESET SLAVE ALL;
SET GLOBAL gtid_slave_pos = "";
SET GLOBAL WSREP_ON=OFF;
include/kill_binlog_dump_threads.inc
reset master;
include/reset_master.inc
SET GLOBAL WSREP_ON=ON;
connection node_2;
SET GLOBAL WSREP_ON=OFF;
include/kill_binlog_dump_threads.inc
reset master;
include/reset_master.inc
SET GLOBAL WSREP_ON=ON;
connection node_3;
include/kill_binlog_dump_threads.inc
RESET MASTER;
include/reset_master.inc
3 changes: 1 addition & 2 deletions mysql-test/suite/galera/r/galera_as_slave_nonprim.result
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,4 @@ CALL mtr.add_suppression("(Transport endpoint|Socket) is not connected");
CALL mtr.add_suppression("Slave SQL: Error in Xid_log_event: Commit could not be completed, 'Deadlock found when trying to get lock; try restarting transaction', Error_code: 1213");
CALL mtr.add_suppression("Slave SQL: Node has dropped from cluster, Error_code: 1047");
connection node_4;
include/kill_binlog_dump_threads.inc
RESET MASTER;
include/reset_master.inc
3 changes: 1 addition & 2 deletions mysql-test/suite/galera/r/galera_as_slave_replay.result
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ connection node_1;
ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB;
connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3;
connection node_3;
RESET MASTER;
include/reset_master.inc
connection node_2a;
START SLAVE;
connection node_3;
Expand Down Expand Up @@ -68,7 +68,6 @@ SET GLOBAL gtid_slave_pos = "";
DROP TABLE t1;
connection node_3;
DROP TABLE t1;
include/kill_binlog_dump_threads.inc
include/reset_master.inc
connection node_1;
disconnect node_2a;
Expand Down
3 changes: 1 addition & 2 deletions mysql-test/suite/galera/r/galera_circular_replication.result
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,7 @@ RESET SLAVE ALL;
connection replica2;
STOP SLAVE;
RESET SLAVE ALL;
include/kill_binlog_dump_threads.inc
RESET MASTER;
include/reset_master.inc
connection node_1;
disconnect primary1;
disconnect replica1;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ connection node_2;
connection node_1;
connection node_1;
SET GLOBAL wsrep_on=OFF;
RESET MASTER;
include/reset_master.inc
SET GLOBAL wsrep_on=ON;
FLUSH BINARY LOGS;
SET SESSION binlog_format = 'STATEMENT';
Expand Down
9 changes: 3 additions & 6 deletions mysql-test/suite/galera/r/galera_gtid_slave.result
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,13 @@ STOP SLAVE;
RESET SLAVE ALL;
SET GLOBAL gtid_slave_pos = "";
SET GLOBAL wsrep_on=OFF;
include/kill_binlog_dump_threads.inc
reset master;
include/reset_master.inc
SET GLOBAL wsrep_on=ON;
connection node_1;
SET GLOBAL wsrep_on=OFF;
include/kill_binlog_dump_threads.inc
reset master;
include/reset_master.inc
SET GLOBAL wsrep_on=ON;
connection node_3;
include/kill_binlog_dump_threads.inc
reset master;
include/reset_master.inc
connection node_2;
CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node");
9 changes: 3 additions & 6 deletions mysql-test/suite/galera/r/galera_gtid_slave_sst_rsync.result
Original file line number Diff line number Diff line change
Expand Up @@ -155,19 +155,16 @@ connection node_2;
STOP SLAVE;
RESET SLAVE ALL;
set global wsrep_on=OFF;
include/kill_binlog_dump_threads.inc
reset master;
include/reset_master.inc
set global wsrep_on=ON;
set global gtid_slave_pos="";
#Connection 1
connection node_1;
set global wsrep_on=OFF;
include/kill_binlog_dump_threads.inc
reset master;
include/reset_master.inc
set global wsrep_on=ON;
#Connection 3
connection node_3;
include/kill_binlog_dump_threads.inc
reset master;
include/reset_master.inc
connection node_2;
CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node");
6 changes: 3 additions & 3 deletions mysql-test/suite/galera/r/galera_log_bin.result
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ connection node_2;
connection node_1;
connection node_2;
set global wsrep_on=OFF;
reset master;
include/reset_master.inc
set global wsrep_on=ON;
connection node_1;
set global wsrep_on=OFF;
reset master;
include/reset_master.inc
set global wsrep_on=ON;
CREATE TABLE t1 (id INT PRIMARY KEY) ENGINE=InnoDB;
INSERT INTO t1 VALUES (1);
Expand Down Expand Up @@ -77,5 +77,5 @@ DROP TABLE t2;
#cleanup
connection node_1;
SET GLOBAL wsrep_on=OFF;
RESET MASTER;
include/reset_master.inc
SET GLOBAL wsrep_on=ON;
6 changes: 3 additions & 3 deletions mysql-test/suite/galera/r/galera_log_bin_ext.result
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ connection node_1;
connection node_2;
connection node_2;
set global wsrep_on=OFF;
reset master;
include/reset_master.inc
set global wsrep_on=ON;
connection node_1;
set global wsrep_on=OFF;
reset master;
include/reset_master.inc
set global wsrep_on=ON;
CREATE TABLE t1 (id INT PRIMARY KEY) ENGINE=InnoDB;
INSERT INTO t1 VALUES (1);
Expand Down Expand Up @@ -65,5 +65,5 @@ DROP TABLE t2;
#cleanup
connection node_1;
SET GLOBAL wsrep_on=OFF;
RESET MASTER;
include/reset_master.inc
SET GLOBAL wsrep_on=ON;
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ connection node_1;
connection node_2;
connection node_2;
set global wsrep_on=OFF;
reset master;
include/reset_master.inc
set global wsrep_on=ON;
connection node_1;
set global wsrep_on=OFF;
reset master;
include/reset_master.inc
set global wsrep_on=ON;
CREATE TABLE t1 (id INT PRIMARY KEY) ENGINE=InnoDB;
INSERT INTO t1 VALUES (1);
Expand Down Expand Up @@ -63,5 +63,5 @@ DROP TABLE t2;
#cleanup
connection node_1;
SET GLOBAL wsrep_on=OFF;
RESET MASTER;
include/reset_master.inc
SET GLOBAL wsrep_on=ON;
6 changes: 3 additions & 3 deletions mysql-test/suite/galera/r/galera_log_bin_opt.result
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ connection node_2;
connection node_1;
connection node_2;
set global wsrep_on=OFF;
reset master;
include/reset_master.inc
set global wsrep_on=ON;
connection node_1;
set global wsrep_on=OFF;
reset master;
include/reset_master.inc
set global wsrep_on=ON;
CREATE TABLE t1 (id INT PRIMARY KEY) ENGINE=InnoDB;
INSERT INTO t1 VALUES (1);
Expand Down Expand Up @@ -77,5 +77,5 @@ DROP TABLE t2;
#cleanup
connection node_1;
SET GLOBAL wsrep_on=OFF;
RESET MASTER;
include/reset_master.inc
SET GLOBAL wsrep_on=ON;
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,7 @@ Warnings:
Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'Current_Pos' to 'Slave_Pos'
connection node_1;
SET SESSION WSREP_ON=OFF;
include/kill_binlog_dump_threads.inc
RESET MASTER;
include/reset_master.inc
SET SESSION WSREP_ON=ON;
disconnect node_2;
disconnect node_1;
Expand Down
3 changes: 1 addition & 2 deletions mysql-test/suite/galera/r/galera_replica_no_gtid.result
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,7 @@ connection node_2;
STOP SLAVE;
RESET SLAVE ALL;
connection node_3;
include/kill_binlog_dump_threads.inc
RESET MASTER;
include/reset_master.inc
drop table t1;
connection node_2;
DROP TABLE t1;
Expand Down
3 changes: 1 addition & 2 deletions mysql-test/suite/galera/r/galera_restart_replica.result
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,7 @@ connection replica;
STOP SLAVE;
RESET SLAVE ALL;
connection primary;
include/kill_binlog_dump_threads.inc
RESET MASTER;
include/reset_master.inc
connection node_1;
disconnect primary;
disconnect replica;
Expand Down
5 changes: 2 additions & 3 deletions mysql-test/suite/galera/r/galera_slave_replay.result
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ connection node_2a;
ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB;
connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3;
connection node_3;
RESET MASTER;
include/reset_master.inc
connection node_2a;
START SLAVE;
connection node_3;
Expand Down Expand Up @@ -94,8 +94,7 @@ SET DEBUG_SYNC = "RESET";
DROP TABLE t1;
connection node_3;
DROP TABLE t1;
include/kill_binlog_dump_threads.inc
RESET MASTER;
include/reset_master.inc
connection node_1;
disconnect node_2a;
disconnect node_3;
4 changes: 2 additions & 2 deletions mysql-test/suite/galera/r/galera_var_gtid_domain_id.result
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,11 @@ DROP TABLE t1, t2;
#cleanup
connection node_1;
set global wsrep_on=OFF;
reset master;
include/reset_master.inc
set global wsrep_on=ON;
connection node_2;
set global wsrep_on=OFF;
reset master;
include/reset_master.inc
set global wsrep_on=ON;
connection node_2;
CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node");
Expand Down
4 changes: 2 additions & 2 deletions mysql-test/suite/galera/r/mdev_10518.result
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,11 @@ DROP TABLE t1, t2;
#cleanup
connection node_1;
set global wsrep_on=OFF;
reset master;
include/reset_master.inc
set global wsrep_on=ON;
connection node_2;
set global wsrep_on=OFF;
reset master;
include/reset_master.inc
set global wsrep_on=ON;
connection node_2;
CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node");
Expand Down
4 changes: 2 additions & 2 deletions mysql-test/suite/galera/r/rpl_row_annotate.result
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ connection node_1;
# On node_2
connection node_2;
SET GLOBAL wsrep_on=OFF;
RESET MASTER;
include/reset_master.inc
SET GLOBAL wsrep_on=ON;
# On node_1
connection node_1;
SET GLOBAL wsrep_on=OFF;
RESET MASTER;
include/reset_master.inc
SET GLOBAL wsrep_on=ON;
CREATE TABLE t1(i INT)ENGINE=INNODB;
INSERT INTO t1 VALUES(1);
Expand Down
3 changes: 1 addition & 2 deletions mysql-test/suite/galera/t/MDEV-28053.test
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,4 @@ STOP SLAVE;
RESET SLAVE ALL;

--connection node_3
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
--source include/reset_master.inc
Loading
Loading