diff options
Diffstat (limited to 'mysql/vio/viosocket.c')
| -rw-r--r-- | mysql/vio/viosocket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql/vio/viosocket.c b/mysql/vio/viosocket.c index ee59292..49dc004 100644 --- a/mysql/vio/viosocket.c +++ b/mysql/vio/viosocket.c @@ -679,7 +679,7 @@ static my_bool socket_peek_read(Vio *vio, uint *bytes) { my_socket sd= mysql_socket_getfd(vio->mysql_socket); #if defined(_WIN32) - int len; + u_long len; if (ioctlsocket(sd, FIONREAD, &len)) return TRUE; *bytes= len; @@ -856,7 +856,7 @@ int vio_io_wait(Vio *vio, enum enum_vio_io_event event, int timeout) MYSQL_START_SOCKET_WAIT(locker, &state, vio->mysql_socket, PSI_SOCKET_SELECT, 0); /* The first argument is ignored on Windows. */ - ret= select((int)(fd + 1), &readfds, &writefds, &exceptfds, + ret= select((int)(fd + 1), &readfds, &writefds, &exceptfds, (timeout >= 0) ? &tm : NULL); MYSQL_END_SOCKET_WAIT(locker, 0); |