Commit 54a36531 authored by Luis Soares's avatar Luis Soares

BUG#17508351

Merging mysql-5.5 bug branch into latest mysql-5.5.
parents 633cc16e d97df1e8
...@@ -894,10 +894,7 @@ int ReplSemiSyncMaster::updateSyncHeader(unsigned char *packet, ...@@ -894,10 +894,7 @@ int ReplSemiSyncMaster::updateSyncHeader(unsigned char *packet,
* target, do not request replies from the slave. * target, do not request replies from the slave.
*/ */
if (!getMasterEnabled() || !is_semi_sync_slave()) if (!getMasterEnabled() || !is_semi_sync_slave())
{
sync = false;
return 0; return 0;
}
function_enter(kWho); function_enter(kWho);
...@@ -905,15 +902,12 @@ int ReplSemiSyncMaster::updateSyncHeader(unsigned char *packet, ...@@ -905,15 +902,12 @@ int ReplSemiSyncMaster::updateSyncHeader(unsigned char *packet,
/* This is the real check inside the mutex. */ /* This is the real check inside the mutex. */
if (!getMasterEnabled()) if (!getMasterEnabled())
{ goto l_end; // sync= false at this point in time
sync = false;
goto l_end;
}
if (is_on()) if (is_on())
{ {
/* semi-sync is ON */ /* semi-sync is ON */
sync = false; /* No sync unless a transaction is involved. */ /* sync= false; No sync unless a transaction is involved. */
if (reply_file_name_inited_) if (reply_file_name_inited_)
{ {
......
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