diff options
author | Konstantin Osipov <kostja@sun.com> | 2009-12-15 22:59:07 +0300 |
---|---|---|
committer | Konstantin Osipov <kostja@sun.com> | 2009-12-15 22:59:07 +0300 |
commit | 391b5246fef4110bc73227c67f77eec5611a612e (patch) | |
tree | 43a14c6ad76010ee31038173e53da44517c84dbe /vio | |
parent | 92b1c2f3caafe6529a08992d7f134476c7b9ff70 (diff) | |
parent | 27fca0ab1775a8c1dfe699c978b6448a7aa8f47b (diff) | |
download | mariadb-git-391b5246fef4110bc73227c67f77eec5611a612e.tar.gz |
Merge next-mr -> next-4284.
Diffstat (limited to 'vio')
-rw-r--r-- | vio/viosocket.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/vio/viosocket.c b/vio/viosocket.c index 8dcf978f2fa..fb272a430b9 100644 --- a/vio/viosocket.c +++ b/vio/viosocket.c @@ -800,6 +800,7 @@ int vio_close_pipe(Vio * vio) int r; DBUG_ENTER("vio_close_pipe"); + CancelIo(vio->hPipe); CloseHandle(vio->pipe_overlapped.hEvent); DisconnectNamedPipe(vio->hPipe); r= CloseHandle(vio->hPipe); |