From 45f698c5516eb6d188077e876af82086e8cafba7 Mon Sep 17 00:00:00 2001 From: unknown <stewart@mysql.com[stewart]> Date: Thu, 22 Mar 2007 22:33:31 +1100 Subject: [PATCH] [PATCH] WL#3704 mgmapi timeouts: Rename inputstream timeout Index: ndb-work/storage/ndb/include/util/InputStream.hpp =================================================================== storage/ndb/include/util/InputStream.hpp: WL#3704 mgmapi timeouts: Rename inputstream timeout storage/ndb/src/common/util/InputStream.cpp: WL#3704 mgmapi timeouts: Rename inputstream timeout --- storage/ndb/include/util/InputStream.hpp | 4 ++-- storage/ndb/src/common/util/InputStream.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/storage/ndb/include/util/InputStream.hpp b/storage/ndb/include/util/InputStream.hpp index 031260dac3b..928b8ff9aba 100644 --- a/storage/ndb/include/util/InputStream.hpp +++ b/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); }; diff --git a/storage/ndb/src/common/util/InputStream.cpp b/storage/ndb/src/common/util/InputStream.cpp index 74c31cd7583..016985328a1 100644 --- a/storage/ndb/src/common/util/InputStream.cpp +++ b/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) { -- 2.30.9