bzr commit into mysql-5.1-telco-7.0 branch (jonas:2954)

[Jonas Oreland]

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

 2954 Jonas Oreland	2009-08-12 [merge]
      merge 63 to 70

    modified:
      storage/ndb/src/common/portlib/NdbCondition.c
      storage/ndb/src/common/portlib/NdbTick.c
      storage/ndb/src/common/transporter/TransporterRegistry.cpp
=== modified file 'storage/ndb/src/common/portlib/NdbCondition.c'
--- a/storage/ndb/src/common/portlib/NdbCondition.c	2009-08-03 15:38:54 +0000
+++ b/storage/ndb/src/common/portlib/NdbCondition.c	2009-08-12 18:10:54 +0000
@@ -34,12 +34,8 @@ struct NdbCondition
 
 static int init = 0;
 #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-08-03 15:38:54 +0000
+++ b/storage/ndb/src/common/portlib/NdbTick.c	2009-08-12 18:10:54 +0000
@@ -77,7 +77,7 @@ NdbTick_CurrentMicrosecond(NDB_TICKS * s
   return res;
 }
 #else
-void NdbTick_Init()
+void NdbTick_Init(int need_monotonic)
 {
 }
 

=== modified file 'storage/ndb/src/common/transporter/TransporterRegistry.cpp'
--- a/storage/ndb/src/common/transporter/TransporterRegistry.cpp	2009-08-03 15:38:54 +0000
+++ b/storage/ndb/src/common/transporter/TransporterRegistry.cpp	2009-08-12 18:10:54 +0000
@@ -1518,12 +1518,18 @@ TransporterRegistry::start_clients_threa
             // ndbapi clients to connect until it's started
             // The transporter will detect this case and
             // limit rapid reconnect attempts
+#if 0
+            // disable this "fix" as it cause some 50 tests to fail
+	    // in autotest...
+	    // suggest that we send back "blocked" instead
+	    // and ping-pong this back-and-forth until connection
+	    // gets un-blocked
             if (t->is_connect_blocked())
               continue; // Too many refused connections
 
+#endif
             DBUG_PRINT("info", ("connecting to node %d using port %d",
                                 nodeId, t->get_s_port()));
-
             connected= t->connect_client();
           }
 


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