database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

MDEV-34705: Binlog-in-engine: Protect against concurrent RESET MASTER and dump threads

Browse Source 
This is actually an existing problem in the old binlog implementation, and
this patch is applicable to old binlog also. The problem is that RESET
MASTER can run concurrently with binlog dump threads / connected slaves.
This will remove the binlog from under the feet of the reader, which can
cause all sorts of strange behaviour.

This patch fixes the problem by disallowing to run RESET MASTER when dump
threads (or other RESET MASTER or SHOW BINARY LOGS) are running. An error is
thrown in this case, user must stop slaves and/or kill dump threads to make
the RESET MASTER go through. A slave that connects in the middle of RESET
MASTER will wait for it to complete.

Fix a lot of test cases to kill any lingering dump threads before doing
RESET MASTER, mostly just by sourcing include/kill_binlog_dump_threads.inc.

Signed-off-by: Kristian Nielsen <knielsen@knielsen-hq.org>
This commit is contained in:
Kristian Nielsen
2025-06-10 00:52:03 +02:00
parent d26851a575
commit 84da20e658
192 changed files with 789 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/include/kill_binlog_dump_threads.inc
View File

@@ -38,6 +38,7 @@ while ($wait_counter)
let $_tid= `SELECT id FROM information_schema.processlist WHERE command = 'Binlog Dump' LIMIT 1`;
if ($_tid)
{
--error 0,ER_NO_SUCH_THREAD
eval KILL QUERY $_tid;
}
if (!$_tid)
@@ -55,6 +56,14 @@ if (!$success)
SHOW FULL PROCESSLIST;
--die Timeout while waiting for binlog dump threads to disappear.
}
# This an attempt to get more info about a rare sporadic test failure where
# RESET MASTER still fails with ER_BINLOG_IN_USE after this has run.
--let $sanity_check= `SELECT COUNT(*) FROM information_schema.processlist WHERE command = 'Binlog Dump'`
if ($sanity_check > 0) {
SHOW FULL PROCESSLIST;
--echo ERROR: still $sanity_check dump thread(s) found!
--die ERROR: still $sanity_check dump thread(s) found
}
--enable_query_log

1
mysql-test/include/reset_master_slave.inc
View File

@@ -21,6 +21,7 @@ while ($con_name != 'No such row')
--let $con_name = query_get_value(show all slaves status, Connection_name, 1)
}
--source include/kill_binlog_dump_threads.inc
--error 0,ER_FLUSH_MASTER_BINLOG_CLOSED
reset master;
set global gtid_slave_pos='';

1
mysql-test/include/rpl_clone_slave_using_mariadb-backup.inc
View File

@@ -293,6 +293,7 @@ if ($cnf == "galera2_to_mariadb")
--connection master
set global wsrep_on=OFF;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
set global wsrep_on=ON;
}

1
mysql-test/include/rpl_init.inc
View File

@@ -162,6 +162,7 @@ while ($_rpl_server)
USE test;
if (!$rpl_skip_reset_master_and_slave)
{
--source include/kill_binlog_dump_threads.inc
if (!$rpl_server_skip_log_bin)
{
--error 0

1
mysql-test/include/rpl_ip_mix.inc
View File

@@ -1,6 +1,7 @@
connect (master,$IPv6,root,,test,$MASTER_MYPORT);
connect (slave,127.0.0.1,root,,test,$SLAVE_MYPORT);
connection master;
--source include/kill_binlog_dump_threads.inc
reset master;
source include/show_master_status.inc;
save_master_pos;

1
mysql-test/include/rpl_ipv6.inc
View File

@@ -1,5 +1,6 @@
connect (master,$IPv6,root,,test,$MASTER_MYPORT);
connect (slave,$IPv6,root,,test,$SLAVE_MYPORT);
--source include/kill_binlog_dump_threads.inc
connection master;
reset master;
source include/show_master_status.inc;

1
mysql-test/include/rpl_multi_engine2.inc
View File

@@ -9,6 +9,7 @@ STOP SLAVE;
RESET SLAVE;
connection master;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
connection slave;

17
mysql-test/include/rpl_reset.inc
View File

@@ -63,11 +63,26 @@ while ($_rpl_server)
--let $rpl_connection_name= server_$_rpl_server
--source include/rpl_connection.inc
RESET MASTER;
# Check if this server is configured to have a master
if (`SELECT SUBSTRING('$rpl_master_list', 1 + ($_rpl_server - 1) * $rpl_server_count_length, $rpl_server_count_length) != ''`)
{
--source include/stop_slave.inc
}
--dec $_rpl_server
}
--let $_rpl_server= $rpl_server_count
while ($_rpl_server)
{
--let $rpl_connection_name= server_$_rpl_server
--source include/rpl_connection.inc
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
# Check if this server is configured to have a master
if (`SELECT SUBSTRING('$rpl_master_list', 1 + ($_rpl_server - 1) * $rpl_server_count_length, $rpl_server_count_length) != ''`)
{
--source include/reset_slave.inc
}
--dec $_rpl_server

2
mysql-test/include/test_fieldsize.inc
View File

@@ -17,6 +17,7 @@ eval $test_table_slave;
connection master;
eval $test_table_master;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
eval $test_insert;
@@ -33,6 +34,7 @@ STOP SLAVE;
--source include/reset_slave.inc
connection master;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
connection slave;

5
mysql-test/suite/binlog/r/binlog_checkpoint.result
View File

@@ -137,12 +137,9 @@ connect con3,localhost,root,,;
SET debug_sync="reset_logs_after_set_reset_master_pending SIGNAL reset_master_ready WAIT_FOR reset_master_cont";
RESET MASTER;
connection default;
SET @old_dbug= @@global.DEBUG_DBUG;
SET GLOBAL debug_dbug="+d,inject_binlog_background_thread_before_mark_xid_done";
SET debug_sync="now WAIT_FOR reset_master_ready";
RESET MASTER;
SET debug_sync="now WAIT_FOR injected_binlog_background_thread";
SET GLOBAL debug_dbug=@old_dbug;
ERROR HY000: Cannot execute RESET MASTER as the binlog is in use by a connected slave or other RESET MASTER or binlog reader. Check SHOW PROCESSLIST for "Binlog Dump" commands and use KILL to stop such readers
SET debug_sync="now SIGNAL reset_master_cont";
connection con3;
connection default;

1
mysql-test/suite/binlog/r/binlog_mysqlbinlog_warn_stop_datetime.result
View File

@@ -3,6 +3,7 @@ SET TIMESTAMP= UNIX_TIMESTAMP('2024-12-01 10:20:30.123456');
# Clear the existing binary log state, and start fresh using
# the timestamp variable set above
#
include/kill_binlog_dump_threads.inc
RESET MASTER;
create table t1 (a int);
insert into t1 values (1);

5
mysql-test/suite/binlog/t/binlog_checkpoint.test
View File

@@ -160,12 +160,9 @@ SET debug_sync="reset_logs_after_set_reset_master_pending SIGNAL reset_master_re
send RESET MASTER;
--connection default
SET @old_dbug= @@global.DEBUG_DBUG;
SET GLOBAL debug_dbug="+d,inject_binlog_background_thread_before_mark_xid_done";
SET debug_sync="now WAIT_FOR reset_master_ready";
--error ER_BINLOG_IN_USE
RESET MASTER;
SET debug_sync="now WAIT_FOR injected_binlog_background_thread";
SET GLOBAL debug_dbug=@old_dbug;
SET debug_sync="now SIGNAL reset_master_cont";
--connection con3

1
mysql-test/suite/binlog/t/binlog_mysqlbinlog_warn_stop_datetime.test
View File

@@ -29,6 +29,7 @@
--echo # Clear the existing binary log state, and start fresh using
--echo # the timestamp variable set above
--echo #
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
--let $binlog_f1= query_get_value(SHOW MASTER STATUS, File, 1)

2
mysql-test/suite/binlog_encryption/rpl_binlog_errors.result
View File

@@ -13,6 +13,7 @@ call mtr.add_suppression("Could not use master-bin for logging");
SET @old_debug= @@global.debug_dbug;
SELECT repeat('x',8192) INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/bug_46166.data';
SELECT repeat('x',10) INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/bug_46166-2.data';
include/kill_binlog_dump_threads.inc
RESET MASTER;
###################### TEST #1
FLUSH LOGS;
@@ -273,5 +274,6 @@ Note 1255 Slave already has been stopped
RESET SLAVE;
Warnings:
Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos'
include/kill_binlog_dump_threads.inc
RESET MASTER;
include/rpl_end.inc

2
mysql-test/suite/binlog_encryption/rpl_checksum.result
View File

@@ -134,6 +134,7 @@ set @@global.binlog_checksum= IF(floor((rand()*1000)%2), "CRC32", "NONE");
flush logs;
connection master;
set @@global.binlog_checksum= CRC32;
include/kill_binlog_dump_threads.inc
reset master;
flush logs;
create table t3 (a int, b char(5));
@@ -148,6 +149,7 @@ include/stop_slave.inc
change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root';
connection master;
flush logs;
include/kill_binlog_dump_threads.inc
reset master;
insert into t3 value (1, @@global.binlog_checksum);
connection slave;

1
mysql-test/suite/binlog_encryption/rpl_gtid_basic.result
View File

@@ -197,6 +197,7 @@ connection server_1;
SET @old_state= @@GLOBAL.gtid_binlog_state;
SET GLOBAL gtid_binlog_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
include/kill_binlog_dump_threads.inc
RESET MASTER;
SET GLOBAL gtid_binlog_state = '';
FLUSH LOGS;

1
mysql-test/suite/binlog_encryption/rpl_packet.result
View File

@@ -65,6 +65,7 @@ Last_IO_Error = 'Got a packet bigger than 'slave_max_allowed_packet' bytes'
STOP SLAVE;
RESET SLAVE;
connection master;
include/kill_binlog_dump_threads.inc
RESET MASTER;
SET @max_allowed_packet_0= @@session.max_allowed_packet;
SHOW BINLOG EVENTS;

5
mysql-test/suite/binlog_encryption/rpl_semi_sync.result
View File

@@ -20,6 +20,7 @@ include/reset_slave.inc
set global rpl_semi_sync_master_enabled= 0;
set global rpl_semi_sync_slave_enabled= 0;
connection master;
include/kill_binlog_dump_threads.inc
reset master;
set global rpl_semi_sync_master_enabled= 0;
set global rpl_semi_sync_slave_enabled= 0;
@@ -301,8 +302,10 @@ connection master;
create table t1 (a int) engine = ENGINE_TYPE;
drop table t1;
connection slave;
include/stop_slave.inc
[ test reset master ]
connection master;
include/kill_binlog_dump_threads.inc
reset master;
show status like 'Rpl_semi_sync_master_status';
Variable_name Value
@@ -314,7 +317,6 @@ show status like 'Rpl_semi_sync_master_yes_tx';
Variable_name Value
Rpl_semi_sync_master_yes_tx 0
connection slave;
include/stop_slave.inc
include/reset_slave.inc
include/kill_binlog_dump_threads.inc
connection slave;
@@ -349,6 +351,7 @@ connection slave;
include/stop_slave.inc
include/reset_slave.inc
connection master;
include/kill_binlog_dump_threads.inc
reset master;
include/kill_binlog_dump_threads.inc
set sql_log_bin=0;

5
mysql-test/suite/engines/funcs/r/rpl_000015.result
View File

@@ -1,11 +1,14 @@
include/master-slave.inc
[connection master]
connection slave;
include/stop_slave.inc
connection master;
include/kill_binlog_dump_threads.inc
reset master;
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 329
connection slave;
include/stop_slave.inc
reset slave;
Slave_IO_Running = 'No'
Slave_SQL_Running = 'No'

1
mysql-test/suite/engines/funcs/r/rpl_server_id2.result
View File

@@ -20,6 +20,7 @@ stop slave;
include/wait_for_slave_to_stop.inc
drop table t1;
connection master;
include/kill_binlog_dump_threads.inc
reset master;
create table t1(n int);
create table t2(n int);

1
mysql-test/suite/engines/funcs/r/rpl_trigger.result
View File

@@ -1006,6 +1006,7 @@ SHOW TABLES LIKE 't_';
Tables_in_test (t_)
SHOW TRIGGERS;
Trigger Event Table Statement Timing Created sql_mode Definer character_set_client collation_connection Database Collation
include/kill_binlog_dump_threads.inc
RESET MASTER;
connection slave;
include/start_slave.inc

5
mysql-test/suite/engines/funcs/t/rpl_000015.test
View File

@@ -5,11 +5,14 @@
#####################
--source include/master-slave.inc
connection slave;
--source include/stop_slave.inc
connection master;
--source include/kill_binlog_dump_threads.inc
reset master;
show master status;
save_master_pos;
connection slave;
--source include/stop_slave.inc
reset slave;
--let $status_items= Slave_IO_Running, Slave_SQL_Running, Last_SQL_Errno, Last_SQL_Error, Exec_Master_Log_Pos
--source include/show_slave_status.inc

1
mysql-test/suite/engines/funcs/t/rpl_trigger.test
View File

@@ -357,6 +357,7 @@ connection master;
SHOW TABLES LIKE 't_';
SHOW TRIGGERS;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
# Restart slave.

1
mysql-test/suite/galera/r/MDEV-28053.result
View File

@@ -11,4 +11,5 @@ connection node_2;
STOP SLAVE;
RESET SLAVE ALL;
connection node_3;
include/kill_binlog_dump_threads.inc
RESET MASTER;

2
mysql-test/suite/galera/r/galera_2primary_replica.result
View File

@@ -86,8 +86,10 @@ Note 1938 SLAVE 'stream1' stopped
Note 1938 SLAVE 'stream2' stopped
RESET SLAVE ALL;
connection primary1;
include/kill_binlog_dump_threads.inc
RESET MASTER;
connection primary2;
include/kill_binlog_dump_threads.inc
RESET MASTER;
connection node_1;
disconnect primary1;

1
mysql-test/suite/galera/r/galera_as_master.result
View File

@@ -59,5 +59,6 @@ RESET SLAVE ALL;
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;
set global wsrep_on=ON;

1
mysql-test/suite/galera/r/galera_as_slave.result
View File

@@ -29,4 +29,5 @@ connection node_2;
STOP SLAVE;
RESET SLAVE ALL;
connection node_3;
include/kill_binlog_dump_threads.inc
RESET MASTER;

1
mysql-test/suite/galera/r/galera_as_slave_autoinc.result
View File

@@ -97,4 +97,5 @@ connection node_2;
STOP SLAVE;
RESET SLAVE ALL;
connection node_3;
include/kill_binlog_dump_threads.inc
RESET MASTER;

1
mysql-test/suite/galera/r/galera_as_slave_ctas.result
View File

@@ -28,4 +28,5 @@ connection node_1;
STOP SLAVE;
RESET SLAVE ALL;
connection node_3;
include/kill_binlog_dump_threads.inc
RESET MASTER;

3
mysql-test/suite/galera/r/galera_as_slave_gtid.result
View File

@@ -28,11 +28,14 @@ RESET SLAVE ALL;
#cleanup
connection node_1;
set global wsrep_on=OFF;
include/kill_binlog_dump_threads.inc
reset master;
set global wsrep_on=ON;
connection node_2;
set global wsrep_on=OFF;
include/kill_binlog_dump_threads.inc
reset master;
set global wsrep_on=ON;
connection node_3;
include/kill_binlog_dump_threads.inc
reset master;

3
mysql-test/suite/galera/r/galera_as_slave_gtid_auto_engine.result
View File

@@ -28,13 +28,16 @@ RESET SLAVE ALL;
#cleanup
connection node_1;
set global wsrep_on=OFF;
include/kill_binlog_dump_threads.inc
reset master;
set global wsrep_on=ON;
connection node_2;
set global wsrep_on=OFF;
include/kill_binlog_dump_threads.inc
reset master;
set global wsrep_on=ON;
connection node_3;
include/kill_binlog_dump_threads.inc
reset master;
connection node_2;
DROP TABLE mysql.gtid_slave_pos_InnoDB;

4
mysql-test/suite/galera/r/galera_as_slave_gtid_myisam.result
View File

@@ -28,16 +28,18 @@ DROP TABLE t1;
connection node_1;
connection node_2;
connection node_3;
RESET MASTER;
connection node_1;
STOP SLAVE;
RESET SLAVE ALL;
SET GLOBAL WSREP_ON=OFF;
include/kill_binlog_dump_threads.inc
reset master;
SET GLOBAL WSREP_ON=ON;
connection node_2;
SET GLOBAL WSREP_ON=OFF;
include/kill_binlog_dump_threads.inc
reset master;
SET GLOBAL WSREP_ON=ON;
connection node_3;
include/kill_binlog_dump_threads.inc
RESET MASTER;

1
mysql-test/suite/galera/r/galera_as_slave_nonprim.result
View File

@@ -31,4 +31,5 @@ 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;

1
mysql-test/suite/galera/r/galera_circular_replication.result
View File

@@ -128,6 +128,7 @@ RESET SLAVE ALL;
connection replica2;
STOP SLAVE;
RESET SLAVE ALL;
include/kill_binlog_dump_threads.inc
RESET MASTER;
connection node_1;
disconnect primary1;

3
mysql-test/suite/galera/r/galera_gtid_slave.result
View File

@@ -33,13 +33,16 @@ connection node_2;
STOP SLAVE;
RESET SLAVE ALL;
SET GLOBAL wsrep_on=OFF;
include/kill_binlog_dump_threads.inc
reset master;
SET GLOBAL wsrep_on=ON;
connection node_1;
SET GLOBAL wsrep_on=OFF;
include/kill_binlog_dump_threads.inc
reset master;
SET GLOBAL wsrep_on=ON;
connection node_3;
include/kill_binlog_dump_threads.inc
reset master;
connection node_2;
CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node");

3
mysql-test/suite/galera/r/galera_gtid_slave_sst_rsync.result
View File

@@ -155,16 +155,19 @@ connection node_2;
STOP SLAVE;
RESET SLAVE ALL;
set global wsrep_on=OFF;
include/kill_binlog_dump_threads.inc
reset master;
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;
set global wsrep_on=ON;
#Connection 3
connection node_3;
include/kill_binlog_dump_threads.inc
reset master;
connection node_2;
CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node");

1
mysql-test/suite/galera/r/galera_query_cache_invalidate.result
View File

@@ -113,6 +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;
SET SESSION WSREP_ON=ON;
disconnect node_2;

1
mysql-test/suite/galera/r/galera_replica_no_gtid.result
View File

@@ -59,6 +59,7 @@ connection node_2;
STOP SLAVE;
RESET SLAVE ALL;
connection node_3;
include/kill_binlog_dump_threads.inc
RESET MASTER;
drop table t1;
connection node_2;

1
mysql-test/suite/galera/r/galera_restart_replica.result
View File

@@ -161,6 +161,7 @@ connection replica;
STOP SLAVE;
RESET SLAVE ALL;
connection primary;
include/kill_binlog_dump_threads.inc
RESET MASTER;
connection node_1;
disconnect primary;

1
mysql-test/suite/galera/r/rpl_galera_to_mariadb_clone_slave_using_mariadb-backup.result
View File

@@ -207,5 +207,6 @@ Warnings:
Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos'
connection master;
set global wsrep_on=OFF;
include/kill_binlog_dump_threads.inc
RESET MASTER;
set global wsrep_on=ON;

1
mysql-test/suite/galera/t/MDEV-28053.test
View File

@@ -59,4 +59,5 @@ STOP SLAVE;
RESET SLAVE ALL;
--connection node_3
--source include/kill_binlog_dump_threads.inc
RESET MASTER;

2
mysql-test/suite/galera/t/galera_2primary_replica.test
View File

@@ -157,8 +157,10 @@ STOP ALL SLAVES;
RESET SLAVE ALL;
--connection primary1
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
--connection primary2
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
--source include/auto_increment_offset_restore.inc

1
mysql-test/suite/galera/t/galera_as_master.test
View File

@@ -71,5 +71,6 @@ CALL mtr.add_suppression('You need to use --log-bin to make --binlog-format work
--connection node_1
set global wsrep_on=OFF;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
set global wsrep_on=ON;

1
mysql-test/suite/galera/t/galera_as_slave.test
View File

@@ -63,4 +63,5 @@ STOP SLAVE;
RESET SLAVE ALL;
--connection node_3
--source include/kill_binlog_dump_threads.inc
RESET MASTER;

1
mysql-test/suite/galera/t/galera_as_slave_autoinc.test
View File

@@ -82,4 +82,5 @@ STOP SLAVE;
RESET SLAVE ALL;
--connection node_3
--source include/kill_binlog_dump_threads.inc
RESET MASTER;

1
mysql-test/suite/galera/t/galera_as_slave_ctas.test
View File

@@ -72,4 +72,5 @@ STOP SLAVE;
RESET SLAVE ALL;
--connection node_3
--source include/kill_binlog_dump_threads.inc
RESET MASTER;

3
mysql-test/suite/galera/t/galera_as_slave_gtid.inc
View File

@@ -82,13 +82,16 @@ RESET SLAVE ALL;
--echo #cleanup
--connection node_1
set global wsrep_on=OFF;
--source include/kill_binlog_dump_threads.inc
reset master;
set global wsrep_on=ON;
--connection node_2
set global wsrep_on=OFF;
--source include/kill_binlog_dump_threads.inc
reset master;
set global wsrep_on=ON;
--connection node_3
--source include/kill_binlog_dump_threads.inc
reset master;

4
mysql-test/suite/galera/t/galera_as_slave_gtid_myisam.test
View File

@@ -68,19 +68,21 @@ DROP TABLE t1;
--connection node_3
--let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1';
--source include/wait_condition.inc
RESET MASTER;
--connection node_1
STOP SLAVE;
RESET SLAVE ALL;
SET GLOBAL WSREP_ON=OFF;
--source include/kill_binlog_dump_threads.inc
reset master;
SET GLOBAL WSREP_ON=ON;
--connection node_2
SET GLOBAL WSREP_ON=OFF;
--source include/kill_binlog_dump_threads.inc
reset master;
SET GLOBAL WSREP_ON=ON;
--connection node_3
--source include/kill_binlog_dump_threads.inc
RESET MASTER;

1
mysql-test/suite/galera/t/galera_as_slave_nonprim.test
View File

@@ -90,4 +90,5 @@ CALL mtr.add_suppression("Slave SQL: Error in Xid_log_event: Commit could not be
CALL mtr.add_suppression("Slave SQL: Node has dropped from cluster, Error_code: 1047");
--connection node_4
--source include/kill_binlog_dump_threads.inc
RESET MASTER;

1
mysql-test/suite/galera/t/galera_circular_replication.test
View File

@@ -221,6 +221,7 @@ RESET SLAVE ALL;
--connection replica2
STOP SLAVE;
RESET SLAVE ALL;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
--source include/auto_increment_offset_restore.inc

3
mysql-test/suite/galera/t/galera_gtid_slave.test
View File

@@ -80,15 +80,18 @@ DROP TABLE t1,t2;
STOP SLAVE;
RESET SLAVE ALL;
SET GLOBAL wsrep_on=OFF;
--source include/kill_binlog_dump_threads.inc
reset master;
SET GLOBAL wsrep_on=ON;
--connection node_1
SET GLOBAL wsrep_on=OFF;
--source include/kill_binlog_dump_threads.inc
reset master;
SET GLOBAL wsrep_on=ON;
--connection node_3
--source include/kill_binlog_dump_threads.inc
reset master;
--connection node_2

3
mysql-test/suite/galera/t/galera_gtid_slave_sst_rsync.test
View File

@@ -196,6 +196,7 @@ DROP TABLE t2,t1;
STOP SLAVE;
RESET SLAVE ALL;
set global wsrep_on=OFF;
--source include/kill_binlog_dump_threads.inc
reset master;
set global wsrep_on=ON;
@@ -206,11 +207,13 @@ set global gtid_slave_pos="";
--echo #Connection 1
--connection node_1
set global wsrep_on=OFF;
--source include/kill_binlog_dump_threads.inc
reset master;
set global wsrep_on=ON;
--echo #Connection 3
--connection node_3
--source include/kill_binlog_dump_threads.inc
reset master;
--connection node_2

1
mysql-test/suite/galera/t/galera_query_cache_invalidate.test
View File

@@ -114,6 +114,7 @@ RESET SLAVE ALL;
--connection node_1
SET SESSION WSREP_ON=OFF;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
SET SESSION WSREP_ON=ON;

1
mysql-test/suite/galera/t/galera_replica_no_gtid.test
View File

@@ -106,6 +106,7 @@ STOP SLAVE;
RESET SLAVE ALL;
--connection node_3
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
drop table t1;

1
mysql-test/suite/galera/t/galera_restart_replica.test
View File

@@ -274,6 +274,7 @@ STOP SLAVE;
RESET SLAVE ALL;
--connection primary
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
--source include/auto_increment_offset_restore.inc

6
mysql-test/suite/galera_3nodes/r/galera_2_cluster.result
View File

@@ -75,27 +75,33 @@ RESET SLAVE;
Warnings:
Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'Current_Pos' to 'Slave_Pos'
SET GLOBAL wsrep_on = OFF;
include/kill_binlog_dump_threads.inc
RESET MASTER;
SET GLOBAL wsrep_on = ON;
SET GLOBAL GTID_SLAVE_POS="";
connection node_1;
SET GLOBAL wsrep_on = OFF;
include/kill_binlog_dump_threads.inc
RESET MASTER;
SET GLOBAL wsrep_on = ON;
connection node_2;
SET GLOBAL wsrep_on = OFF;
include/kill_binlog_dump_threads.inc
RESET MASTER;
SET GLOBAL wsrep_on = ON;
connection node_3;
SET GLOBAL wsrep_on = OFF;
include/kill_binlog_dump_threads.inc
RESET MASTER;
SET GLOBAL wsrep_on = ON;
connection node_5;
SET GLOBAL wsrep_on = OFF;
include/kill_binlog_dump_threads.inc
RESET MASTER;
SET GLOBAL wsrep_on = ON;
connection node_6;
SET GLOBAL wsrep_on = OFF;
include/kill_binlog_dump_threads.inc
RESET MASTER;
SET GLOBAL wsrep_on = ON;
connection node_1;

12
mysql-test/suite/galera_3nodes/r/galera_gtid_2_cluster.result
View File

@@ -235,6 +235,7 @@ cluster 1 node 1
connection node_1;
change master to master_use_gtid=no, ignore_server_ids=();
set global wsrep_on=OFF;
include/kill_binlog_dump_threads.inc
reset master;
set global wsrep_on=ON;
set global GTID_SLAVE_POS="";
@@ -242,23 +243,28 @@ cluster 2 node 1
connection node_4;
change master to master_use_gtid=no, ignore_server_ids=();
set global wsrep_on=OFF;
include/kill_binlog_dump_threads.inc
reset master;
set global wsrep_on=ON;
set global GTID_SLAVE_POS="";
connection node_2;
set global wsrep_on=OFF;
include/kill_binlog_dump_threads.inc
reset master;
set global wsrep_on=ON;
connection node_3;
set global wsrep_on=OFF;
include/kill_binlog_dump_threads.inc
reset master;
set global wsrep_on=ON;
connection node_5;
set global wsrep_on=OFF;
include/kill_binlog_dump_threads.inc
reset master;
set global wsrep_on=ON;
connection node_6;
set global wsrep_on=OFF;
include/kill_binlog_dump_threads.inc
reset master;
set global wsrep_on=ON;
connection node_1;
@@ -448,6 +454,7 @@ drop table t1;
stop slave;
change master to master_use_gtid=no, ignore_server_ids=();
set global wsrep_on=OFF;
include/kill_binlog_dump_threads.inc
reset master;
set global wsrep_on=ON;
set global GTID_SLAVE_POS="";
@@ -456,22 +463,27 @@ connection node_4;
stop slave;
change master to master_use_gtid=no, ignore_server_ids=();
set global wsrep_on=OFF;
include/kill_binlog_dump_threads.inc
reset master;
set global wsrep_on=ON;
set global GTID_SLAVE_POS="";
connection node_2;
set global wsrep_on=OFF;
include/kill_binlog_dump_threads.inc
reset master;
set global wsrep_on=ON;
connection node_3;
set global wsrep_on=OFF;
include/kill_binlog_dump_threads.inc
reset master;
set global wsrep_on=ON;
connection node_5;
set global wsrep_on=OFF;
include/kill_binlog_dump_threads.inc
reset master;
set global wsrep_on=ON;
connection node_6;
set global wsrep_on=OFF;
include/kill_binlog_dump_threads.inc
reset master;
set global wsrep_on=ON;

6
mysql-test/suite/galera_3nodes/t/galera_2_cluster.test
View File

@@ -138,6 +138,7 @@ DROP TABLE t1;
STOP SLAVE;
RESET SLAVE;
SET GLOBAL wsrep_on = OFF;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
SET GLOBAL wsrep_on = ON;
--source include/wait_until_ready.inc
@@ -146,6 +147,7 @@ SET GLOBAL GTID_SLAVE_POS="";
--connection node_1
SET GLOBAL wsrep_on = OFF;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
SET GLOBAL wsrep_on = ON;
--source include/wait_until_ready.inc
@@ -153,6 +155,7 @@ SET GLOBAL wsrep_on = ON;
--connection node_2
SET GLOBAL wsrep_on = OFF;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
SET GLOBAL wsrep_on = ON;
--source include/wait_until_ready.inc
@@ -160,6 +163,7 @@ SET GLOBAL wsrep_on = ON;
--connection node_3
SET GLOBAL wsrep_on = OFF;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
SET GLOBAL wsrep_on = ON;
--source include/wait_until_ready.inc
@@ -167,6 +171,7 @@ SET GLOBAL wsrep_on = ON;
--connection node_5
SET GLOBAL wsrep_on = OFF;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
SET GLOBAL wsrep_on = ON;
--source include/wait_until_ready.inc
@@ -174,6 +179,7 @@ SET GLOBAL wsrep_on = ON;
--connection node_6
SET GLOBAL wsrep_on = OFF;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
SET GLOBAL wsrep_on = ON;
--source include/wait_until_ready.inc

12
mysql-test/suite/galera_3nodes/t/galera_gtid_2_cluster.test
View File

@@ -170,6 +170,7 @@ reset slave;
--connection node_1
change master to master_use_gtid=no, ignore_server_ids=();
set global wsrep_on=OFF;
--source include/kill_binlog_dump_threads.inc
reset master;
set global wsrep_on=ON;
set global GTID_SLAVE_POS="";
@@ -179,24 +180,29 @@ set global GTID_SLAVE_POS="";
--connection node_4
change master to master_use_gtid=no, ignore_server_ids=();
set global wsrep_on=OFF;
--source include/kill_binlog_dump_threads.inc
reset master;
set global wsrep_on=ON;
set global GTID_SLAVE_POS="";
--connection node_2
set global wsrep_on=OFF;
--source include/kill_binlog_dump_threads.inc
reset master;
set global wsrep_on=ON;
--connection node_3
set global wsrep_on=OFF;
--source include/kill_binlog_dump_threads.inc
reset master;
set global wsrep_on=ON;
--connection node_5
set global wsrep_on=OFF;
--source include/kill_binlog_dump_threads.inc
reset master;
set global wsrep_on=ON;
--connection node_6
set global wsrep_on=OFF;
--source include/kill_binlog_dump_threads.inc
reset master;
set global wsrep_on=ON;
#--enable_parsing
@@ -334,6 +340,7 @@ drop table t1;
stop slave;
change master to master_use_gtid=no, ignore_server_ids=();
set global wsrep_on=OFF;
--source include/kill_binlog_dump_threads.inc
reset master;
set global wsrep_on=ON;
set global GTID_SLAVE_POS="";
@@ -343,23 +350,28 @@ set global GTID_SLAVE_POS="";
stop slave;
change master to master_use_gtid=no, ignore_server_ids=();
set global wsrep_on=OFF;
--source include/kill_binlog_dump_threads.inc
reset master;
set global wsrep_on=ON;
set global GTID_SLAVE_POS="";
--connection node_2
set global wsrep_on=OFF;
--source include/kill_binlog_dump_threads.inc
reset master;
set global wsrep_on=ON;
--connection node_3
set global wsrep_on=OFF;
--source include/kill_binlog_dump_threads.inc
reset master;
set global wsrep_on=ON;
--connection node_5
set global wsrep_on=OFF;
--source include/kill_binlog_dump_threads.inc
reset master;
set global wsrep_on=ON;
--connection node_6
set global wsrep_on=OFF;
--source include/kill_binlog_dump_threads.inc
reset master;
set global wsrep_on=ON;

4
mysql-test/suite/perfschema/r/relaylog.result
View File

@@ -65,11 +65,13 @@ where event_name like "%MYSQL_BIN_LOG%"
and event_name not like "%MYSQL_BIN_LOG::COND_xid_list"
order by event_name;
EVENT_NAME COUNT_STAR
wait/synch/cond/sql/MYSQL_BIN_LOG::COND_binlog_use NONE
wait/synch/cond/sql/MYSQL_BIN_LOG::COND_bin_log_updated MANY
wait/synch/cond/sql/MYSQL_BIN_LOG::COND_queue_busy NONE
wait/synch/cond/sql/MYSQL_BIN_LOG::COND_relay_log_updated NONE
wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_binlog_background_thread MANY
wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_binlog_end_pos MANY
wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_binlog_use MANY
wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_index MANY
wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_xid_list MANY
"Expect no slave relay log"
@@ -155,11 +157,13 @@ where event_name like "%MYSQL_BIN_LOG%"
and event_name not like "%MYSQL_BIN_LOG::COND_xid_list"
order by event_name;
EVENT_NAME COUNT_STAR
wait/synch/cond/sql/MYSQL_BIN_LOG::COND_binlog_use NONE
wait/synch/cond/sql/MYSQL_BIN_LOG::COND_bin_log_updated NONE
wait/synch/cond/sql/MYSQL_BIN_LOG::COND_queue_busy NONE
wait/synch/cond/sql/MYSQL_BIN_LOG::COND_relay_log_updated NONE
wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_binlog_background_thread MANY
wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_binlog_end_pos MANY
wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_binlog_use MANY
wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_index MANY
wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_xid_list MANY
"Expect a slave relay log"

3
mysql-test/suite/rpl/include/mysqlbinlog_slave_consistency.inc
View File

@@ -133,6 +133,7 @@ if (!$slave_sql_errno)
--connection $con1
DROP TABLE IF EXISTS t1, t2, t3, t4, t5;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
--echo # MYSQL_BINLOG BINLOG_FILE_PARAM $msbl_args 2> MYSQLBINLOG_STDERR | MYSQL
--exec $MYSQL_BINLOG $BINLOG_FILE_PARAM $msbl_args 2> $MYSQLBINLOG_STDERR | $MYSQL
@@ -164,6 +165,7 @@ set global gtid_slave_pos="";
CHANGE MASTER TO DO_DOMAIN_IDS=(), IGNORE_DOMAIN_IDS=(), IGNORE_SERVER_IDS=();
--connection $con1
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
DROP TABLE IF EXISTS t1, t2, t3, t4, t5;
--source include/save_master_gtid.inc
@@ -178,6 +180,7 @@ set global gtid_slave_pos="";
RESET MASTER;
--connection $con1
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
--connection $con2

12
mysql-test/suite/rpl/include/rpl_extra_col_master.inc
View File

@@ -466,6 +466,7 @@ eval CREATE TABLE t10 (a INT PRIMARY KEY, b BLOB, c CHAR(5)
--connection master
eval CREATE TABLE t10 (a INT KEY, b BLOB, f DOUBLE DEFAULT '233',
c CHAR(5), e INT DEFAULT '1')ENGINE=$engine_type;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
--echo
@@ -522,6 +523,7 @@ connection master;
eval CREATE TABLE t11 (a INT KEY, b BLOB, f TEXT,
c CHAR(5) DEFAULT 'test', e INT DEFAULT '1')ENGINE=$engine_type;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
--echo
@@ -577,6 +579,7 @@ connection master;
eval CREATE TABLE t12 (a INT KEY, b BLOB, f TEXT,
c CHAR(5) DEFAULT 'test', e INT DEFAULT '1')ENGINE=$engine_type;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
--echo
@@ -630,6 +633,7 @@ eval CREATE TABLE t14 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
)ENGINE=$engine_type;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
--echo
@@ -701,6 +705,7 @@ DROP TABLE t14;
connection master;
DROP TABLE t14;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
connection slave;
@@ -727,6 +732,7 @@ eval CREATE TABLE t15 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
)ENGINE=$engine_type;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
--echo
@@ -765,6 +771,7 @@ DROP TABLE t15;
connection master;
DROP TABLE t15;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
connection slave;
@@ -791,6 +798,7 @@ eval CREATE TABLE t16 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
)ENGINE=$engine_type;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
--echo
@@ -842,6 +850,7 @@ DROP TABLE t16;
connection master;
DROP TABLE t16;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
connection slave;
@@ -869,6 +878,7 @@ eval CREATE TABLE t17 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
)ENGINE=$engine_type;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
--echo
@@ -935,6 +945,7 @@ eval CREATE TABLE t18 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
)ENGINE=$engine_type;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
--echo
@@ -998,6 +1009,7 @@ eval CREATE TABLE t5 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
)ENGINE=$engine_type;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
--echo

21
mysql-test/suite/rpl/include/rpl_extra_col_slave.test
View File

@@ -40,6 +40,7 @@ connection master;
eval CREATE TABLE t1 (a INT PRIMARY KEY, b INT, c CHAR(10)
) ENGINE=$engine_type;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
--echo *** Start Slave ***
@@ -81,6 +82,7 @@ eval CREATE TABLE t2 (a INT, b INT PRIMARY KEY, c CHAR(5),
connection master;
eval CREATE TABLE t2 (a INT PRIMARY KEY, b INT, c CHAR(10)
) ENGINE=$engine_type;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
--echo *** Master Data Insert ***
@@ -100,6 +102,7 @@ STOP SLAVE;
SELECT * FROM t2 ORDER BY a;
connection master;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
connection slave;
@@ -126,6 +129,7 @@ eval CREATE TABLE t3 (a INT, b INT PRIMARY KEY, c CHAR(20),
connection master;
eval CREATE TABLE t3 (a BLOB, b INT PRIMARY KEY, c CHAR(20)
) ENGINE=$engine_type;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
--echo *** Start Slave ***
@@ -171,6 +175,7 @@ eval CREATE TABLE t4 (a INT, b INT PRIMARY KEY, c CHAR(20),
connection master;
eval CREATE TABLE t4 (a DECIMAL(8,2), b INT PRIMARY KEY, c CHAR(20)
) ENGINE=$engine_type;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
--echo *** Start Slave ***
@@ -214,6 +219,7 @@ connection master;
eval CREATE TABLE t5 (a INT PRIMARY KEY, b VARCHAR(6),
c DECIMAL(8,2), d BIT, e BLOB,
f FLOAT) ENGINE=$engine_type;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
--echo *** Start Slave ***
@@ -258,6 +264,7 @@ connection master;
eval CREATE TABLE t6 (a INT PRIMARY KEY, b VARCHAR(6),
c DECIMAL(8,2), d BIT
) ENGINE=$engine_type;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
--echo *** Start Slave ***
@@ -317,6 +324,7 @@ eval CREATE TABLE t7 (a INT KEY, b BLOB, c CHAR(5),
connection master;
eval CREATE TABLE t7 (a INT PRIMARY KEY, b BLOB, c CHAR(5)
) ENGINE=$engine_type;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
--echo *** Start Slave ***
@@ -358,6 +366,7 @@ eval CREATE TABLE t8 (a INT KEY, b BLOB, c CHAR(5),
connection master;
eval CREATE TABLE t8 (a INT PRIMARY KEY, b BLOB, c CHAR(5)
) ENGINE=$engine_type;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
--echo *** Start Slave ***
@@ -408,6 +417,7 @@ sync_slave_with_master;
connection master;
eval CREATE TABLE t9 (a INT PRIMARY KEY, b BLOB, c CHAR(5)
) ENGINE=$engine_type;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
--echo *** Start Slave ***
@@ -456,6 +466,7 @@ eval CREATE TABLE t10 (a INT KEY, b BLOB, f DOUBLE DEFAULT '233',
connection master;
eval CREATE TABLE t10 (a INT PRIMARY KEY, b BLOB, c CHAR(5)
) ENGINE=$engine_type;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
--echo *** Start Slave ***
@@ -498,6 +509,7 @@ eval CREATE TABLE t11 (a INT KEY, b BLOB, f INT,
connection master;
eval CREATE TABLE t11 (a INT PRIMARY KEY, b BLOB, c VARCHAR(254)
) ENGINE=$engine_type;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
--echo *** Start Slave ***
@@ -540,6 +552,7 @@ eval CREATE TABLE t12 (a INT KEY, b BLOB, f TEXT,
connection master;
eval CREATE TABLE t12 (a INT PRIMARY KEY, b BLOB, c BLOB
) ENGINE=$engine_type;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
--echo *** Start Slave ***
@@ -581,6 +594,7 @@ eval CREATE TABLE t13 (a INT KEY, b BLOB, c CHAR(5),
connection master;
eval CREATE TABLE t13 (a INT PRIMARY KEY, b BLOB, c CHAR(5)
) ENGINE=$engine_type;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
--echo *** Start Slave ***
@@ -629,6 +643,8 @@ eval CREATE TABLE t14 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
connection master;
eval CREATE TABLE t14 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5)
) ENGINE=$engine_type;
--source include/kill_binlog_dump_threads.inc
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
--echo *** Start Slave ***
@@ -669,6 +685,7 @@ eval CREATE TABLE t14a (c1 INT KEY, c4 BLOB, c5 CHAR(5),
connection master;
eval CREATE TABLE t14a (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5)
) ENGINE=$engine_type;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
--echo *** Start Slave ***
@@ -694,6 +711,7 @@ STOP SLAVE;
--echo *** Master Drop c5 ***
connection master;
ALTER TABLE t14a DROP COLUMN c5;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
--echo *** Start Slave ***
@@ -759,6 +777,7 @@ eval CREATE TABLE t15 (c1 INT KEY, c2 DECIMAL(8,2), c3 TEXT,
connection master;
eval CREATE TABLE t15 (c1 INT PRIMARY KEY, c2 DECIMAL(8,2), c3 TEXT,
c4 BLOB, c5 CHAR(5)) ENGINE=$engine_type;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
--echo *** Start Slave ***
@@ -832,6 +851,7 @@ eval CREATE TABLE t16 (c1 INT KEY, c2 DECIMAL(8,2), c3 TEXT,
connection master;
eval CREATE TABLE t16 (c1 INT PRIMARY KEY, c2 DECIMAL(8,2), c3 TEXT,
c4 BLOB, c5 CHAR(5))ENGINE=$engine_type;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
--echo *** Start Slave ***
@@ -886,6 +906,7 @@ eval CREATE TABLE t17 (a SMALLINT, b INT PRIMARY KEY, c CHAR(5),
connection master;
eval CREATE TABLE t17 (a BIGINT PRIMARY KEY, b INT, c CHAR(10)
) ENGINE=$engine_type;
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
--echo *** Start Slave ***

1
mysql-test/suite/rpl/include/rpl_gtid_until_before_after_gtids.test
View File

@@ -33,6 +33,7 @@ if (!$ssu_before_gtids)
--source include/stop_slave.inc
--source include/reset_slave.inc
--connection master
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
set session gtid_domain_id=0;

1
mysql-test/suite/rpl/include/rpl_loaddata.test
View File

@@ -115,6 +115,7 @@ stop slave;
# Finally, see if logging is done ok on master for a failing LOAD DATA INFILE
connection master;
--source include/kill_binlog_dump_threads.inc
reset master;
eval create table t2 (day date,id int(9),category enum('a','b','c'),name varchar(60),
unique(day)) engine=$engine_type; # no transactions

1
mysql-test/suite/rpl/include/rpl_parallel_29322.inc
View File

@@ -25,6 +25,7 @@
--connection master
--let $datadir= `SELECT @@datadir`
--source include/kill_binlog_dump_threads.inc
reset master; # Master starts a new serious of binlog files
create table t2 (a timestamp, b int);

5
mysql-test/suite/rpl/include/rpl_start_stop_slave.test
View File

@@ -187,13 +187,15 @@ sync_slave_with_master;
# Testing how out of valid range position value is handled with an error.
#
--connection slave
--source include/stop_slave.inc
--connection master
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
let $master_pos= query_get_value(SHOW MASTER STATUS, Position, 1);
let $master_pos= `SELECT $master_pos + 1`;
--connection slave
--source include/stop_slave.inc
--replace_regex /[0-9]+/MASTER_POS/
eval CHANGE MASTER TO master_log_pos=$master_pos, master_use_gtid=no;
@@ -211,6 +213,7 @@ START SLAVE;
RESET SLAVE;
--connection master
--source include/kill_binlog_dump_threads.inc
RESET MASTER;
# Slave is stopped by bug#3593869-64035 tests.

1
mysql-test/suite/rpl/r/rpl_binlog_directory.result
View File

@@ -40,6 +40,7 @@ connection slave;
include/stop_slave.inc
SET GLOBAL gtid_slave_pos= '';
connection master;
include/kill_binlog_dump_threads.inc
RESET MASTER;
connection slave;
include/start_slave.inc

2
mysql-test/suite/rpl/r/rpl_binlog_errors.result
View File

@@ -13,6 +13,7 @@ call mtr.add_suppression("Could not use master-bin for logging");
SET @old_debug= @@global.debug_dbug;
SELECT repeat('x',8192) INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/bug_46166.data';
SELECT repeat('x',10) INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/bug_46166-2.data';
include/kill_binlog_dump_threads.inc
RESET MASTER;
###################### TEST #1
FLUSH LOGS;
@@ -273,5 +274,6 @@ Note 1255 Slave already has been stopped
RESET SLAVE;
Warnings:
Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos'
include/kill_binlog_dump_threads.inc
RESET MASTER;
include/rpl_end.inc

5
mysql-test/suite/rpl/r/rpl_blackhole_row_annotate.result
View File

@@ -1,8 +1,13 @@
include/master-slave.inc
[connection master]
connection slave;
include/stop_slave.inc
connection master;
include/kill_binlog_dump_threads.inc
SET timestamp=1000000000;
RESET MASTER;
connection slave;
include/start_slave.inc
SET timestamp=1000000000;
RESET MASTER;
connection master;

1
mysql-test/suite/rpl/r/rpl_bug41902.result
View File

@@ -20,6 +20,7 @@ SET @@debug_dbug="";
reset slave;
change master to master_host='dummy';
connection master;
include/kill_binlog_dump_threads.inc
SET @saved_dbug_m = @@global.debug_dbug;
SET @@debug_dbug="d,simulate_find_log_pos_error";
reset master;

8
mysql-test/suite/rpl/r/rpl_change_master_demote.result
View File

@@ -65,11 +65,15 @@ connection master;
#
connection slave;
include/stop_slave.inc
include/kill_binlog_dump_threads.inc
RESET MASTER;
set @@global.gtid_slave_pos="";
connection master;
include/kill_binlog_dump_threads.inc
RESET MASTER;
connection slave;
include/start_slave.inc
connection master;
RESET MASTER;
set @@global.gtid_slave_pos="";
set session gtid_domain_id= 0;
CREATE TABLE t1 (a int);
@@ -689,6 +693,7 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp
# Ensure MASTER_DEMOTE_TO_REPLICA aliases MASTER_DEMOTE_TO_SLAVE
#
connection slave;
include/kill_binlog_dump_threads.inc
RESET MASTER;
include/reset_slave.inc
CREATE TABLE t_mdev_31768 (a int);
@@ -700,6 +705,7 @@ RESET MASTER;
include/reset_slave.inc
# Clear primary binlog state to match replica
connection master;
include/kill_binlog_dump_threads.inc
RESET MASTER;
#
# Cleanup

2
mysql-test/suite/rpl/r/rpl_checksum.result
View File

@@ -134,6 +134,7 @@ set @@global.binlog_checksum= IF(floor((rand()*1000)%2), "CRC32", "NONE");
flush logs;
connection master;
set @@global.binlog_checksum= CRC32;
include/kill_binlog_dump_threads.inc
reset master;
flush logs;
create table t3 (a int, b char(5));
@@ -148,6 +149,7 @@ include/stop_slave.inc
change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root';
connection master;
flush logs;
include/kill_binlog_dump_threads.inc
reset master;
insert into t3 value (1, @@global.binlog_checksum);
connection slave;

1
mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result
View File

@@ -181,6 +181,7 @@ DELETE FROM t1 WHERE a = 6;
include/start_slave.inc
connection server_2;
connection server_3;
include/kill_binlog_dump_threads.inc
RESET MASTER;
connection server_4;
RESET SLAVE;

2
mysql-test/suite/rpl/r/rpl_circular_semi_sync.result
View File

@@ -6,11 +6,13 @@ call mtr.add_suppression("Timeout waiting for reply of binlog");
connection server_2;
include/stop_slave.inc
connection server_1;
include/kill_binlog_dump_threads.inc
RESET MASTER;
set @@session.gtid_domain_id=10;
set @@global.rpl_semi_sync_master_enabled = 1;
set @@global.rpl_semi_sync_master_wait_point=AFTER_SYNC;
connection server_2;
include/kill_binlog_dump_threads.inc
RESET MASTER;
ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB;
set @@session.gtid_domain_id=20;

1
mysql-test/suite/rpl/r/rpl_colSize.result
View File

@@ -53,6 +53,7 @@ r TEXT,
s MEDIUMTEXT,
t LONGTEXT
);
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start replication ***
connection slave;

1
mysql-test/suite/rpl/r/rpl_delayed_slave.result
View File

@@ -164,6 +164,7 @@ Warnings:
Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos'
[on master]
connection master;
include/kill_binlog_dump_threads.inc
RESET MASTER;
[on slave]
connection slave;

12
mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result
View File

@@ -448,6 +448,7 @@ CREATE TABLE t10 (a INT PRIMARY KEY, b BLOB, c CHAR(5)
connection master;
CREATE TABLE t10 (a INT KEY, b BLOB, f DOUBLE DEFAULT '233',
c CHAR(5), e INT DEFAULT '1')ENGINE='InnoDB';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
@@ -490,6 +491,7 @@ CREATE TABLE t11 (a INT PRIMARY KEY, b BLOB, c VARCHAR(254)
connection master;
CREATE TABLE t11 (a INT KEY, b BLOB, f TEXT,
c CHAR(5) DEFAULT 'test', e INT DEFAULT '1')ENGINE='InnoDB';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
@@ -532,6 +534,7 @@ CREATE TABLE t12 (a INT PRIMARY KEY, b BLOB, c BLOB
connection master;
CREATE TABLE t12 (a INT KEY, b BLOB, f TEXT,
c CHAR(5) DEFAULT 'test', e INT DEFAULT '1')ENGINE='InnoDB';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
@@ -583,6 +586,7 @@ CREATE TABLE t14 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
c6 INT DEFAULT '1',
c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
)ENGINE='InnoDB';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
@@ -644,6 +648,7 @@ include/reset_slave.inc
DROP TABLE t14;
connection master;
DROP TABLE t14;
include/kill_binlog_dump_threads.inc
RESET MASTER;
connection slave;
START SLAVE;
@@ -667,6 +672,7 @@ CREATE TABLE t15 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
c6 INT DEFAULT '1',
c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
)ENGINE='InnoDB';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
@@ -703,6 +709,7 @@ Warning 1948 Specified value for @@gtid_slave_pos contains no value for replicat
DROP TABLE t15;
connection master;
DROP TABLE t15;
include/kill_binlog_dump_threads.inc
RESET MASTER;
connection slave;
START SLAVE;
@@ -726,6 +733,7 @@ CREATE TABLE t16 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
c6 INT DEFAULT '1',
c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
)ENGINE='InnoDB';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
@@ -762,6 +770,7 @@ Warning 1948 Specified value for @@gtid_slave_pos contains no value for replicat
DROP TABLE t16;
connection master;
DROP TABLE t16;
include/kill_binlog_dump_threads.inc
RESET MASTER;
connection slave;
START SLAVE;
@@ -785,6 +794,7 @@ CREATE TABLE t17 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
c6 INT DEFAULT '1',
c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
)ENGINE='InnoDB';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
@@ -851,6 +861,7 @@ CREATE TABLE t18 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
c6 INT DEFAULT '1',
c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
)ENGINE='InnoDB';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
@@ -916,6 +927,7 @@ CREATE TABLE t5 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
c6 LONG,
c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
)ENGINE='InnoDB';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***

12
mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result
View File

@@ -448,6 +448,7 @@ CREATE TABLE t10 (a INT PRIMARY KEY, b BLOB, c CHAR(5)
connection master;
CREATE TABLE t10 (a INT KEY, b BLOB, f DOUBLE DEFAULT '233',
c CHAR(5), e INT DEFAULT '1')ENGINE='MyISAM';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
@@ -490,6 +491,7 @@ CREATE TABLE t11 (a INT PRIMARY KEY, b BLOB, c VARCHAR(254)
connection master;
CREATE TABLE t11 (a INT KEY, b BLOB, f TEXT,
c CHAR(5) DEFAULT 'test', e INT DEFAULT '1')ENGINE='MyISAM';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
@@ -532,6 +534,7 @@ CREATE TABLE t12 (a INT PRIMARY KEY, b BLOB, c BLOB
connection master;
CREATE TABLE t12 (a INT KEY, b BLOB, f TEXT,
c CHAR(5) DEFAULT 'test', e INT DEFAULT '1')ENGINE='MyISAM';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
@@ -583,6 +586,7 @@ CREATE TABLE t14 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
c6 INT DEFAULT '1',
c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
)ENGINE='MyISAM';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
@@ -644,6 +648,7 @@ include/reset_slave.inc
DROP TABLE t14;
connection master;
DROP TABLE t14;
include/kill_binlog_dump_threads.inc
RESET MASTER;
connection slave;
START SLAVE;
@@ -667,6 +672,7 @@ CREATE TABLE t15 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
c6 INT DEFAULT '1',
c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
)ENGINE='MyISAM';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
@@ -703,6 +709,7 @@ Warning 1948 Specified value for @@gtid_slave_pos contains no value for replicat
DROP TABLE t15;
connection master;
DROP TABLE t15;
include/kill_binlog_dump_threads.inc
RESET MASTER;
connection slave;
START SLAVE;
@@ -726,6 +733,7 @@ CREATE TABLE t16 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
c6 INT DEFAULT '1',
c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
)ENGINE='MyISAM';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
@@ -762,6 +770,7 @@ Warning 1948 Specified value for @@gtid_slave_pos contains no value for replicat
DROP TABLE t16;
connection master;
DROP TABLE t16;
include/kill_binlog_dump_threads.inc
RESET MASTER;
connection slave;
START SLAVE;
@@ -785,6 +794,7 @@ CREATE TABLE t17 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
c6 INT DEFAULT '1',
c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
)ENGINE='MyISAM';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
@@ -851,6 +861,7 @@ CREATE TABLE t18 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
c6 INT DEFAULT '1',
c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
)ENGINE='MyISAM';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
@@ -916,6 +927,7 @@ CREATE TABLE t5 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
c6 LONG,
c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
)ENGINE='MyISAM';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***

21
mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result
View File

@@ -16,6 +16,7 @@ ENGINE='InnoDB';
connection master;
CREATE TABLE t1 (a INT PRIMARY KEY, b INT, c CHAR(10)
) ENGINE='InnoDB';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
connection slave;
@@ -51,6 +52,7 @@ ENGINE='InnoDB';
connection master;
CREATE TABLE t2 (a INT PRIMARY KEY, b INT, c CHAR(10)
) ENGINE='InnoDB';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Master Data Insert ***
connection master;
@@ -72,6 +74,7 @@ Warning 1948 Specified value for @@gtid_slave_pos contains no value for replicat
SELECT * FROM t2 ORDER BY a;
a b c d e
connection master;
include/kill_binlog_dump_threads.inc
RESET MASTER;
connection slave;
START SLAVE;
@@ -90,6 +93,7 @@ ENGINE='InnoDB';
connection master;
CREATE TABLE t3 (a BLOB, b INT PRIMARY KEY, c CHAR(20)
) ENGINE='InnoDB';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
connection slave;
@@ -120,6 +124,7 @@ ENGINE='InnoDB';
connection master;
CREATE TABLE t4 (a DECIMAL(8,2), b INT PRIMARY KEY, c CHAR(20)
) ENGINE='InnoDB';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
connection slave;
@@ -149,6 +154,7 @@ connection master;
CREATE TABLE t5 (a INT PRIMARY KEY, b VARCHAR(6),
c DECIMAL(8,2), d BIT, e BLOB,
f FLOAT) ENGINE='InnoDB';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
connection slave;
@@ -177,6 +183,7 @@ connection master;
CREATE TABLE t6 (a INT PRIMARY KEY, b VARCHAR(6),
c DECIMAL(8,2), d BIT
) ENGINE='InnoDB';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
connection slave;
@@ -209,6 +216,7 @@ ENGINE='InnoDB';
connection master;
CREATE TABLE t7 (a INT PRIMARY KEY, b BLOB, c CHAR(5)
) ENGINE='InnoDB';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
connection slave;
@@ -244,6 +252,7 @@ e INT)ENGINE='InnoDB';
connection master;
CREATE TABLE t8 (a INT PRIMARY KEY, b BLOB, c CHAR(5)
) ENGINE='InnoDB';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
connection slave;
@@ -270,6 +279,7 @@ i blob) ENGINE='InnoDB';
connection master;
CREATE TABLE t9 (a INT PRIMARY KEY, b BLOB, c CHAR(5)
) ENGINE='InnoDB';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
connection slave;
@@ -297,6 +307,7 @@ c CHAR(5), e INT DEFAULT '1')ENGINE='InnoDB';
connection master;
CREATE TABLE t10 (a INT PRIMARY KEY, b BLOB, c CHAR(5)
) ENGINE='InnoDB';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
connection slave;
@@ -325,6 +336,7 @@ c CHAR(5) DEFAULT 'test', e INT DEFAULT '1')ENGINE='InnoDB';
connection master;
CREATE TABLE t11 (a INT PRIMARY KEY, b BLOB, c VARCHAR(254)
) ENGINE='InnoDB';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
connection slave;
@@ -353,6 +365,7 @@ c CHAR(5) DEFAULT 'test', e INT DEFAULT '1')ENGINE='InnoDB';
connection master;
CREATE TABLE t12 (a INT PRIMARY KEY, b BLOB, c BLOB
) ENGINE='InnoDB';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
connection slave;
@@ -391,6 +404,7 @@ e TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
connection master;
CREATE TABLE t13 (a INT PRIMARY KEY, b BLOB, c CHAR(5)
) ENGINE='InnoDB';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
connection slave;
@@ -429,6 +443,8 @@ c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
connection master;
CREATE TABLE t14 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5)
) ENGINE='InnoDB';
include/kill_binlog_dump_threads.inc
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
connection slave;
@@ -465,6 +481,7 @@ c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
connection master;
CREATE TABLE t14a (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5)
) ENGINE='InnoDB';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
connection slave;
@@ -493,6 +510,7 @@ include/reset_slave.inc
*** Master Drop c5 ***
connection master;
ALTER TABLE t14a DROP COLUMN c5;
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
connection slave;
@@ -558,6 +576,7 @@ c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
connection master;
CREATE TABLE t15 (c1 INT PRIMARY KEY, c2 DECIMAL(8,2), c3 TEXT,
c4 BLOB, c5 CHAR(5)) ENGINE='InnoDB';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
connection slave;
@@ -626,6 +645,7 @@ c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
connection master;
CREATE TABLE t16 (c1 INT PRIMARY KEY, c2 DECIMAL(8,2), c3 TEXT,
c4 BLOB, c5 CHAR(5))ENGINE='InnoDB';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
connection slave;
@@ -697,6 +717,7 @@ ENGINE='InnoDB';
connection master;
CREATE TABLE t17 (a BIGINT PRIMARY KEY, b INT, c CHAR(10)
) ENGINE='InnoDB';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
connection slave;

1
mysql-test/suite/rpl/r/rpl_extra_col_slave_minimal.result
View File

@@ -11,6 +11,7 @@ d char(10) as (concat(trim(c), '-U')) unique,
e char(10) as (concat('S', b)) stored) engine=innodb;
connection master;
create table t1 (a int primary key, b blob, c char(5)) engine=innodb;
include/kill_binlog_dump_threads.inc
reset master;
connection slave;
start slave;

21
mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result
View File

@@ -16,6 +16,7 @@ ENGINE='MyISAM';
connection master;
CREATE TABLE t1 (a INT PRIMARY KEY, b INT, c CHAR(10)
) ENGINE='MyISAM';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
connection slave;
@@ -51,6 +52,7 @@ ENGINE='MyISAM';
connection master;
CREATE TABLE t2 (a INT PRIMARY KEY, b INT, c CHAR(10)
) ENGINE='MyISAM';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Master Data Insert ***
connection master;
@@ -72,6 +74,7 @@ Warning 1948 Specified value for @@gtid_slave_pos contains no value for replicat
SELECT * FROM t2 ORDER BY a;
a b c d e
connection master;
include/kill_binlog_dump_threads.inc
RESET MASTER;
connection slave;
START SLAVE;
@@ -90,6 +93,7 @@ ENGINE='MyISAM';
connection master;
CREATE TABLE t3 (a BLOB, b INT PRIMARY KEY, c CHAR(20)
) ENGINE='MyISAM';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
connection slave;
@@ -120,6 +124,7 @@ ENGINE='MyISAM';
connection master;
CREATE TABLE t4 (a DECIMAL(8,2), b INT PRIMARY KEY, c CHAR(20)
) ENGINE='MyISAM';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
connection slave;
@@ -149,6 +154,7 @@ connection master;
CREATE TABLE t5 (a INT PRIMARY KEY, b VARCHAR(6),
c DECIMAL(8,2), d BIT, e BLOB,
f FLOAT) ENGINE='MyISAM';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
connection slave;
@@ -177,6 +183,7 @@ connection master;
CREATE TABLE t6 (a INT PRIMARY KEY, b VARCHAR(6),
c DECIMAL(8,2), d BIT
) ENGINE='MyISAM';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
connection slave;
@@ -209,6 +216,7 @@ ENGINE='MyISAM';
connection master;
CREATE TABLE t7 (a INT PRIMARY KEY, b BLOB, c CHAR(5)
) ENGINE='MyISAM';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
connection slave;
@@ -244,6 +252,7 @@ e INT)ENGINE='MyISAM';
connection master;
CREATE TABLE t8 (a INT PRIMARY KEY, b BLOB, c CHAR(5)
) ENGINE='MyISAM';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
connection slave;
@@ -270,6 +279,7 @@ i blob) ENGINE='MyISAM';
connection master;
CREATE TABLE t9 (a INT PRIMARY KEY, b BLOB, c CHAR(5)
) ENGINE='MyISAM';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
connection slave;
@@ -297,6 +307,7 @@ c CHAR(5), e INT DEFAULT '1')ENGINE='MyISAM';
connection master;
CREATE TABLE t10 (a INT PRIMARY KEY, b BLOB, c CHAR(5)
) ENGINE='MyISAM';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
connection slave;
@@ -325,6 +336,7 @@ c CHAR(5) DEFAULT 'test', e INT DEFAULT '1')ENGINE='MyISAM';
connection master;
CREATE TABLE t11 (a INT PRIMARY KEY, b BLOB, c VARCHAR(254)
) ENGINE='MyISAM';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
connection slave;
@@ -353,6 +365,7 @@ c CHAR(5) DEFAULT 'test', e INT DEFAULT '1')ENGINE='MyISAM';
connection master;
CREATE TABLE t12 (a INT PRIMARY KEY, b BLOB, c BLOB
) ENGINE='MyISAM';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
connection slave;
@@ -391,6 +404,7 @@ e TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
connection master;
CREATE TABLE t13 (a INT PRIMARY KEY, b BLOB, c CHAR(5)
) ENGINE='MyISAM';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
connection slave;
@@ -429,6 +443,8 @@ c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
connection master;
CREATE TABLE t14 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5)
) ENGINE='MyISAM';
include/kill_binlog_dump_threads.inc
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
connection slave;
@@ -465,6 +481,7 @@ c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
connection master;
CREATE TABLE t14a (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5)
) ENGINE='MyISAM';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
connection slave;
@@ -493,6 +510,7 @@ include/reset_slave.inc
*** Master Drop c5 ***
connection master;
ALTER TABLE t14a DROP COLUMN c5;
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
connection slave;
@@ -558,6 +576,7 @@ c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
connection master;
CREATE TABLE t15 (c1 INT PRIMARY KEY, c2 DECIMAL(8,2), c3 TEXT,
c4 BLOB, c5 CHAR(5)) ENGINE='MyISAM';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
connection slave;
@@ -626,6 +645,7 @@ c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
connection master;
CREATE TABLE t16 (c1 INT PRIMARY KEY, c2 DECIMAL(8,2), c3 TEXT,
c4 BLOB, c5 CHAR(5))ENGINE='MyISAM';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
connection slave;
@@ -697,6 +717,7 @@ ENGINE='MyISAM';
connection master;
CREATE TABLE t17 (a BIGINT PRIMARY KEY, b INT, c CHAR(10)
) ENGINE='MyISAM';
include/kill_binlog_dump_threads.inc
RESET MASTER;
*** Start Slave ***
connection slave;

1
mysql-test/suite/rpl/r/rpl_gtid_basic.result
View File

@@ -197,6 +197,7 @@ connection server_1;
SET @old_state= @@GLOBAL.gtid_binlog_state;
SET GLOBAL gtid_binlog_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
include/kill_binlog_dump_threads.inc
RESET MASTER;
SET GLOBAL gtid_binlog_state = '';
FLUSH LOGS;

1
mysql-test/suite/rpl/r/rpl_gtid_crash.result
View File

@@ -43,6 +43,7 @@ include/stop_slave.inc
RESET MASTER;
SET GLOBAL gtid_slave_pos='';
connection server_1;
include/kill_binlog_dump_threads.inc
RESET MASTER;
SHOW BINLOG EVENTS IN 'master-bin.000001' LIMIT 1,1;
Log_name Pos Event_type Server_id End_log_pos Info

1
mysql-test/suite/rpl/r/rpl_gtid_errorhandling.result
View File

@@ -93,6 +93,7 @@ SET SESSION binlog_format= @old_mode;
connection slave;
include/stop_slave.inc
connection master;
include/kill_binlog_dump_threads.inc
RESET MASTER;
INSERT INTO t1 VALUES (2);
INSERT INTO t1 VALUES (4);

5
mysql-test/suite/rpl/r/rpl_gtid_header_valid.result
View File

@@ -32,6 +32,7 @@ include/wait_for_slave_sql_error.inc [errno=1594]
STOP SLAVE IO_THREAD;
# Reset master binlogs (as there is an invalid event) and slave state
connection master;
include/kill_binlog_dump_threads.inc
RESET MASTER;
connection slave;
RESET MASTER;
@@ -58,6 +59,7 @@ STOP SLAVE IO_THREAD;
set statement SQL_LOG_BIN=0 for XA COMMIT 'x1';
# Reset master binlogs (as there is an invalid event) and slave state
connection master;
include/kill_binlog_dump_threads.inc
RESET MASTER;
connection slave;
RESET MASTER;
@@ -84,6 +86,7 @@ STOP SLAVE IO_THREAD;
set statement SQL_LOG_BIN=0 for XA COMMIT 'x1';
# Reset master binlogs (as there is an invalid event) and slave state
connection master;
include/kill_binlog_dump_threads.inc
RESET MASTER;
connection slave;
RESET MASTER;
@@ -105,6 +108,7 @@ include/wait_for_slave_sql_error.inc [errno=1594]
STOP SLAVE IO_THREAD;
# Reset master binlogs (as there is an invalid event) and slave state
connection master;
include/kill_binlog_dump_threads.inc
RESET MASTER;
connection slave;
RESET SLAVE;
@@ -128,6 +132,7 @@ include/wait_for_slave_sql_error.inc [errno=1594]
STOP SLAVE IO_THREAD;
# Reset master binlogs (as there is an invalid event) and slave state
connection master;
include/kill_binlog_dump_threads.inc
RESET MASTER;
connection slave;
SET STATEMENT sql_log_bin=0 FOR alter table t1 add column (nc int);

1
mysql-test/suite/rpl/r/rpl_gtid_mdev4820.result
View File

@@ -18,6 +18,7 @@ include/stop_slave.inc
connection server_1;
INSERT INTO t1 VALUES (2);
INSERT INTO t1 VALUES (3);
include/kill_binlog_dump_threads.inc
RESET MASTER;
SET GLOBAL gtid_slave_pos= 'OLD_GTID_POS';
connection server_2;

3
mysql-test/suite/rpl/r/rpl_gtid_reconnect.result
View File

@@ -43,6 +43,7 @@ SET GLOBAL gtid_slave_pos= "";
connection server_1;
SET GLOBAL debug_dbug= @old_debug;
TRUNCATE t1;
include/kill_binlog_dump_threads.inc
RESET MASTER;
SET gtid_domain_id=10;
SET gtid_seq_no=50;
@@ -91,6 +92,7 @@ SET GLOBAL gtid_slave_pos= "";
connection server_1;
SET GLOBAL debug_dbug= @old_debug;
TRUNCATE t1;
include/kill_binlog_dump_threads.inc
RESET MASTER;
include/kill_binlog_dump_threads.inc
SET gtid_domain_id= 9;
@@ -143,6 +145,7 @@ SET GLOBAL gtid_slave_pos= "";
connection server_1;
SET GLOBAL debug_dbug= @old_debug;
TRUNCATE t1;
include/kill_binlog_dump_threads.inc
RESET MASTER;
include/kill_binlog_dump_threads.inc
SET GLOBAL debug_dbug="+d,dummy_disable_default_dbug_output";

1
mysql-test/suite/rpl/r/rpl_gtid_sort.result
View File

@@ -17,6 +17,7 @@ SHOW VARIABLES LIKE 'gtid_binlog_state';
Variable_name Value
gtid_binlog_state
connection server_1;
include/kill_binlog_dump_threads.inc
RESET MASTER;
FLUSH LOGS;
CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;

4
mysql-test/suite/rpl/r/rpl_gtid_startpos.result
View File

@@ -5,6 +5,7 @@ include/stop_slave.inc
RESET MASTER;
RESET SLAVE;
connection server_1;
include/kill_binlog_dump_threads.inc
RESET MASTER;
FLUSH LOGS;
CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
@@ -92,6 +93,7 @@ include/stop_slave.inc
RESET SLAVE ALL;
RESET MASTER;
connection server_1;
include/kill_binlog_dump_threads.inc
RESET MASTER;
connection server_2;
SET GLOBAL gtid_slave_pos='';
@@ -199,6 +201,7 @@ include/stop_slave.inc
RESET MASTER;
SET GLOBAL gtid_slave_pos="";
connection server_1;
include/kill_binlog_dump_threads.inc
RESET MASTER;
TRUNCATE TABLE t1;
INSERT INTO t1 VALUES (10);
@@ -244,6 +247,7 @@ SET GLOBAL gtid_slave_pos= "";
CHANGE MASTER TO master_host='127.0.0.1', master_port=MASTER_PORT, master_user='root', master_use_gtid=no, master_log_file="", master_log_pos= 4;
connection server_1;
DROP TABLE t1;
include/kill_binlog_dump_threads.inc
RESET MASTER;
CREATE TABLE t1 (a INT PRIMARY KEY);
connection server_2;

1
mysql-test/suite/rpl/r/rpl_gtid_until.result
View File

@@ -206,6 +206,7 @@ RESET SLAVE ALL;
RESET MASTER;
SET GLOBAL gtid_slave_pos='';
connection server_1;
include/kill_binlog_dump_threads.inc
RESET MASTER;
INSERT INTO t1 VALUES (10);
INSERT INTO t1 VALUES (11);

6
mysql-test/suite/rpl/r/rpl_heartbeat.result
View File

@@ -1,9 +1,11 @@
include/master-slave.inc
[connection master]
connection master;
reset master;
connection slave;
include/stop_slave.inc
connection master;
include/kill_binlog_dump_threads.inc
reset master;
connection slave;
set @restore_slave_net_timeout= @@global.slave_net_timeout;
set @@global.slave_net_timeout= 10;
change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root';

7
mysql-test/suite/rpl/r/rpl_heartbeat_basic.result
View File

@@ -7,6 +7,7 @@ include/stop_slave.inc
RESET SLAVE;
SET @restore_slave_net_timeout=@@global.slave_net_timeout;
connection master;
include/kill_binlog_dump_threads.inc
RESET MASTER;
SET @restore_slave_net_timeout=@@global.slave_net_timeout;
@@ -268,6 +269,7 @@ DROP TABLE t1;
set sql_log_bin= 1;
connection master;
DROP TABLE t1;
include/kill_binlog_dump_threads.inc
RESET MASTER;
connection slave;
CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root', MASTER_CONNECT_RETRY=20, MASTER_HEARTBEAT_PERIOD=0.5;
@@ -293,9 +295,12 @@ connection slave;
STOP SLAVE;
include/reset_slave.inc
CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root', MASTER_CONNECT_RETRY=20, MASTER_HEARTBEAT_PERIOD=0.1;
connection master;
include/kill_binlog_dump_threads.inc
RESET MASTER;
connection slave;
include/start_slave.inc
connection master;
RESET MASTER;
connection slave;
Heartbeat events are received after reset of master (1 means 'yes'): 1

3
mysql-test/suite/rpl/r/rpl_ip_mix.result
View File

@@ -2,6 +2,7 @@
connect master,$IPv6,root,,test,$MASTER_MYPORT;
connect slave,127.0.0.1,root,,test,$SLAVE_MYPORT;
connection master;
include/kill_binlog_dump_threads.inc
reset master;
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
@@ -18,6 +19,7 @@ connection default;
connect master,$IPv6,root,,test,$MASTER_MYPORT;
connect slave,127.0.0.1,root,,test,$SLAVE_MYPORT;
connection master;
include/kill_binlog_dump_threads.inc
reset master;
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
@@ -34,6 +36,7 @@ connection default;
connect master,$IPv6,root,,test,$MASTER_MYPORT;
connect slave,127.0.0.1,root,,test,$SLAVE_MYPORT;
connection master;
include/kill_binlog_dump_threads.inc
reset master;
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB

6
mysql-test/suite/rpl/r/rpl_ipv4_as_ipv6.result
View File

@@ -1,6 +1,7 @@
#################### IP: 127.0.0.1 ###########################
connect master,$IPv6,root,,test,$MASTER_MYPORT;
connect slave,$IPv6,root,,test,$SLAVE_MYPORT;
include/kill_binlog_dump_threads.inc
connection master;
reset master;
show master status;
@@ -16,6 +17,7 @@ connection default;
#################### IP: 0:0:0:0:0:FFFF:127.0.0.1 ###########################
connect master,$IPv6,root,,test,$MASTER_MYPORT;
connect slave,$IPv6,root,,test,$SLAVE_MYPORT;
include/kill_binlog_dump_threads.inc
connection master;
reset master;
show master status;
@@ -31,6 +33,7 @@ connection default;
#################### IP: 0000:0000:0000:0000:0000:FFFF:127.0.0.1 ###########################
connect master,$IPv6,root,,test,$MASTER_MYPORT;
connect slave,$IPv6,root,,test,$SLAVE_MYPORT;
include/kill_binlog_dump_threads.inc
connection master;
reset master;
show master status;
@@ -46,6 +49,7 @@ connection default;
#################### IP: 0:0000:0000:0:0000:FFFF:127.0.0.1 ###########################
connect master,$IPv6,root,,test,$MASTER_MYPORT;
connect slave,$IPv6,root,,test,$SLAVE_MYPORT;
include/kill_binlog_dump_threads.inc
connection master;
reset master;
show master status;
@@ -61,6 +65,7 @@ connection default;
#################### IP: 0::0000:FFFF:127.0.0.1 ###########################
connect master,$IPv6,root,,test,$MASTER_MYPORT;
connect slave,$IPv6,root,,test,$SLAVE_MYPORT;
include/kill_binlog_dump_threads.inc
connection master;
reset master;
show master status;
@@ -76,6 +81,7 @@ connection default;
#################### IP: ::FFFF:127.0.0.1 ###########################
connect master,$IPv6,root,,test,$MASTER_MYPORT;
connect slave,$IPv6,root,,test,$SLAVE_MYPORT;
include/kill_binlog_dump_threads.inc
connection master;
reset master;
show master status;

3
mysql-test/suite/rpl/r/rpl_ipv6.result
View File

@@ -1,6 +1,7 @@
#################### IP: ::1 ###########################
connect master,$IPv6,root,,test,$MASTER_MYPORT;
connect slave,$IPv6,root,,test,$SLAVE_MYPORT;
include/kill_binlog_dump_threads.inc
connection master;
reset master;
show master status;
@@ -16,6 +17,7 @@ connection default;
#################### IP: 0000:0000:0000:0000:0000:0000:0000:0001 ###########################
connect master,$IPv6,root,,test,$MASTER_MYPORT;
connect slave,$IPv6,root,,test,$SLAVE_MYPORT;
include/kill_binlog_dump_threads.inc
connection master;
reset master;
show master status;
@@ -31,6 +33,7 @@ connection default;
#################### IP: 0:0:0:0:0:0:0:1 ###########################
connect master,$IPv6,root,,test,$MASTER_MYPORT;
connect slave,$IPv6,root,,test,$SLAVE_MYPORT;
include/kill_binlog_dump_threads.inc
connection master;
reset master;
show master status;

1
mysql-test/suite/rpl/r/rpl_loaddata.result
View File

@@ -62,6 +62,7 @@ Warnings:
Warning 1948 Specified value for @@gtid_slave_pos contains no value for replication domain 0. This conflicts with the binary log which contains GTID 0-2-14. If MASTER_GTID_POS=CURRENT_POS is used, the binlog position will override the new value of @@gtid_slave_pos
include/check_slave_no_error.inc
connection master;
include/kill_binlog_dump_threads.inc
reset master;
create table t2 (day date,id int(9),category enum('a','b','c'),name varchar(60),
unique(day)) engine=MyISAM;

2
mysql-test/suite/rpl/r/rpl_mdev_17614.result
View File

@@ -32,6 +32,7 @@ a b c
include/stop_slave_io.inc
include/reset_slave.inc
connection master;
include/kill_binlog_dump_threads.inc
reset master;
drop table t1;
connection slave;
@@ -191,6 +192,7 @@ a b c
include/stop_slave_io.inc
include/reset_slave.inc
connection master;
include/kill_binlog_dump_threads.inc
reset master;
drop table t1;
connection slave;

5
mysql-test/suite/rpl/r/rpl_mysqlbinlog_slave_consistency.result
View File

@@ -7,6 +7,7 @@ call mtr.add_suppression("Both DO_DOMAIN_IDS & IGNORE_DOMAIN_IDS lists can't be
SET sql_log_bin=1;
include/stop_slave.inc
connection master;
include/kill_binlog_dump_threads.inc
RESET MASTER;
connection slave;
include/start_slave.inc
@@ -1336,8 +1337,10 @@ ERROR HY000: Could not initialize master info structure for ''; more error messa
RESET MASTER;
set global gtid_slave_pos="";
CHANGE MASTER TO MASTER_USE_GTID=slave_pos, DO_DOMAIN_IDS=(), IGNORE_DOMAIN_IDS=();
include/start_slave.inc
connection master;
include/kill_binlog_dump_threads.inc
RESET MASTER;
connection slave;
include/start_slave.inc
include/rpl_end.inc
# End of tests (rpl.rpl_mysqlbinlog_slave_consistency)

1
mysql-test/suite/rpl/r/rpl_packet.result
View File

@@ -65,6 +65,7 @@ Last_IO_Error = 'Got a packet bigger than 'slave_max_allowed_packet' bytes'
STOP SLAVE;
RESET SLAVE;
connection master;
include/kill_binlog_dump_threads.inc
RESET MASTER;
SET @max_allowed_packet_0= @@session.max_allowed_packet;
SHOW BINLOG EVENTS;

Some files were not shown because too many files have changed in this diff Show More