diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2023-01-31 11:07:08 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2023-01-31 11:07:08 +0100 |
| commit | c7c415734d27fb98f8019d4c3b646bbdb4906e46 (patch) | |
| tree | 1b71b075e54aac0e7b3b5a240f5835b0cc1d61d4 /mysql-test/include | |
| parent | 10635c2833a951b11b1d56e388244127e257ffb5 (diff) | |
| parent | 76bcea3154a3ac2c26024ac5cb241e19e0e277d9 (diff) | |
| download | mariadb-git-c7c415734d27fb98f8019d4c3b646bbdb4906e46.tar.gz | |
Merge branch '10.10' into 10.11
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/master-slave.inc | 1 | ||||
| -rw-r--r-- | mysql-test/include/rpl_init.inc | 16 |
2 files changed, 16 insertions, 1 deletions
diff --git a/mysql-test/include/master-slave.inc b/mysql-test/include/master-slave.inc index 9ed206b2c22..17c8dd3ed4e 100644 --- a/mysql-test/include/master-slave.inc +++ b/mysql-test/include/master-slave.inc @@ -11,6 +11,7 @@ # [--let $rpl_skip_start_slave= 1] # [--let $rpl_debug= 1] # [--let $slave_timeout= NUMBER] +# [--let $rpl_server_skip_log_bin= 1] # --source include/master-slave.inc # # Parameters: diff --git a/mysql-test/include/rpl_init.inc b/mysql-test/include/rpl_init.inc index 4ee4cccdc20..acb9104ae6f 100644 --- a/mysql-test/include/rpl_init.inc +++ b/mysql-test/include/rpl_init.inc @@ -73,6 +73,7 @@ # before CHANGE MASTER and START SLAVE. RESET MASTER and RESET # SLAVE are suppressed if $rpl_skip_reset_master_and_slave is # set. +# Also see $rpl_server_skip_log_bin. # # $rpl_skip_change_master # By default, this script issues CHANGE MASTER so that all slaves @@ -94,6 +95,10 @@ # Timeout used when waiting for the slave threads to start. # See include/wait_for_slave_param.inc # +# $rpl_server_skip_log_bin +# When $rpl_skip_reset_master_and_slave is not set +# RESET MASTER does not report ER_FLUSH_MASTER_BINLOG_CLOSED +# on any server. # # ==== Side effects ==== # @@ -161,7 +166,16 @@ while ($_rpl_server) USE test; if (!$rpl_skip_reset_master_and_slave) { - RESET MASTER; + if (!$rpl_server_skip_log_bin) + { + --error 0 + RESET MASTER; + } + if ($rpl_server_skip_log_bin) + { + --error 0,ER_FLUSH_MASTER_BINLOG_CLOSED + RESET MASTER; + } SET GLOBAL gtid_slave_pos= ""; RESET SLAVE; } |