diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-10-01 13:05:41 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-10-01 13:05:41 +0200 |
| commit | adf6e145f77d2f7b049b977ee55ed12d05b96eac (patch) | |
| tree | 06cbe0ef9c620d64290c69ee84fa18a3909de95b | |
| parent | 36c738e4bc6258902eacae4b85fab2e58a74d882 (diff) | |
| download | mariadb-git-adf6e145f77d2f7b049b977ee55ed12d05b96eac.tar.gz | |
win fixes in semisync plugin
| -rw-r--r-- | plugin/semisync/semisync_master.cc | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/plugin/semisync/semisync_master.cc b/plugin/semisync/semisync_master.cc index cc770ff39a1..4778b132431 100644 --- a/plugin/semisync/semisync_master.cc +++ b/plugin/semisync/semisync_master.cc @@ -48,11 +48,7 @@ static int getWaitTime(const struct timespec& start_ts); static unsigned long long timespec_to_usec(const struct timespec *ts) { -#ifndef __WIN__ return (unsigned long long) ts->tv_sec * TIME_MILLION + ts->tv_nsec / TIME_THOUSAND; -#else - return ts->tv.i64 / 10; -#endif /* __WIN__ */ } /******************************************************************************* @@ -681,10 +677,6 @@ int ReplSemiSyncMaster::commitTrx(const char* trx_wait_binlog_name, } /* Calcuate the waiting period. */ -#ifdef __WIN__ - abstime.tv.i64 = start_ts.tv.i64 + (__int64)wait_timeout_ * TIME_THOUSAND * 10; - abstime.max_timeout_msec= (long)wait_timeout_; -#else unsigned long long diff_nsecs = start_ts.tv_nsec + (unsigned long long)wait_timeout_ * TIME_MILLION; abstime.tv_sec = start_ts.tv_sec; @@ -694,7 +686,6 @@ int ReplSemiSyncMaster::commitTrx(const char* trx_wait_binlog_name, diff_nsecs -= TIME_BILLION; } abstime.tv_nsec = diff_nsecs; -#endif /* __WIN__ */ /* In semi-synchronous replication, we wait until the binlog-dump * thread has received the reply on the relevant binlog segment from the |