diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-07-27 16:20:26 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-07-27 16:22:37 +0300 |
| commit | af40426fcdacfa9e8e2868cf5d95ce671c1287a1 (patch) | |
| tree | 5bd5c65677f523375e62c5da6f5c55dbb156579d /sql/rpl_rli.cc | |
| parent | 7134afa22e3ce91b8f729eaa01dae54e93947f71 (diff) | |
| download | mariadb-git-af40426fcdacfa9e8e2868cf5d95ce671c1287a1.tar.gz | |
Fix purge_relay_logs post merge
slave_skip_counter must not be reset to 0 during purge_relay_logs. See
MDEV-4937 as to when this change happened.
Diffstat (limited to 'sql/rpl_rli.cc')
| -rw-r--r-- | sql/rpl_rli.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc index 083e3649505..eac4149cb06 100644 --- a/sql/rpl_rli.cc +++ b/sql/rpl_rli.cc @@ -1167,7 +1167,6 @@ int purge_relay_logs(Relay_log_info* rli, THD *thd, bool just_reset, DBUG_ASSERT(rli->slave_running == 0); DBUG_ASSERT(rli->mi->slave_running == 0); } - rli->slave_skip_counter=0; mysql_mutex_lock(&rli->data_lock); /* |