[PATCH] WL#3704 mgmapi timeouts: Rename inputstream timeout

Index: ndb-work/storage/ndb/include/util/InputStream.hpp
===================================================================

storage/ndb/include/util/InputStream.hpp

@@ -48,10 +48,10 @@ extern FileInputStream Stdin;
 
 class SocketInputStream : public InputStream {
   NDB_SOCKET_TYPE m_socket;
-  unsigned m_timeout;
+  unsigned m_timeout_ms;
   bool m_startover;
 public:
-  SocketInputStream(NDB_SOCKET_TYPE socket, unsigned readTimeout = 1000);
+  SocketInputStream(NDB_SOCKET_TYPE socket, unsigned read_timeout_ms = 1000);
   virtual ~SocketInputStream() {}
   char* gets(char * buf, int bufLen);
 };

storage/ndb/src/common/util/InputStream.cpp

@@ -34,10 +34,10 @@ FileInputStream::gets(char * buf, int bufLen){
 }
 
 SocketInputStream::SocketInputStream(NDB_SOCKET_TYPE socket, 
-				     unsigned readTimeout) 
+				     unsigned read_timeout_ms)
   : m_socket(socket) {
   m_startover= true;
-  m_timeout = readTimeout;
+  m_timeout_ms = read_timeout_ms;
 }
 
 char*
@@ -52,7 +52,7 @@ SocketInputStream::gets(char * buf, int bufLen) {
   else
     offset= strlen(buf);
 
-  int res = readln_socket(m_socket, m_timeout, buf+offset, bufLen-offset, m_mutex);
+  int res = readln_socket(m_socket, m_timeout_ms, buf+offset, bufLen-offset, m_mutex);
 
   if(res == 0)
   {