From b2e3fb8a6f0d627591866ff2376ef8a3b61ce739 Mon Sep 17 00:00:00 2001
From: He Zhenxing <zhenxing.he@sun.com>
Date: Wed, 10 Mar 2010 18:32:21 +0800
Subject: [PATCH] Post fix for Bug#49557

---
 plugin/semisync/semisync_master.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugin/semisync/semisync_master.cc b/plugin/semisync/semisync_master.cc
index 4614cafec24..5b06180662e 100644
--- a/plugin/semisync/semisync_master.cc
+++ b/plugin/semisync/semisync_master.cc
@@ -679,7 +679,8 @@ int ReplSemiSyncMaster::commitTrx(const char* trx_wait_binlog_name,
       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)
       {