diff options
| author | unknown <msvensson@shellback.(none)> | 2006-09-15 14:28:25 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-09-15 14:28:25 +0200 |
| commit | cdc2c4e930f97b4d8c363043c3ae47302adef101 (patch) | |
| tree | 4cd592ee6025b9ac5cbbf21a86d21570978d10b9 /vio | |
| parent | 549c922bdb151d767b29186c404f5a8a540152a0 (diff) | |
| parent | 3860571e956d0ccd730384271400c6d34325bd93 (diff) | |
| download | mariadb-git-cdc2c4e930f97b4d8c363043c3ae47302adef101.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/work/my50-work
into shellback.(none):/home/msvensson/mysql/work/my51-work
sql/mysqld.cc:
Auto merged
vio/viosocket.c:
Auto merged
Diffstat (limited to 'vio')
| -rw-r--r-- | vio/viosocket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vio/viosocket.c b/vio/viosocket.c index da80c5b536f..34ef6159a86 100644 --- a/vio/viosocket.c +++ b/vio/viosocket.c @@ -275,7 +275,7 @@ int vio_close(Vio * vio) if (vio->type != VIO_CLOSED) { DBUG_ASSERT(vio->sd >= 0); - if (shutdown(vio->sd,2)) + if (shutdown(vio->sd, SHUT_RDWR)) r= -1; if (closesocket(vio->sd)) r= -1; |