bzr push into mysql-5.1-rep-semisync branch (zhenxing.he:3129 to 3130) Bug#49557

[He Zhenxing]

 3130 He Zhenxing	2010-03-10
      Post fix for Bug#49557

    M  plugin/semisync/semisync_master.cc
 3129 He Zhenxing	2010-02-23
      Bug#49557 "semisync" plugin test fails on Windows
      
      The problem was because the gettimeofday function was incorrect
      implemented for Windows, and so the semisync master did not wait
      for slave reply properly on Windows.
      
      Fixed by removing the gettimeofday function for Windows, and using
      set_timespec function to get current time for all platforms.
     @ plugin/semisync/semisync_master.cc
        removing the gettimeofday function for Windows, using set_timespec
        function to get current time for all platforms.

    M  plugin/semisync/semisync_master.cc
=== modified file 'plugin/semisync/semisync_master.cc'
--- a/plugin/semisync/semisync_master.cc	2010-02-23 09:26:56 +0000
+++ b/plugin/semisync/semisync_master.cc	2010-03-10 10:32:21 +0000
@@ -679,7 +679,8 @@ int ReplSemiSyncMaster::commitTrx(const 
       abstime.tv.i64 = start_ts.tv.i64 + (__int64)wait_timeout_ * TIME_THOUSAND * 10;
       abstime.max_timeout_msec= (long)wait_timeout_;
 #else
-      unsigned long diff_nsecs = start_ts.tv_nsec + wait_timeout_ * TIME_MILLION;
+      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)
       {


Attachment: [text/bzr-bundle] bzr/[e-mail]