From: Date: June 15 2005 9:27am
Subject: bk commit into 5.0 tree (georg:1.1929) BUG#11174
List-Archive: http://lists.mysql.com/internals/26012
X-Bug: 11174
Message-Id: <20050615072734.B31901571C9@lmy002.wdf.sap.corp>

Below is the list of changes that have just been committed into a local
5.0 repository of georg. When georg 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.1929 05/06/15 09:27:24 georg@stripped +1 -0
  Fix for bug #11174 (can't determine hostname under Windows 64-bit)

  sql/mysqld.cc
    1.467 05/06/15 09:27:19 georg@stripped +13 -13
    Fix for bug #11174 (can't determine hostname under Windows 64-bit)

# 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:	georg
# Host:	lmy002.wdf.sap.corp
# Root:	/home/georg/work/mysql/prod/mysql-5.0

--- 1.466/sql/mysqld.cc	2005-06-11 05:11:17 +02:00
+++ 1.467/sql/mysqld.cc	2005-06-15 09:27:19 +02:00
@@ -1276,19 +1276,6 @@
   int	arg=1;
   DBUG_ENTER("server_init");
 
-#ifdef	__WIN__
-  if (!opt_disable_networking)
-  {
-    WSADATA WsaData;
-    if (SOCKET_ERROR == WSAStartup (0x0101, &WsaData))
-    {
-      /* errors are not read yet, so we use test here */
-      my_message(ER_WSAS_FAILED, "WSAStartup Failed", MYF(0));
-      unireg_abort(1);
-    }
-  }
-#endif /* __WIN__ */
-
   set_ports();
 
   if (mysqld_port != 0 && !opt_disable_networking && !opt_bootstrap)
@@ -3014,6 +3001,19 @@
     exit(1);
   }
 #endif
+
+#ifdef	__WIN__
+  if (!opt_disable_networking)
+  {
+    WSADATA WsaData;
+    if (SOCKET_ERROR == WSAStartup (0x0101, &WsaData))
+    {
+      /* errors are not read yet, so we use test here */
+      my_message(ER_WSAS_FAILED, "WSAStartup Failed", MYF(0));
+      unireg_abort(1);
+    }
+  }
+#endif /* __WIN__ */
 
   if (init_common_variables(MYSQL_CONFIG_NAME,
 			    argc, argv, load_default_groups))