bk commit into 4.1 tree (jimw:1.2355) BUG#11707

[Jim Winstead]

Below is the list of changes that have just been committed into a local
4.1 repository of jimw. When jimw 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.2355 05/08/22 18:07:42 jimw@stripped +1 -0
  Reorder server startup so that network startup is done after storage
  engine startup. (Bug #11707)

  sql/mysqld.cc
    1.589 05/08/22 18:07:39 jimw@stripped +14 -12
    Reorder network startup to come after all other initialization,
    particularly storage engine startup which can take a long time.

# 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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-4.1-11707

--- 1.588/sql/mysqld.cc	2005-08-19 14:44:27 -07:00
+++ 1.589/sql/mysqld.cc	2005-08-22 18:07:39 -07:00
@@ -1257,7 +1257,7 @@
 #endif
 }
 
-static void server_init(void)
+static void network_init(void)
 {
   struct sockaddr_in	IPaddr;
 #ifdef HAVE_SYS_UN_H
@@ -1319,16 +1319,6 @@
     }
   }
 
-  if ((user_info= check_user(mysqld_user)))
-  {
-#if defined(HAVE_MLOCKALL) && defined(MCL_CURRENT)
-    if (locked_in_memory) // getuid() == 0 here
-      set_effective_user(user_info);
-    else
-#endif
-      set_user(mysqld_user, user_info);
-  }
-
 #ifdef __NT__
   /* create named pipe */
   if (Service.IsNT() && mysqld_unix_port[0] && !opt_bootstrap &&
@@ -3039,7 +3029,17 @@
   mysql_data_home= mysql_data_home_buff;
   mysql_data_home[0]=FN_CURLIB;		// all paths are relative from here
   mysql_data_home[1]=0;
-  server_init();
+
+  if ((user_info= check_user(mysqld_user)))
+  {
+#if defined(HAVE_MLOCKALL) && defined(MCL_CURRENT)
+    if (locked_in_memory) // getuid() == 0 here
+      set_effective_user(user_info);
+    else
+#endif
+      set_user(mysqld_user, user_info);
+  }
+
 
   if (opt_bin_log && !server_id)
   {
@@ -3063,6 +3063,8 @@
 
   if (init_server_components())
     exit(1);
+
+  network_init();
 
 #ifdef __WIN__
   if (!opt_console)