From d97df1e8ff85b66640ed5ee90d4f08d249d73fce Mon Sep 17 00:00:00 2001 From: Luis Soares Date: Tue, 8 Oct 2013 18:37:43 +0100 Subject: [PATCH] BUG#17508351: REDUNDANT CODE IN REPLSEMISYNCMASTER::UPDATESYNCHEADER ReplSemiSyncMaster::updateSyncHeader contains redundant assignments to the local variable sync. This patch removes them. --- plugin/semisync/semisync_master.cc | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/plugin/semisync/semisync_master.cc b/plugin/semisync/semisync_master.cc index 87adbdcae79..6b8bb915445 100644 --- a/plugin/semisync/semisync_master.cc +++ b/plugin/semisync/semisync_master.cc @@ -894,10 +894,7 @@ int ReplSemiSyncMaster::updateSyncHeader(unsigned char *packet, * target, do not request replies from the slave. */ if (!getMasterEnabled() || !is_semi_sync_slave()) - { - sync = false; return 0; - } function_enter(kWho); @@ -905,15 +902,12 @@ int ReplSemiSyncMaster::updateSyncHeader(unsigned char *packet, /* This is the real check inside the mutex. */ if (!getMasterEnabled()) - { - sync = false; - goto l_end; - } + goto l_end; // sync= false at this point in time if (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_) {