bk commit into 5.1 tree (tomas:1.2436)

[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
  1.2436 07/02/21 21:04:16 tomas@stripped +1 -0
  corrected ndb_wait_connected patch

  sql/ha_ndbcluster.cc
    1.400 07/02/21 21:04:07 tomas@stripped +4 -5
    corrected ndb_wait_connected patch

# 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.mysql.com
# Root:	/home/tomas/mysql-5.1-telco-6.1_2

--- 1.399/sql/ha_ndbcluster.cc	2007-02-21 20:55:07 +07:00
+++ 1.400/sql/ha_ndbcluster.cc	2007-02-21 21:04:07 +07:00
@@ -196,10 +196,10 @@ static int update_status_variables(Ndb_c
 {
   ndb_connected_port= c->get_connected_port();
   ndb_connected_host= c->get_connected_host();
-  if (ndb_cluster_node_id != c->node_id())
+  if (ndb_cluster_node_id != (int) c->node_id())
   {
     ndb_cluster_node_id= c->node_id();
-    sql_print_information("NDB: NodeID is %d, management server '%s:%u'",
+    sql_print_information("NDB: NodeID is %lu, management server '%s:%lu'",
                           ndb_cluster_node_id, ndb_connected_host,
                           ndb_connected_port);
   }
@@ -6753,9 +6753,8 @@ static int ndbcluster_init(void *p)
     {
       struct timeval now_time;
       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;
+      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->wait_until_ready(wait_until_ready_time,3);
     }
     if (res == 0)