bk commit into 5.0 tree (stewart:1.2406)

[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-02-14 15:22:03+11:00, stewart@willster.(none) +2 -0
  WL#3704 mgmapi timeouts (and cleanups)
  
  indicate units in SocketOutputStream timeout
  
  rename timeout in SocketOutputStream to reflect units (ms)
  
  In 5.0 as well as is safe cleanup patch that will help with merging.

  ndb/include/util/OutputStream.hpp@stripped, 2007-02-14 15:22:00+11:00, stewart@willster.(none) +3 -3
    rename timeout in SocketOutputStream to reflect units (ms)

  ndb/src/common/util/OutputStream.cpp@stripped, 2007-02-14 15:22:00+11:00, stewart@willster.(none) +4 -4
    rename timeout in SocketOutputStream to reflect units (ms)

# 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/ndb-work

--- 1.5/ndb/include/util/OutputStream.hpp	2006-12-24 06:04:12 +11:00
+++ 1.6/ndb/include/util/OutputStream.hpp	2007-02-14 15:22:00 +11:00
@@ -42,10 +42,10 @@
 
 class SocketOutputStream : public OutputStream {
   NDB_SOCKET_TYPE m_socket;
-  unsigned m_timeout;
+  unsigned m_timeout_ms;
 public:
-  SocketOutputStream(NDB_SOCKET_TYPE socket, unsigned writeTimeout = 1000);
-  
+  SocketOutputStream(NDB_SOCKET_TYPE socket, unsigned write_timeout_ms = 1000);
+
   int print(const char * fmt, ...);
   int println(const char * fmt, ...);
 };

--- 1.5/ndb/src/common/util/OutputStream.cpp	2006-12-24 06:04:14 +11:00
+++ 1.6/ndb/src/common/util/OutputStream.cpp	2007-02-14 15:22:00 +11:00
@@ -42,16 +42,16 @@
 }
 
 SocketOutputStream::SocketOutputStream(NDB_SOCKET_TYPE socket,
-				       unsigned timeout){
+				       unsigned write_timeout_ms){
   m_socket = socket;
-  m_timeout = timeout;
+  m_timeout_ms = write_timeout_ms;
 }
 
 int
 SocketOutputStream::print(const char * fmt, ...){
   va_list ap;
   va_start(ap, fmt);
-  const int ret = vprint_socket(m_socket, m_timeout, fmt, ap);
+  const int ret = vprint_socket(m_socket, m_timeout_ms, fmt, ap);
   va_end(ap);
   return ret;
 }
@@ -59,7 +59,7 @@
 SocketOutputStream::println(const char * fmt, ...){
   va_list ap;
   va_start(ap, fmt);
-  const int ret = vprintln_socket(m_socket, m_timeout, fmt, ap);
+  const int ret = vprintln_socket(m_socket, m_timeout_ms, fmt, ap);
   va_end(ap);
   return ret;
 }