Merge moonbone.local:/work/12887-bug-4.1-mysql
into moonbone.local:/work/12887-bug-5.0-mysql
This commit is contained in:
commit
7e733a889e
@ -145,7 +145,7 @@ int vio_blocking(Vio * vio __attribute__((unused)), my_bool set_blocking_mode,
|
|||||||
#endif /* !defined(NO_FCNTL_NONBLOCK) */
|
#endif /* !defined(NO_FCNTL_NONBLOCK) */
|
||||||
#else /* !defined(__WIN__) && !defined(__EMX__) */
|
#else /* !defined(__WIN__) && !defined(__EMX__) */
|
||||||
#ifndef __EMX__
|
#ifndef __EMX__
|
||||||
if (vio->type != VIO_TYPE_NAMEDPIPE)
|
if (vio->type != VIO_TYPE_NAMEDPIPE && vio->type != VIO_TYPE_SHARED_MEMORY)
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
ulong arg;
|
ulong arg;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user