diff options
| author | unknown <jimw@mysql.com> | 2005-09-15 10:00:25 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-09-15 10:00:25 -0700 |
| commit | 1600ee94e4f7242cdf739bd0f029ad48c4fe1bf0 (patch) | |
| tree | a1a26ffdadab4261b65b570c3e18fbe00722a4a6 /vio | |
| parent | c11974e678e6c4a5c4c9ebc98547a5f80e68f81d (diff) | |
| parent | d40da89e2dbe720afa8881a6c9718fb290eeabf2 (diff) | |
| download | mariadb-git-1600ee94e4f7242cdf739bd0f029ad48c4fe1bf0.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-12723
into mysql.com:/home/jimw/my/mysql-4.1-clean
vio/viosocket.c:
Auto merged
Diffstat (limited to 'vio')
| -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; |