bzr commit into mysql-5.1-telco-6.2 branch (jonas:2962) Bug#45899

[Jonas Oreland]

#At file:///home/jonas/src/telco-6.2/ based on revid:jonas@stripped

 2962 Jonas Oreland	2009-08-12
      ndb - bug#45899
        Fix bug in previous patch, causing platforms
        with CLOCK_MONOTONIC but not PTHREAD_CONDATTR_SETCLOCK
        to misbehave (e.g dl145a-c)

    modified:
      storage/ndb/src/common/portlib/NdbCondition.c
      storage/ndb/src/common/portlib/NdbTick.c
=== modified file 'storage/ndb/src/common/portlib/NdbCondition.c'
--- a/storage/ndb/src/common/portlib/NdbCondition.c	2009-07-15 18:14:13 +0000
+++ b/storage/ndb/src/common/portlib/NdbCondition.c	2009-08-12 17:25:43 +0000
@@ -30,12 +30,8 @@ struct NdbCondition
 };
 
 #ifdef HAVE_CLOCK_GETTIME
-#ifdef CLOCK_MONOTONIC
-static int clock_id = CLOCK_MONOTONIC;
-#else
 static int clock_id = CLOCK_REALTIME;
 #endif
-#endif
 
 void
 NdbCondition_Init(int need_monotonic)

=== modified file 'storage/ndb/src/common/portlib/NdbTick.c'
--- a/storage/ndb/src/common/portlib/NdbTick.c	2009-07-15 18:14:13 +0000
+++ b/storage/ndb/src/common/portlib/NdbTick.c	2009-08-12 17:25:43 +0000
@@ -76,7 +76,7 @@ NdbTick_CurrentMicrosecond(NDB_TICKS * s
   return res;
 }
 #else
-void NdbTick_Init()
+void NdbTick_Init(int need_monotonic)
 {
 }
 


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