MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Stewart Smith Date:June 13 2007 12:49pm
Subject:bk commit into 5.1 tree (stewart:1.2145) BUG#29063
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 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-06-13 22:49:20+10:00, stewart@stripped +1 -0
  [PATCH] BUG#29063 mgmapi: connect timeout set incorrectly
  
  correctly divide timeout by 1000 to convert to seconds for SocketClient
  
  Index: mysql-5.1-wl2325-5.0-drop6/storage/ndb/src/mgmapi/mgmapi.cpp
  ===================================================================

  storage/ndb/src/mgmapi/mgmapi.cpp@stripped, 2007-06-13 17:01:39+10:00, stewart@stripped +1 -1
    BUG#29063 mgmapi: connect timeout set incorrectly

# 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.1/mysql-5.1-wl2325-5.0-drop6

--- 1.63/storage/ndb/src/mgmapi/mgmapi.cpp	2007-03-21 21:46:13 +11:00
+++ 1.64/storage/ndb/src/mgmapi/mgmapi.cpp	2007-06-13 17:01:39 +10:00
@@ -479,7 +479,7 @@
       if (cfg.ids[i].type != MgmId_TCP)
 	continue;
       SocketClient s(cfg.ids[i].name.c_str(), cfg.ids[i].port);
-      s.set_connect_timeout(handle->timeout);
+      s.set_connect_timeout((handle->timeout+999)/1000);
       sockfd = s.connect();
       if (sockfd != NDB_INVALID_SOCKET)
 	break;
Thread
bk commit into 5.1 tree (stewart:1.2145) BUG#29063Stewart Smith13 Jun