Commit 1d4c0199 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/mysql-5.0-ndb


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

ndb/src/common/util/InputStream.cpp

+0 −1
Original line number Diff line number Diff line
@@ -65,6 +65,5 @@ SocketInputStream::gets(char * buf, int bufLen) { 


  if(res == -1)

    return 0;



  return buf;

}

ndb/src/common/util/socket_io.cpp

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

      }