Commit 1600ee94 authored by unknown's avatar unknown
Browse files

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 c11974e6 d40da89e

vio/viosocket.c

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