diff options
| author | unknown <evgen@moonbone.local> | 2005-09-15 22:54:59 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2005-09-15 22:54:59 +0400 |
| commit | 3444e243b48be28397fd7027ec783264ec9d0170 (patch) | |
| tree | 7eff5ab023443330fec874d16079e05b0980a2f4 /vio | |
| parent | 577e915bc70b0339653e58c7e44daa022bbf17cd (diff) | |
| parent | 39c7eb9d8fd120fb620c659573e808fc8f126375 (diff) | |
| download | mariadb-git-3444e243b48be28397fd7027ec783264ec9d0170.tar.gz | |
Merge moonbone.local:/work/12887-bug-4.1-mysql
into moonbone.local:/work/12887-bug-5.0-mysql
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 e0ca18539ce..ea45d7ce5a7 100644 --- a/vio/viosocket.c +++ b/vio/viosocket.c @@ -145,7 +145,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; |