Commit af40426f authored by Vicențiu Ciorbaru's avatar Vicențiu Ciorbaru

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.
parent 7134afa2
...@@ -1167,7 +1167,6 @@ int purge_relay_logs(Relay_log_info* rli, THD *thd, bool just_reset, ...@@ -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->slave_running == 0);
DBUG_ASSERT(rli->mi->slave_running == 0); DBUG_ASSERT(rli->mi->slave_running == 0);
} }
rli->slave_skip_counter=0;
mysql_mutex_lock(&rli->data_lock); mysql_mutex_lock(&rli->data_lock);
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment