bk commit into 5.0 tree (stewart:1.2368)

[Stewart Smith]

Below is the list of changes that have just been committed into a local
5.0 repository of stewart. When stewart 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, 2007-01-23 17:19:27+11:00, stewart@willster.(none) +1 -0
  round up Transporter connect timeout

  ndb/src/common/transporter/Transporter.cpp@stripped, 2007-01-23 17:19:23+11:00,
stewart@willster.(none) +1 -1
    change so timeout is rounded up to nearest second

# 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:	stewart
# Host:	willster.(none)
# Root:	/home/stewart/Documents/MySQL/5.0/bug25487

--- 1.24/ndb/src/common/transporter/Transporter.cpp	2007-01-23 17:06:32 +11:00
+++ 1.25/ndb/src/common/transporter/Transporter.cpp	2007-01-23 17:19:23 +11:00
@@ -84,7 +84,7 @@
 				      new SocketAuthSimple("ndbd",
 							   "ndbd passwd"));
 
-    m_socket_client->set_connect_timeout(m_timeOutMillis/1000);
+    m_socket_client->set_connect_timeout((m_timeOutMillis+999)/1000);
   }
   DBUG_VOID_RETURN;
 }