Merge perch.ndb.mysql.com:/home/jonas/src/50-work

into perch.ndb.mysql.com:/home/jonas/src/51-work

Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into perch.ndb.mysql.com:/home/jonas/src/51-work
1a1b112a · jonas@perch.ndb.mysql.com · 4bf35faa · ac79cbb1 · 1a1b112a
Commit 1a1b112a authored Nov 21, 2006 by jonas@perch.ndb.mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

storage/ndb/src/common/util/socket_io.cpp storage/ndb/src/common/util/socket_io.cpp +5 -0

No files found.
--- a/storage/ndb/src/common/util/socket_io.cpp
+++ b/storage/ndb/src/common/util/socket_io.cpp
@@ -103,6 +103,11 @@ readln_socket(NDB_SOCKET_TYPE socket, int timeout_millis,
 	  ptr += t;
 	  len -= t;
 	}
+	if (i > 0 && buf[i-1] == '\r')
+	{
+	  buf[i-1] = '\n';
+	  ptr--;
+	}
 	ptr[0]= 0;
 	return ptr - buf;
      }