diff options
| author | unknown <monty@mysql.com> | 2004-07-12 07:38:46 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-07-12 07:38:46 +0300 |
| commit | 18d974a3e7b48eec96c8837d42ebbc698e68ca55 (patch) | |
| tree | 9483a2a2d886576bfbbbd5379a6f47059b5a8b0e /vio | |
| parent | 4ba63c4e8d1bfb82fb00be49989cbb238e41adad (diff) | |
| download | mariadb-git-18d974a3e7b48eec96c8837d42ebbc698e68ca55.tar.gz | |
Don't close already closed files in vio (not critical)
mysys/my_init.c:
Extra debugging
sql/mysqld.cc:
Added comment
sql/sql_parse.cc:
Removed unneeded info
vio/viosocket.c:
Added assert.
Don't close already closed files
Diffstat (limited to 'vio')
| -rw-r--r-- | vio/viosocket.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/vio/viosocket.c b/vio/viosocket.c index 8dea06d4adf..48a9058480a 100644 --- a/vio/viosocket.c +++ b/vio/viosocket.c @@ -203,9 +203,11 @@ int vio_close(Vio * vio) #endif r=CloseHandle(vio->hPipe); } - else if (vio->type != VIO_CLOSED) + else #endif /* __WIN__ */ + if (vio->type != VIO_CLOSED) { + DBUG_ASSERT(vio->sd >= 0); if (shutdown(vio->sd,2)) r= -1; if (closesocket(vio->sd)) |