[PATCH] WL#3704 mgmapi timeouts: Add bool timeout flag to Streams

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


storage/ndb/include/util/InputStream.hpp:
  WL#3704 mgmapi timeouts: Add bool timeout flag to Streams
storage/ndb/include/util/OutputStream.hpp:
  WL#3704 mgmapi timeouts: Add bool timeout flag to Streams
storage/ndb/src/common/util/InputStream.cpp:
  WL#3704 mgmapi timeouts: Add bool timeout flag to Streams
storage/ndb/src/common/util/OutputStream.cpp:
  WL#3704 mgmapi timeouts: Add bool timeout flag to Streams
storage/ndb/src/mgmsrv/Services.cpp:
  WL#3704 mgmapi timeouts: Add bool timeout flag to Streams
storage/ndb/test/ndbapi/testMgm.cpp:
  WL#3704 mgmapi timeouts: Add bool timeout flag to Streams

1 files changed, 6 insertions, 0 deletions

diff --git a/storage/ndb/src/common/util/InputStream.cpp b/storage/ndb/src/common/util/InputStream.cpp
index 016985328a1..17703eb7e52 100644
--- a/storage/ndb/src/common/util/InputStream.cpp
+++ b/storage/ndb/src/common/util/InputStream.cpp
@@ -38,10 +38,13 @@ SocketInputStream::SocketInputStream(NDB_SOCKET_TYPE socket,
   : m_socket(socket) {
   m_startover= true;
   m_timeout_ms = read_timeout_ms;
+  m_timedout= false;
 }
 
 char*
 SocketInputStream::gets(char * buf, int bufLen) {
+  if(timedout())
+    return 0;
   assert(bufLen >= 2);
   int offset= 0;
   if(m_startover)
@@ -63,7 +66,10 @@ SocketInputStream::gets(char * buf, int bufLen) {
   m_startover= true;
 
   if(res == -1)
+  {
+    m_timedout= true;
     return 0;
+  }
 
   return buf;
 }