bk commit into 5.1 tree (tomas:1.2541) BUG#34757

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas.  When tomas does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-02-22 13:29:11+01:00, tomas@stripped +1 -0
  Bug #34757: ndb-wait-connected only waits for partial connect

  sql/ha_ndbcluster_connection.cc@stripped, 2008-02-22 13:29:07+01:00,
tomas@stripped +6 -5
    Bug #34757: ndb-wait-connected only waits for partial connect

diff -Nrup a/sql/ha_ndbcluster_connection.cc b/sql/ha_ndbcluster_connection.cc
--- a/sql/ha_ndbcluster_connection.cc	2007-11-20 15:22:02 +01:00
+++ b/sql/ha_ndbcluster_connection.cc	2008-02-22 13:29:07 +01:00
@@ -149,11 +149,12 @@ int ndbcluster_connect(int (*connect_cal
                   g_ndb_cluster_connection_pool[i]->get_connected_port()));
 
       struct timeval now_time;
-      gettimeofday(&now_time, 0);
-      ulong wait_until_ready_time = (end_time.tv_sec > now_time.tv_sec) ?
-        end_time.tv_sec - now_time.tv_sec : 1;
-      res= g_ndb_cluster_connection_pool[i]->
-        wait_until_ready(wait_until_ready_time,3);
+      do
+      {
+        res= g_ndb_cluster_connection_pool[i]->wait_until_ready(1, 1);
+        gettimeofday(&now_time, 0);
+      } while (res != 0 && end_time.tv_sec > now_time.tv_sec);
+
       if (res == 0)
       {
         sql_print_information("NDB[%u]: all storage nodes connected", i);