bk commit into 5.2 tree (patg:1.2336)

[Patrick Galbraith]

Below is the list of changes that have just been committed into a local
5.2 repository of patg. When patg 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@stripped, 2006-11-10 10:50:36-05:00, patg@stripped +1 -0
  WL# 3031
  
  Put check for opt_bootstrap. This allows the mysql_install_db to run without 
  griping that mysql.servers table, which it is going to create, but doesn't exist
  yet - chicken and egg...

  sql/mysqld.cc@stripped, 2006-11-10 10:50:33-05:00, patg@stripped +2 -3
    WL# 3031
    
    Put check for opt_bootstrap. This allows the mysql_install_db to run without 
    griping that mysql.servers table, which it is going to create, but doesn't exist
    yet - chicken and egg...

# 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:	patg
# Host:	govinda.patg.net
# Root:	/home/patg/mysql-build/mysql-5.2-wl3031.clone2

--- 1.577/sql/mysqld.cc	2006-11-10 10:50:43 -05:00
+++ 1.578/sql/mysqld.cc	2006-11-10 10:50:43 -05:00
@@ -3606,9 +3606,8 @@
   if (!opt_noacl)
     (void) grant_init();
 
-  if (servers_init(0))
-  {
-  }
+  if (!opt_bootstrap)
+    servers_init(0);
 
   if (!opt_noacl)
   {