diff options
| author | jimw@mysql.com <> | 2005-09-15 10:00:25 -0700 |
|---|---|---|
| committer | jimw@mysql.com <> | 2005-09-15 10:00:25 -0700 |
| commit | af4d71f734fe367d9e2dbf4884b5e6c9ceeeaa47 (patch) | |
| tree | a1a26ffdadab4261b65b570c3e18fbe00722a4a6 /vio/viosocket.c | |
| parent | 10a4a16654c3acd4e7b7447612a638737ba47d43 (diff) | |
| parent | 89decf6aa9110638a94bfae90010450b7b60e5de (diff) | |
| download | mariadb-git-af4d71f734fe367d9e2dbf4884b5e6c9ceeeaa47.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-12723
into mysql.com:/home/jimw/my/mysql-4.1-clean
Diffstat (limited to 'vio/viosocket.c')
| -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 0f1abfeea46..5213390e2e6 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; |