diff options
| author | unknown <lars@mysql.com> | 2005-07-13 02:13:04 +0200 |
|---|---|---|
| committer | unknown <lars@mysql.com> | 2005-07-13 02:13:04 +0200 |
| commit | 2af33e16dcecc16060ac03da558a5330cd7161f7 (patch) | |
| tree | 288cefd45b67649d427ee7a8a02969119055a4a4 /vio/vio.c | |
| parent | fec8dd870eb128c862fb31811a28bd50e86c9df1 (diff) | |
| parent | dac7ba3d65b378262b78f64c7861fadc27cf9ffc (diff) | |
| download | mariadb-git-2af33e16dcecc16060ac03da558a5330cd7161f7.tar.gz | |
Merge mysql.com:/home/bkroot/mysql-4.1
into mysql.com:/home/bk/mysql-5.0
BitKeeper/etc/config:
Auto merged
include/my_global.h:
Auto merged
sql/des_key_file.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/net_serv.cc:
Auto merged
vio/vio.c:
Auto merged
vio/viosocket.c:
Auto merged
sql/log.cc:
Manual merge
sql/slave.cc:
Manual merge
Diffstat (limited to 'vio/vio.c')
| -rw-r--r-- | vio/vio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vio/vio.c b/vio/vio.c index 6227493b994..bcf0ac032c8 100644 --- a/vio/vio.c +++ b/vio/vio.c @@ -143,7 +143,7 @@ Vio *vio_new(my_socket sd, enum enum_vio_type type, uint flags) sprintf(vio->desc, (vio->type == VIO_TYPE_SOCKET ? "socket (%d)" : "TCP/IP (%d)"), vio->sd); -#if !defined(___WIN__) && !defined(__EMX__) && !defined(OS2) +#if !defined(__WIN__) && !defined(__EMX__) && !defined(OS2) #if !defined(NO_FCNTL_NONBLOCK) #if defined(__FreeBSD__) fcntl(sd, F_SETFL, vio->fcntl_mode); /* Yahoo! FreeBSD patch */ @@ -158,7 +158,7 @@ Vio *vio_new(my_socket sd, enum enum_vio_type type, uint flags) { /* set to blocking mode by default */ ulong arg=0, r; - r = ioctlsocket(sd,FIONBIO,(void*) &arg, sizeof(arg)); + r = ioctlsocket(sd,FIONBIO,(void*) &arg); vio->fcntl_mode &= ~O_NONBLOCK; } #endif |