Commit ede5c905 authored by unknown's avatar unknown

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
parents 69011492 d8d5763b
......@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment