summaryrefslogtreecommitdiff
path: root/vio
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@montyprogram.com>2012-08-30 11:36:24 +0200
committerVladislav Vaintroub <wlad@montyprogram.com>2012-08-30 11:36:24 +0200
commitae325ec6ce3998b3dd38fc2ad7763857cd4c140f (patch)
tree957911b8185c51f0ad2caf43f2124552bca6db9f /vio
parentd99b8004e6b46e2a1b321bf50825254bf841cddb (diff)
downloadmariadb-git-ae325ec6ce3998b3dd38fc2ad7763857cd4c140f.tar.gz
Compile 10.0 on Windows
Diffstat (limited to 'vio')
-rw-r--r--vio/viopipe.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/vio/viopipe.c b/vio/viopipe.c
index db9881923ee..045ab8edfb8 100644
--- a/vio/viopipe.c
+++ b/vio/viopipe.c
@@ -48,7 +48,7 @@ static size_t wait_overlapped_result(Vio *vio, int timeout)
timeout_ms= timeout >= 0 ? timeout : INFINITE;
/* Wait for the overlapped operation to be completed. */
- ret= WaitForSingleObjectEx(vio->pipe_overlapped.hEvent, timeout_ms, TRUE);
+ wait_status= WaitForSingleObjectEx(vio->pipe_overlapped.hEvent, timeout_ms, TRUE);
/*
WaitForSingleObjects will normally return WAIT_OBJECT_O (success,
@@ -78,7 +78,7 @@ size_t vio_read_pipe(Vio *vio, uchar *buf, size_t count)
DWORD transferred;
size_t ret= (size_t) -1;
DBUG_ENTER("vio_read_pipe");
- DBUG_PRINT("enter", ("sd: %d buf: %p size: %d", vio->sd, buf,
+ DBUG_PRINT("enter", ("sd: %p buf: %p size: %d", vio->hPipe, buf,
(int) count));
disable_iocp_notification(&vio->overlapped);
@@ -111,7 +111,7 @@ size_t vio_write_pipe(Vio *vio, const uchar *buf, size_t count)
DWORD transferred;
size_t ret= (size_t) -1;
DBUG_ENTER("vio_write_pipe");
- DBUG_PRINT("enter", ("sd: %d buf: %p size: %d", vio->sd, buf,
+ DBUG_PRINT("enter", ("sd: %d buf: %p size: %d", vio->hPipe, buf,
(int) count));
disable_iocp_notification(&vio->pipe_overlapped);