diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-11-30 22:57:18 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-11-30 22:57:18 +0200 |
| commit | efcfb195e3fc4a2b87bfcb9ad136d46b9961f49e (patch) | |
| tree | 9eb3b78e20ecf4bd9e5cd587db50d51c1f06d336 /vio/viosocket.c | |
| parent | a7f87effa57f6486c23bf5b340c8474a635dcf71 (diff) | |
| parent | 6378bdbf47af72b2f899853586faa5a2d2f0fee1 (diff) | |
| download | mariadb-git-efcfb195e3fc4a2b87bfcb9ad136d46b9961f49e.tar.gz | |
Merge with 5.1
Diffstat (limited to 'vio/viosocket.c')
| -rw-r--r-- | vio/viosocket.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/vio/viosocket.c b/vio/viosocket.c index 7f1ef718d96..478b5dc03bd 100644 --- a/vio/viosocket.c +++ b/vio/viosocket.c @@ -396,7 +396,9 @@ my_bool vio_poll_read(Vio *vio,uint timeout) void vio_timeout(Vio *vio, uint which, uint timeout) { #if defined(SO_SNDTIMEO) && defined(SO_RCVTIMEO) +#ifndef DBUG_OFF int r; +#endif DBUG_ENTER("vio_timeout"); { @@ -410,10 +412,12 @@ void vio_timeout(Vio *vio, uint which, uint timeout) wait_timeout.tv_usec= 0; #endif - r= setsockopt(vio->sd, SOL_SOCKET, which ? SO_SNDTIMEO : SO_RCVTIMEO, - IF_WIN(const char*, const void*)&wait_timeout, - sizeof(wait_timeout)); - +#ifndef DBUG_OFF + r= +#endif + setsockopt(vio->sd, SOL_SOCKET, which ? SO_SNDTIMEO : SO_RCVTIMEO, + IF_WIN(const char*, const void*)&wait_timeout, + sizeof(wait_timeout)); } #ifndef DBUG_OFF |