bk commit into 5.1 tree (knielsen:1.2039)

[knielsen]

Below is the list of changes that have just been committed into a local
5.1 repository of knielsen. When knielsen 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.2039 06/01/05 10:54:14 knielsen@stripped +2 -0
  Merge mysql.com:/usr/local/mysql/mysql-5.0-win-fixes
  into  mysql.com:/usr/local/mysql/mysql-5.1-new

  sql/mysqld.cc
    1.512 06/01/05 10:54:09 knielsen@stripped +0 -0
    Auto merged

  include/my_global.h
    1.121 06/01/05 10:54:08 knielsen@stripped +0 -0
    Auto merged

# 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:	knielsen
# Host:	rt.int.sifira.dk
# Root:	/usr/local/mysql/mysql-5.1-new/RESYNC

--- 1.511/sql/mysqld.cc	2005-12-31 06:02:47 +01:00
+++ 1.512/sql/mysqld.cc	2006-01-05 10:54:09 +01:00
@@ -1489,7 +1489,7 @@
     {
       if (((ret= bind(ip_sock, my_reinterpret_cast(struct sockaddr *) (&IPaddr),
                       sizeof(IPaddr))) >= 0) ||
-          (socket_errno != EADDRINUSE) ||
+          (socket_errno != SOCKET_EADDRINUSE) ||
           (waited >= mysqld_port_timeout))
         break;
       sql_print_information("Retrying bind on TCP/IP port %u", mysqld_port);

--- 1.120/include/my_global.h	2005-12-22 05:10:51 +01:00
+++ 1.121/include/my_global.h	2006-01-05 10:54:08 +01:00
@@ -961,6 +961,7 @@
 #define SOCKET_EAGAIN	WSAEINPROGRESS
 #define SOCKET_ETIMEDOUT WSAETIMEDOUT
 #define SOCKET_EWOULDBLOCK WSAEWOULDBLOCK
+#define SOCKET_EADDRINUSE WSAEADDRINUSE
 #define SOCKET_ENFILE	ENFILE
 #define SOCKET_EMFILE	EMFILE
 #elif defined(OS2)
@@ -969,6 +970,7 @@
 #define SOCKET_EAGAIN	SOCEINPROGRESS
 #define SOCKET_ETIMEDOUT SOCKET_EINTR
 #define SOCKET_EWOULDBLOCK SOCEWOULDBLOCK
+#define SOCKET_EADDRINUSE SOCEADDRINUSE
 #define SOCKET_ENFILE	SOCENFILE
 #define SOCKET_EMFILE	SOCEMFILE
 #define closesocket(A)	soclose(A)
@@ -979,6 +981,7 @@
 #define SOCKET_EAGAIN	EAGAIN
 #define SOCKET_ETIMEDOUT SOCKET_EINTR
 #define SOCKET_EWOULDBLOCK EWOULDBLOCK
+#define SOCKET_EADDRINUSE EADDRINUSE
 #define SOCKET_ENFILE	ENFILE
 #define SOCKET_EMFILE	EMFILE
 #endif