diff options
author | unknown <tim@cane.mysql.fi> | 2001-01-16 22:51:45 +0200 |
---|---|---|
committer | unknown <tim@cane.mysql.fi> | 2001-01-16 22:51:45 +0200 |
commit | bc09074b557ff7c453e6d21bf7892f902e53353c (patch) | |
tree | 4269d663dd48316b6f741e3ab5be911f946703ba /client | |
parent | 86b58e29471cfba2d5f7f3f7adfb6e448cc0018f (diff) | |
parent | 8c7841bca25a07f36b75584a9e60b6143e90024a (diff) | |
download | mariadb-git-bc09074b557ff7c453e6d21bf7892f902e53353c.tar.gz |
Merge work.mysql.com:/home/bk/mysql
into cane.mysql.fi:/usr/home/tim/my/work
Diffstat (limited to 'client')
-rw-r--r-- | client/violite.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/client/violite.c b/client/violite.c index f32c3c62a48..224ba051d82 100644 --- a/client/violite.c +++ b/client/violite.c @@ -206,9 +206,9 @@ int vio_blocking(Vio * vio, my_bool set_blocking_mode) old_fcntl=vio->fcntl_mode = fcntl(vio->sd, F_GETFL); } if (set_blocking_mode) - vio->fcntl_mode &= ~O_NONBLOCK; //clear bit + vio->fcntl_mode &= ~O_NONBLOCK; /*clear bit */ else - vio->fcntl_mode |= O_NONBLOCK; //set bit + vio->fcntl_mode |= O_NONBLOCK; /*set bit */ if (old_fcntl != vio->fcntl_mode) r = fcntl(vio->sd, F_SETFL, vio->fcntl_mode); } @@ -228,12 +228,12 @@ int vio_blocking(Vio * vio, my_bool set_blocking_mode) if (set_blocking_mode) { arg = 0; - vio->fcntl_mode &= ~O_NONBLOCK; //clear bit + vio->fcntl_mode &= ~O_NONBLOCK; /*clear bit */ } else { arg = 1; - vio->fcntl_mode |= O_NONBLOCK; //set bit + vio->fcntl_mode |= O_NONBLOCK; /*set bit */ } if (old_fcntl != vio->fcntl_mode) r = ioctlsocket(vio->sd,FIONBIO,(void*) &arg, sizeof(arg)); |