diff options
Diffstat (limited to 'plugin/semisync/semisync_master.cc')
| -rw-r--r-- | plugin/semisync/semisync_master.cc | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/plugin/semisync/semisync_master.cc b/plugin/semisync/semisync_master.cc index d1b982468d2..23e35c59281 100644 --- a/plugin/semisync/semisync_master.cc +++ b/plugin/semisync/semisync_master.cc @@ -676,15 +676,11 @@ int ReplSemiSyncMaster::commitTrx(const char* trx_wait_binlog_name, } /* Calcuate the waiting period. */ - unsigned long long diff_nsecs = - start_ts.tv_nsec + (unsigned long long)wait_timeout_ * TIME_MILLION; - abstime.tv_sec = start_ts.tv_sec; - while (diff_nsecs >= TIME_BILLION) - { - abstime.tv_sec++; - diff_nsecs -= TIME_BILLION; - } - abstime.tv_nsec = (long)diff_nsecs; + long diff_secs = (long) (wait_timeout_ / TIME_THOUSAND); + long diff_nsecs = (long) ((wait_timeout_ % TIME_THOUSAND) * TIME_MILLION); + long nsecs = start_ts.tv_nsec + diff_nsecs; + abstime.tv_sec = start_ts.tv_sec + diff_secs + nsecs/TIME_BILLION; + abstime.tv_nsec = nsecs % TIME_BILLION; /* In semi-synchronous replication, we wait until the binlog-dump * thread has received the reply on the relevant binlog segment from the |