Commit e7ab0639 authored by stewart@mysql.com's avatar stewart@mysql.com

Merge mysql.com:/home/stewart/Documents/MySQL/5.0/bug13987

into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
parents b9cd71e6 a029eee7
...@@ -53,6 +53,10 @@ readln_socket(NDB_SOCKET_TYPE socket, int timeout_millis, ...@@ -53,6 +53,10 @@ readln_socket(NDB_SOCKET_TYPE socket, int timeout_millis,
if(buflen <= 1) if(buflen <= 1)
return 0; return 0;
int sock_flags= fcntl(socket, F_GETFL);
if(fcntl(socket, F_SETFL, sock_flags | O_NONBLOCK) == -1)
return -1;
fd_set readset; fd_set readset;
FD_ZERO(&readset); FD_ZERO(&readset);
FD_SET(socket, &readset); FD_SET(socket, &readset);
...@@ -62,44 +66,48 @@ readln_socket(NDB_SOCKET_TYPE socket, int timeout_millis, ...@@ -62,44 +66,48 @@ readln_socket(NDB_SOCKET_TYPE socket, int timeout_millis,
timeout.tv_usec = (timeout_millis % 1000) * 1000; timeout.tv_usec = (timeout_millis % 1000) * 1000;
const int selectRes = select(socket + 1, &readset, 0, 0, &timeout); const int selectRes = select(socket + 1, &readset, 0, 0, &timeout);
if(selectRes == 0) if(selectRes == 0){
return 0; return 0;
}
if(selectRes == -1){ if(selectRes == -1){
fcntl(socket, F_SETFL, sock_flags);
return -1; return -1;
} }
int pos = 0; buf[pos] = 0; buf[0] = 0;
while(true){ const int t = recv(socket, buf, buflen, MSG_PEEK);
const int t = recv(socket, &buf[pos], 1, 0);
if(t != 1){ if(t < 1)
{
fcntl(socket, F_SETFL, sock_flags);
return -1; return -1;
} }
if(buf[pos] == '\n'){
buf[pos] = 0;
if(pos > 0 && buf[pos-1] == '\r'){ for(int i=0; i< t;i++)
pos--; {
buf[pos] = 0; if(buf[i] == '\n'){
recv(socket, buf, i+1, 0);
buf[i] = 0;
if(i > 0 && buf[i-1] == '\r'){
i--;
buf[i] = 0;
} }
return pos; fcntl(socket, F_SETFL, sock_flags);
return t;
} }
pos++;
if(pos == (buflen - 1)){
buf[pos] = 0;
return buflen;
} }
FD_ZERO(&readset); if(t == (buflen - 1)){
FD_SET(socket, &readset); recv(socket, buf, t, 0);
timeout.tv_sec = (timeout_millis / 1000); buf[t] = 0;
timeout.tv_usec = (timeout_millis % 1000) * 1000; fcntl(socket, F_SETFL, sock_flags);
const int selectRes = select(socket + 1, &readset, 0, 0, &timeout); return buflen;
if(selectRes != 1){
return -1;
}
} }
return 0;
} }
extern "C" extern "C"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment