diff options
| author | Michael Widenius <monty@askmonty.org> | 2014-01-14 19:00:38 +0100 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2014-01-14 19:00:38 +0100 |
| commit | 0a20d762af01ec835c9c4e6d02b77b9defad8647 (patch) | |
| tree | fd0fe7bf3c35d8367491ed8a960be64dfa2c958e /sql/sql_repl.cc | |
| parent | 2ddbe0ec816136ce17a32d7bd14d85eb9bda8078 (diff) | |
| download | mariadb-git-0a20d762af01ec835c9c4e6d02b77b9defad8647.tar.gz | |
Fix for MDEV-4117 @@global.relay_log_purge not per-master, conflicts between different masters in multisource replication
The fix is to not change @relay_log_purge as part of the CHANGE MASTER.
(There is no logical reason why this is done in the current source)
mysql-test/suite/rpl/r/rpl_slave_status.result:
Ensure that CHANGE MASTER doesn't change relay_log_purge
mysql-test/suite/rpl/t/rpl_slave_status.test:
Ensure that CHANGE MASTER doesn't change relay_log_purge
sql/sql_repl.cc:
Don't change relay_log_purge in CHANGE MASTER
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 717201d5dcc..b2b111dadc3 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -3444,7 +3444,6 @@ bool change_master(THD* thd, Master_info* mi, bool *master_info_added) } if (need_relay_log_purge) { - relay_log_purge= 1; THD_STAGE_INFO(thd, stage_purging_old_relay_logs); if (purge_relay_logs(&mi->rli, thd, 0 /* not only reset, but also reinit */, @@ -3458,7 +3457,6 @@ bool change_master(THD* thd, Master_info* mi, bool *master_info_added) else { const char* msg; - relay_log_purge= 0; /* Relay log is already initialized */ if (init_relay_log_pos(&mi->rli, mi->rli.group_relay_log_name, |