summaryrefslogtreecommitdiff
path: root/vio
diff options
context:
space:
mode:
authorunknown <jimw@mysql.com>2005-08-31 15:04:25 -0700
committerunknown <jimw@mysql.com>2005-08-31 15:04:25 -0700
commitd8d5763b0a93ad5b09a72e46768109c0fb799723 (patch)
treec2a6b80c5a177d9fa84074517acf23b1b9dbcda6 /vio
parent0df66847cb148b970b147e26f64310c591282647 (diff)
downloadmariadb-git-d8d5763b0a93ad5b09a72e46768109c0fb799723.tar.gz
Fix shared memory connection handling on Windows. (Bug #12723)
vio/viosocket.c: Don't pay attention to changes of nonblocking flag for shared memory connections.
Diffstat (limited to 'vio')
-rw-r--r--vio/viosocket.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/vio/viosocket.c b/vio/viosocket.c
index c7561890ead..a73a0780bfa 100644
--- a/vio/viosocket.c
+++ b/vio/viosocket.c
@@ -99,7 +99,7 @@ int vio_blocking(Vio * vio __attribute__((unused)), my_bool set_blocking_mode,
#endif /* !defined(NO_FCNTL_NONBLOCK) */
#else /* !defined(__WIN__) && !defined(__EMX__) */
#ifndef __EMX__
- if (vio->type != VIO_TYPE_NAMEDPIPE)
+ if (vio->type != VIO_TYPE_NAMEDPIPE && vio->type != VIO_TYPE_SHARED_MEMORY)
#endif
{
ulong arg;