bk commit into 5.1 tree (stewart:1.2461)

[Stewart Smith]

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-03-08 11:19:44+01:00, stewart@stripped +1 -0
  [PATCH] use NdbMgmHandle write_timeout
  
  Start using the write_timeout we already have in NdbMgmHandle
  
  Index: telco-wl3704/storage/ndb/src/mgmapi/mgmapi.cpp
  ===================================================================

  storage/ndb/src/mgmapi/mgmapi.cpp@stripped, 2007-03-08 10:04:14+01:00, stewart@stripped +5 -5
    use NdbMgmHandle write_timeout

# 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/telco-wl3704

--- 1.87/storage/ndb/src/mgmapi/mgmapi.cpp	2007-03-06 18:36:42 +01:00
+++ 1.88/storage/ndb/src/mgmapi/mgmapi.cpp	2007-03-08 10:04:14 +01:00
@@ -323,7 +323,7 @@
   DBUG_ENTER("ndb_mgm_call");
   DBUG_PRINT("enter",("handle->socket: %d, cmd: %s",
 		      handle->socket, cmd));
-  SocketOutputStream out(handle->socket);
+  SocketOutputStream out(handle->socket, handle->write_timeout);
   SocketInputStream in(handle->socket, handle->read_timeout);
 
   out.println(cmd);
@@ -773,7 +773,7 @@
   CHECK_HANDLE(handle, NULL);
   CHECK_CONNECTED(handle, NULL);
 
-  SocketOutputStream out(handle->socket);
+  SocketOutputStream out(handle->socket, handle->write_timeout);
   SocketInputStream in(handle->socket, handle->read_timeout);
 
   out.println("get status");
@@ -2407,7 +2407,7 @@
 ndb_mgm_check_connection(NdbMgmHandle handle){
   CHECK_HANDLE(handle, 0);
   CHECK_CONNECTED(handle, 0);
-  SocketOutputStream out(handle->socket);
+  SocketOutputStream out(handle->socket, handle->write_timeout);
   SocketInputStream in(handle->socket, handle->read_timeout);
   char buf[32];
   if (out.println("check connection"))
@@ -2537,7 +2537,7 @@
   (*handle)->connected= 0;   // we pretend we're disconnected
   s= (*handle)->socket;
 
-  SocketOutputStream s_output(s);
+  SocketOutputStream s_output(s, (*handle)->write_timeout);
   s_output.println("transporter connect");
   s_output.println("");
 
@@ -2613,7 +2613,7 @@
   CHECK_CONNECTED(handle, 0);
   DBUG_ENTER("ndb_mgm_end_session");
 
-  SocketOutputStream s_output(handle->socket);
+  SocketOutputStream s_output(handle->socket, handle->write_timeout);
   s_output.println("end session");
   s_output.println("");