summaryrefslogtreecommitdiff
path: root/storage/ndb/src/common/util/InputStream.cpp
diff options
context:
space:
mode:
authorunknown <stewart@mysql.com[stewart]>2007-03-22 22:33:31 +1100
committerunknown <stewart@mysql.com[stewart]>2007-03-22 22:33:31 +1100
commit45f698c5516eb6d188077e876af82086e8cafba7 (patch)
treed2f76d6c8995c02b6b464d984871f12f9dd3a771 /storage/ndb/src/common/util/InputStream.cpp
parentef41a27c9b35466dc78c89bcb756127f7e8c0c2d (diff)
downloadmariadb-git-45f698c5516eb6d188077e876af82086e8cafba7.tar.gz
[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
Diffstat (limited to 'storage/ndb/src/common/util/InputStream.cpp')
-rw-r--r--storage/ndb/src/common/util/InputStream.cpp6
1 files changed, 3 insertions, 3 deletions
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)
{