bk commit into 4.1 tree (reggie:1.2343)

[reggie]

Below is the list of changes that have just been committed into a local
4.1 repository of reggie. When reggie does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2343 05/07/12 08:56:51 reggie@stripped +4 -0
  Fixed some vio code that was using ___WIN__ instead of __WIN__

  vio/viosocket.c
    1.32 05/07/12 08:56:30 reggie@stripped +2 -2
    fixed typo with using 3 leading underscores instead of 2

  vio/vio.c
    1.20 05/07/12 08:56:30 reggie@stripped +2 -2
    fixed typo with using 3 leading underscores instead of 2

  sql/net_serv.cc
    1.74 05/07/12 08:56:30 reggie@stripped +1 -1
    fixed typo with using 3 leading underscores instead of 2

  include/my_global.h
    1.98 05/07/12 08:56:30 reggie@stripped +1 -1
    set SOCKET_EWOULDBLOCK to the proper windows def WSAEWOULDBLOCK

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	reggie
# Host:	linux.site
# Root:	/home/reggie/bk/vio_fix

--- 1.73/sql/net_serv.cc	2005-05-05 09:11:55 -06:00
+++ 1.74/sql/net_serv.cc	2005-07-12 08:56:30 -06:00
@@ -132,7 +132,7 @@
   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;

--- 1.97/include/my_global.h	2005-07-11 17:54:56 -06:00
+++ 1.98/include/my_global.h	2005-07-12 08:56:30 -06:00
@@ -797,7 +797,7 @@
 #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)

--- 1.19/vio/vio.c	2004-12-23 04:04:37 -07:00
+++ 1.20/vio/vio.c	2005-07-12 08:56:30 -06:00
@@ -130,7 +130,7 @@
     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 @@
     {
       /* 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

--- 1.31/vio/viosocket.c	2005-06-07 17:24:00 -06:00
+++ 1.32/vio/viosocket.c	2005-07-12 08:56:30 -06:00
@@ -82,7 +82,7 @@
   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 @@
       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