From: jack andrews
Date: April 15 2009 12:39pm
Subject: bzr commit into mysql-5.1-telco-7.0 branch (jack:2868) Bug#44276
List-Archive: http://lists.mysql.com/commits/72152
X-Bug: 44276
Message-Id: <0KI5000OJ76KX230@mail-apac.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_KLNcfACsREZlPteg0f8DiA)"

--Boundary_(ID_KLNcfACsREZlPteg0f8DiA)
MIME-version: 1.0
Content-type: text/plain; charset=us-ascii
Content-transfer-encoding: 7BIT
Content-disposition: inline

#At file:///C:/w/repo/70/ based on revid:jack@stripped

 2868 jack andrews	2009-04-15
      bug#44276  NdbTick assert() in Ndbif.cpp

    modified:
      storage/ndb/src/common/portlib/win32/NdbTick.c
=== modified file 'storage/ndb/src/common/portlib/win32/NdbTick.c'
--- a/storage/ndb/src/common/portlib/win32/NdbTick.c	2008-10-02 09:41:59 +0000
+++ b/storage/ndb/src/common/portlib/win32/NdbTick.c	2009-04-15 12:39:16 +0000
@@ -15,6 +15,7 @@
 
 #include <ndb_global.h>
 #include "NdbTick.h"
+#include <my_sys.h>
 
 void NdbTick_Init()
 {
@@ -31,11 +32,14 @@ NDB_TICKS NdbTick_CurrentMillisecond(voi
 int
 NdbTick_CurrentMicrosecond(NDB_TICKS * secs, Uint32 * micros)
 {
-  LARGE_INTEGER liCount, liFreq;
-  QueryPerformanceCounter(&liCount);
-  QueryPerformanceFrequency(&liFreq);
-  *secs = liCount.QuadPart / liFreq.QuadPart;
-  liCount.QuadPart -= *secs * liFreq.QuadPart;
-  *micros = (Uint32)((liCount.QuadPart*1000000) / liFreq.QuadPart);
+  ulonglong t=my_micro_time(),
+            ullsecs,
+            ullmicros;
+
+  ullsecs=t/(1000*1000);
+  ullmicros=t-ullsecs;
+  assert(ullmicros<MAX_UINT32);
+  *secs=ullsecs;
+  *micros=(Uint32)ullmicros;
   return 0;
 }


--Boundary_(ID_KLNcfACsREZlPteg0f8DiA)
MIME-version: 1.0
Content-type: text/bzr-bundle;
 name="bzr/jack@stripped";
 charset=us-ascii
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/jack@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jack@stripped
# target_branch: file:///C:/w/repo/70/
# testament_sha1: 11617d1c888cdf96c94b583a0002ac91c8fd4772
# timestamp: 2009-04-15 22:39:40 +1000
# source_branch: bzr+ssh://jandrews@stripped/bzrroot\
#   /server/mysql-5.1-telco-7.0/
# base_revision_id: jack@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWf7Nf38AAaBfgEBQWXf//3Ij
BkC////wUAP2zxw7zvVVXbO7vCSSZTIp+jJTxlPR6KeinhT9KPSaD1NNGjNQSkIJmjIU8aKeSaDI
AyAAACUI0QKeTU00D1NNPUAAaA0AASmpNE00NBPTQNEYmCDE0MAgwkkhojymJlR7RqPJJ7VG1NhT
anlAGgHj4zG+GYxXn5G7K0kB2dMyKFIxWNylsQMnOY3OVVQkQioe9cTMduwqqmryT4jNdZS3Fsrs
T8bKtQzfsY2nWtxD0cbGPJgyLNRs12TVe2J93k0fmJ1emRIpthTGvnK99vIvnZoF+yM2oyiKyzCz
UJ+WQ88e5US1q9mQS0y6SXwu5o0weqWTM5MyI5ErDApGKxysQYYEjhkE2oeT24mVRKaBce7vqg8I
GfKpAzVyR6aJR0ChBBpnCYkbn4xag9KRk+eIMbULias6QxTcVBCBYTmgN4ypNM37TeNXN6ap+EoH
pvsJbokTnpHa6x1pMLRCuJJJ4930Q+TVKYkDImPt+V41ZGgeNBeMdaUjIIXLfOsTC6MeOnLKbk1J
MwwcbBOITbOlDzQnbccbyKwww01liF5YZRpbVUkJRlCiQhgVYjhzYxp1btmWh0CdjiORbFIFNY4x
AnAuutFJJGBCQPlb2SkM2wpqFNYRgRLEqRK4WibOmJIk2CfYe73yOI4HQUtYxyleCOK6fHOaoumc
7buvb18GtWBplATTvhKjubuATCP9/MWEbiOBExDl96ztpm109aRecp2XTmaTiZ1R0HZKmL5Dn4cU
dVV0PE1qv2zDypdpjPFKxzMDCJHRSNm90gsUbhunrLc5nTlSOoFkeRIzGBb1M3AiYqMu/c1JH7jb
NJoJif3ZDzMW3i2UejjejDf138zPOfV3tTIssritYbSu1S0APmHOUtEG1p+k1lZ4nfQQI3DXazIe
O7gTLt39zXCgoW8oTxzJSLtg8qxnxa0NonRtFGwMMcm9K2lJ/AXAUhccNxSKTlRgE6vLvT7B7835
67XzWARAlwW2iFny9WtP2OTU9DhUrEu9hFoduBSn1B3b8kFgfPzkzComDybQUo6pDPEyjAtzwL6U
+1lhUK22cv5VxlZRriC1QZE4DTX3OhdgRnpdpGc+t0AZkMni0lMHSDVIUEtDYUEopiVFxEMpkw5S
ohiEsLS+7YuW0eZgvWe6HqvtFo0DZjnLetV+xPDXTjU8Ud+qllJyhPCwTLkW3zTBIh5FicY/XNPD
boeQCZEUglaI2nDJQ8icSniAo20FtZnzLxaEO8QXQ74kuQ4ZJTkmYUS4i9cjOTzaCgtcaQYxOZaN
khHI7HP29fCeTRyktahI30rVm4dwGLguV76lZgweiojbsOsiTDGZSmrUlYlb9Yvg2DhUhE2DP8Xc
kU4UJD+zX9/A


--Boundary_(ID_KLNcfACsREZlPteg0f8DiA)--