1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUG#17460821

Browse Source 
Automerged from mysql-5.5 bug branch into latest mysql-5.5.
This commit is contained in:
Luis Soares 2013-10-18 10:50:49 +01:00
commit 6f43d3cab7
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugin/semisync/semisync_master.cc
View File

@ -482,13 +482,17 @@ void ReplSemiSyncMaster::remove_slave()
lock(); lock();
rpl_semi_sync_master_clients--; rpl_semi_sync_master_clients--;
/* If user has chosen not to wait if no semi-sync slave available /* Only switch off if semi-sync is enabled and is on */
and the last semi-sync slave exits, turn off semi-sync on master if (getMasterEnabled() && is_on())
immediately. {
*/ /* If user has chosen not to wait if no semi-sync slave available
if (!rpl_semi_sync_master_wait_no_slave && and the last semi-sync slave exits, turn off semi-sync on master
rpl_semi_sync_master_clients == 0) immediately.
switch_off(); */
if (!rpl_semi_sync_master_wait_no_slave &&
rpl_semi_sync_master_clients == 0)
switch_off();
}
unlock(); unlock();
} }