From: He Zhenxing
Date: March 10 2010 10:33am
Subject: bzr push into mysql-5.1-rep-semisync branch (zhenxing.he:3129 to 3130)
 Bug#49557
List-Archive: http://lists.mysql.com/commits/102854
X-Bug: 49557
Message-Id: <201003101033.o2AAXmJc021130@hezx-dev.localdomain>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1945846922302338655=="

--===============1945846922302338655==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

 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)
       {


--===============1945846922302338655==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/zhenxing.he@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: zhenxing.he@stripped
# target_branch: file:///media/sdb2/hezx/work/mysql/bzrwork/b49557\
#   /5.1-rep-semisync/
# testament_sha1: 09ba2c678ee77a00de803f301de241ce26b6682a
# timestamp: 2010-03-10 18:33:48 +0800
# base_revision_id: zhenxing.he@stripped\
#   8bdga3bkcvg823zj
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWapRcTkAAYrfgFQQWXv//1Jn
xBC////wUAOZ4AtgA1gkkpMNGgAjGgmAEY0BMATaHNMTARpgRhGAAAAJhGAlNQmlHoxRp6jyTaT1
AANAAyHqD1BzTEwEaYEYRgAAACYRgJJAhoCMhoCNGkynpGZTR6QY1HqepTIZK85m0+cFuV3Ss8TU
K2qD4AZ5XQthCgaQ8Y5dHdWKpCWn0L4az+FyfYii+/g9cWw7CfD42TUpXCi+ZHuhreXPHh157KoU
fFpc0Oz0PBYfjqVD3D6VqtTwTwstFd93euF78ltSLkjfeeSMo575yEzNk3GxIZCYThDCbSvwdTGM
F0UAeS4HP1E9SsJ2OXztF5V2iKbROF2ST952brX4/sepk6lTJ3cMU1iqOOla1lllqiJWC9k+8WsK
CIQCxZlSoYL4RNjwvKSBFwTFlUnCusWJXrLB5YEwkc6tVCjaQTiwmR1wG88z/d2B+npxWQW0mykM
Hl+OCgGAPwcExm1KRpKz/u0VENpL9cCpWzLSkrdxH1T0LuDcUPuVlESJUHA4ki8sUqcXpPvJjGRI
eYCdIwvVqfUXhGS/H5FHmYkNmRZxbpKcbpjbcm5UXexzXPi4i9z2Gxpkap3Xxbz3O5v8OqPFOYz5
OTBVX7c+KMMmmycFcxBaJZFBpCwu7y05B08tBhDCdYofQXh3ngfANR4GQ8PiSPEzEwWdNfcFWLDT
I/KA8gDEIearPfxKM/l9lm8pSOl/1CgTlhQdQxNPTPKhQTgp0lft9D0W43lfTkbzrSNHTm1ZEI9D
lM59sEN3pkTVAKx71wudRkGZbSoUgST8LvPMd3jjrYy3jFq+vHitOxwdnU8OxgW0MwuFaKFh/kjv
0mYN0SLffBI0LbJbi23yFE0KwquFrCK1fALfsC9tr4zAqA5I2NXDt4FzAy0CyHhpC8VCiE99obq5
+F7CGK1sVRP0xcc0Y1S3mmUMEhksD5/wwUyCPQcOBkh/ZnoJlwSYBkwKGxacgUQM9YQRLgDLucve
+s37NRt27V1xKQrxooGqFnoo2WicG7ZAWc+Oixk+qipYuvCcSLDNZGQaDhKkyGihTqqVGMiZQHa7
R6BpSdYUtMH8kNND7pcuMDbfyKeVQ/xTlozJ4UGMCQTB7EGU8cYxa70pIixufnqYp7K0FDS4VYCo
sHaEUVWWC1iuJ5VpzM1FEBA8ZP+9dV8cmk7wfg9i7kinChIVSi4nIA==


--===============1945846922302338655==--