summaryrefslogtreecommitdiff
path: root/vio/vio.c
diff options
context:
space:
mode:
authormonty@mysql.com <>2005-10-13 20:18:37 +0300
committermonty@mysql.com <>2005-10-13 20:18:37 +0300
commit6f5baa1ebab0a71e87acb9fc19614b34a22513cd (patch)
treea7f6f0a949d99ffafb00035024e83f0c62853199 /vio/vio.c
parent1436494a72e772a3a0e057078003947b5f7bec8a (diff)
parent829a4831b1054a769ed34e111ab88be0619aa06e (diff)
downloadmariadb-git-6f5baa1ebab0a71e87acb9fc19614b34a22513cd.tar.gz
Merge mysql.com:/home/my/mysql-4.1
into mysql.com:/home/my/mysql-5.0
Diffstat (limited to 'vio/vio.c')
-rw-r--r--vio/vio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/vio/vio.c b/vio/vio.c
index d1e723f292d..ff93cff959f 100644
--- a/vio/vio.c
+++ b/vio/vio.c
@@ -159,7 +159,7 @@ Vio *vio_new(my_socket sd, enum enum_vio_type type, uint flags)
reports that the socket is set for non-blocking when it really will
block.
*/
- fcntl(sd, F_SETFL, vio->fcntl_mode);
+ fcntl(sd, F_SETFL, 0);
vio->fcntl_mode= fcntl(sd, F_GETFL);
#elif defined(HAVE_SYS_IOCTL_H) /* hpux */
/* Non blocking sockets doesn't work good on HPUX 11.0 */