Commit 109d2cfa authored by unknown's avatar unknown
Browse files

Merge moonbone.local:/work/12887-bug-4.1-mysql 

into moonbone.local:/work/12887-bug-5.0-mysql


vio/viosocket.c:
  Auto merged
parents c5f78752 2a5505c7

vio/viosocket.c

+1 −1
Original line number Diff line number Diff line
@@ -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;