Commit 73fd169d authored by unknown's avatar unknown
Browse files

Fixed some vio code that was using ___WIN__ instead of __WIN__ 


include/my_global.h:
  set SOCKET_EWOULDBLOCK to the proper windows def WSAEWOULDBLOCK
sql/net_serv.cc:
  fixed typo with using 3 leading underscores instead of 2
vio/vio.c:
  fixed typo with using 3 leading underscores instead of 2
vio/viosocket.c:
  fixed typo with using 3 leading underscores instead of 2
parent 2bca6451

include/my_global.h

+1 −1
Original line number Diff line number Diff line
@@ -797,7 +797,7 @@ typedef off_t os_off_t; 
#define socket_errno	WSAGetLastError()

#define SOCKET_EINTR	WSAEINTR

#define SOCKET_EAGAIN	WSAEINPROGRESS

#define SOCKET_EWOULDBLOCK WSAEINPROGRESS

#define SOCKET_EWOULDBLOCK WSAEWOULDBLOCK

#define SOCKET_ENFILE	ENFILE

#define SOCKET_EMFILE	EMFILE

#elif defined(OS2)

sql/net_serv.cc

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ my_bool my_net_init(NET *net, Vio* vio) 
  if (vio != 0)					/* If real connection */

  {

    net->fd  = vio_fd(vio);			/* For perl DBI/DBD */

#if defined(MYSQL_SERVER) && !defined(___WIN__) && !defined(__EMX__) && !defined(OS2)

#if defined(MYSQL_SERVER) && !defined(__WIN__) && !defined(__EMX__) && !defined(OS2)

    if (!(test_flags & TEST_BLOCKING))

    {

      my_bool old_mode;

vio/vio.c

+2 −2
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ Vio *vio_new(my_socket sd, enum enum_vio_type type, my_bool localhost) 
    sprintf(vio->desc,

	    (vio->type == VIO_TYPE_SOCKET ? "socket (%d)" : "TCP/IP (%d)"),

	    vio->sd);

#if !defined(___WIN__) && !defined(__EMX__) && !defined(OS2)

#if !defined(__WIN__) && !defined(__EMX__) && !defined(OS2)

#if !defined(NO_FCNTL_NONBLOCK)

#if defined(__FreeBSD__)

    fcntl(sd, F_SETFL, vio->fcntl_mode); /* Yahoo! FreeBSD patch */
@@ -145,7 +145,7 @@ Vio *vio_new(my_socket sd, enum enum_vio_type type, my_bool localhost) 
    {

      /* set to blocking mode by default */

      ulong arg=0, r;

      r = ioctlsocket(sd,FIONBIO,(void*) &arg, sizeof(arg));

      r = ioctlsocket(sd,FIONBIO,(void*) &arg);

      vio->fcntl_mode &= ~O_NONBLOCK;

    }

#endif

vio/viosocket.c

+2 −2
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ int vio_blocking(Vio * vio __attribute__((unused)), my_bool set_blocking_mode, 
  DBUG_PRINT("enter", ("set_blocking_mode: %d  old_mode: %d",

		       (int) set_blocking_mode, (int) *old_mode));



#if !defined(___WIN__) && !defined(__EMX__)

#if !defined(__WIN__) && !defined(__EMX__)

#if !defined(NO_FCNTL_NONBLOCK)

  if (vio->sd >= 0)

  {
@@ -115,7 +115,7 @@ int vio_blocking(Vio * vio __attribute__((unused)), my_bool set_blocking_mode, 
      vio->fcntl_mode |= O_NONBLOCK; /* set bit */

    }

    if (old_fcntl != vio->fcntl_mode)

      r = ioctlsocket(vio->sd,FIONBIO,(void*) &arg, sizeof(arg));

      r = ioctlsocket(vio->sd,FIONBIO,(void*) &arg);

  }

#ifndef __EMX__

  else