bk commit into 5.1 tree (tomas:1.2156) 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 10:48:49+01:00, tomas@stripped +1 -0
  Bug #34757 ndb-wait-connected only waits for partial connect

  sql/ha_ndbcluster.cc@stripped, 2008-02-22 10:48:46+01:00, tomas@stripped +5 -6
    Bug #34757 ndb-wait-connected only waits for partial connect

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-wl2325-5.0

--- 1.253/sql/ha_ndbcluster.cc	2007-04-05 16:15:25 +02:00
+++ 1.254/sql/ha_ndbcluster.cc	2008-02-22 10:48:46 +01:00
@@ -5429,14 +5429,13 @@
     DBUG_PRINT("info",("NDBCLUSTER storage engine at %s on port %d",
                        g_ndb_cluster_connection->get_connected_host(),
                        g_ndb_cluster_connection->get_connected_port()));
+    struct timeval now_time;
+    do
     {
-      struct timeval now_time;
+      res= g_ndb_cluster_connection->wait_until_ready(1, 1);
       gettimeofday(&now_time, 0);
-      ulong wait_until_ready_time= end_time.tv_sec - now_time.tv_sec;
-      if (wait_until_ready_time < 1)
-        wait_until_ready_time= 1;
-      res= g_ndb_cluster_connection->wait_until_ready(wait_until_ready_time,3);
-    }
+    } while (res != 0 && end_time.tv_sec > now_time.tv_sec);
+
     if (res == 0)
     {
       sql_print_information("NDB: all storage nodes connected");