diff options
author | Luis Soares <luis.soares@oracle.com> | 2013-10-08 18:37:43 +0100 |
---|---|---|
committer | Luis Soares <luis.soares@oracle.com> | 2013-10-08 18:37:43 +0100 |
commit | d97df1e8ff85b66640ed5ee90d4f08d249d73fce (patch) | |
tree | 78c6bf2167392a3af09204e8a97a2a1ae521cf7f /plugin/semisync | |
parent | 436fd04b02d9323b414d367c7fc070e0a9122eea (diff) | |
download | mariadb-git-d97df1e8ff85b66640ed5ee90d4f08d249d73fce.tar.gz |
BUG#17508351: REDUNDANT CODE IN REPLSEMISYNCMASTER::UPDATESYNCHEADER
ReplSemiSyncMaster::updateSyncHeader contains redundant assignments
to the local variable sync.
This patch removes them.
Diffstat (limited to 'plugin/semisync')
-rw-r--r-- | plugin/semisync/semisync_master.cc | 10 |
1 files 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_) { |