Commit 6fd6b38c authored by Luis Soares's avatar Luis Soares

BUG#17460821

Automerged from mysql-5.5 bug branch into latest mysql-5.5.
parents 94630ddd 863d67e3
......@@ -482,6 +482,9 @@ void ReplSemiSyncMaster::remove_slave()
lock();
rpl_semi_sync_master_clients--;
/* Only switch off if semi-sync is enabled and is on */
if (getMasterEnabled() && is_on())
{
/* If user has chosen not to wait if no semi-sync slave available
and the last semi-sync slave exits, turn off semi-sync on master
immediately.
......@@ -489,6 +492,7 @@ void ReplSemiSyncMaster::remove_slave()
if (!rpl_semi_sync_master_wait_no_slave &&
rpl_semi_sync_master_clients == 0)
switch_off();
}
unlock();
}
......
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