diff options
| author | unknown <rburnett@bk-internal.mysql.com> | 2005-05-06 15:15:48 +0200 |
|---|---|---|
| committer | unknown <rburnett@bk-internal.mysql.com> | 2005-05-06 15:15:48 +0200 |
| commit | 4576776010d65e7f7277604ca47bf65860ee6744 (patch) | |
| tree | fc2e2665a3d8e35e9aabc5e2fe3eb3c34d0c85d3 /vio/viosocket.c | |
| parent | 0baed276c312dd2e277e0e029f290510c6bdd4d9 (diff) | |
| parent | 6b819860e5fa83f1ba7c6025df8e227775bb1a1b (diff) | |
| download | mariadb-git-4576776010d65e7f7277604ca47bf65860ee6744.tar.gz | |
Merge bk-internal.mysql.com:/users/rburnett/bug9721
into bk-internal.mysql.com:/users/rburnett/mysql-5.0
BitKeeper/etc/logging_ok:
auto-union
include/violite.h:
Auto merged
sql/net_serv.cc:
Auto merged
vio/viosocket.c:
Auto merged
vio/viossl.c:
Auto merged
Diffstat (limited to 'vio/viosocket.c')
| -rw-r--r-- | vio/viosocket.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/vio/viosocket.c b/vio/viosocket.c index ea85a69e2d4..ee8e85880ba 100644 --- a/vio/viosocket.c +++ b/vio/viosocket.c @@ -364,12 +364,14 @@ my_bool vio_poll_read(Vio *vio,uint timeout) void vio_timeout(Vio *vio __attribute__((unused)), - uint timeout __attribute__((unused))) + uint which __attribute__((unused)), + uint timeout __attribute__((unused))) { #ifdef __WIN__ ulong wait_timeout= (ulong) timeout * 1000; - (void) setsockopt(vio->sd, SOL_SOCKET, SO_RCVTIMEO, (char*) &wait_timeout, - sizeof(wait_timeout)); + (void) setsockopt(vio->sd, SOL_SOCKET, + which ? SO_SNDTIMEO : SO_RCVTIMEO, (char*) &wait_timeout, + sizeof(wait_timeout)); #endif /* __WIN__ */ } |