bk commit into 4.1 tree (reggie:1.2304)

[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.2304 05/06/27 22:40:42 reggie@mdk10.(none) +3 -0
  Fix problem where ___WIN__ was being used instead of __WIN__

  vio/viosocket.c
    1.32 05/06/27 22:40:33 reggie@mdk10.(none) +1 -1
    Fix problem where ___WIN__ was being used instead of __WIN__

  vio/vio.c
    1.20 05/06/27 22:40:32 reggie@mdk10.(none) +1 -1
    Fix problem where ___WIN__ was being used instead of __WIN__

  sql/net_serv.cc
    1.74 05/06/27 22:40:32 reggie@mdk10.(none) +1 -1
    Fix problem where ___WIN__ was being used instead of __WIN__

# 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:	mdk10.(none)
# Root:	/home/reggie/bk/mysql-4.1-base

--- 1.73/sql/net_serv.cc	2005-05-05 10:11:55 -05:00
+++ 1.74/sql/net_serv.cc	2005-06-27 22:40:32 -05: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.19/vio/vio.c	2004-12-23 05:04:37 -06:00
+++ 1.20/vio/vio.c	2005-06-27 22:40:32 -05: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 */

--- 1.31/vio/viosocket.c	2005-06-07 18:24:00 -05:00
+++ 1.32/vio/viosocket.c	2005-06-27 22:40:33 -05: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)
   {