diff options
| author | tim@cane.mysql.fi <> | 2001-01-16 22:51:45 +0200 |
|---|---|---|
| committer | tim@cane.mysql.fi <> | 2001-01-16 22:51:45 +0200 |
| commit | 743f8a7d3e75d0dca5932c30ee4ed8fe38ad19a8 (patch) | |
| tree | 4269d663dd48316b6f741e3ab5be911f946703ba /client | |
| parent | 3ca140edb319385819f8cbf5caf904f54c359172 (diff) | |
| parent | c40f815e1b2789e9b19ded44c39eed14a4921a67 (diff) | |
| download | mariadb-git-743f8a7d3e75d0dca5932c30ee4ed8fe38ad19a8.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)); |