Commit 8c806e5c authored by unknown's avatar unknown
Browse files

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

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


storage/ndb/src/common/util/socket_io.cpp:
  Auto merged
storage/ndb/src/common/util/InputStream.cpp:
  merge
parents 32034246 01797892

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

+5 −0
Original line number Diff line number Diff line
@@ -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;

      }