summaryrefslogtreecommitdiff
path: root/vio
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2005-10-13 20:18:37 +0300
committerunknown <monty@mysql.com>2005-10-13 20:18:37 +0300
commit08d459188135c28553b43c57c929b5a2b6ebba64 (patch)
treea7f6f0a949d99ffafb00035024e83f0c62853199 /vio
parent53eae4a0d2b4808062d99a1e7a9006a3257df0f5 (diff)
parentc8067ec8489dfc1ee96ba89100a9ef067578ffca (diff)
downloadmariadb-git-08d459188135c28553b43c57c929b5a2b6ebba64.tar.gz
Merge mysql.com:/home/my/mysql-4.1
into mysql.com:/home/my/mysql-5.0 mysql-test/t/select.test: Auto merged sql/item.cc: Auto merged sql/slave.cc: Auto merged sql/sql_select.cc: Auto merged vio/vio.c: Auto merged mysql-test/r/select.result: Merge and change table names a,b,c to t1,t2.t3
Diffstat (limited to 'vio')
-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 */