bk commit into 5.1 tree (cmiller:1.2376)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.1 repository of cmiller. When cmiller 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, 2007-01-02 13:03:36-05:00, cmiller@stripped +27 -0
  Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
  into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
  MERGE: 1.1810.2362.39

  Makefile.am@stripped, 2007-01-02 12:59:05-05:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.68.1.25

  client/mysqlbinlog.cc@stripped, 2007-01-02 12:59:07-05:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.123.1.9

  client/mysqltest.c@stripped, 2007-01-02 12:59:10-05:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.155.9.80

  include/config-win.h@stripped, 2007-01-02 12:59:10-05:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.71.1.12

  include/my_global.h@stripped, 2007-01-02 12:59:13-05:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.96.1.35

  include/my_pthread.h@stripped, 2007-01-02 12:59:13-05:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.90.1.5

  include/mysql.h@stripped, 2007-01-02 12:59:13-05:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.154.7.2

  include/typelib.h@stripped, 2007-01-02 12:59:15-05:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.4.1.1

  mysql-test/Makefile.am@stripped, 2007-01-02 12:59:16-05:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.66.1.16

  mysys/default.c@stripped, 2007-01-02 12:59:16-05:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.72.1.14

  mysys/my_wincond.c@stripped, 2007-01-02 12:59:16-05:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.8.1.1

  mysys/typelib.c@stripped, 2007-01-02 12:59:16-05:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.15.1.1

  server-tools/instance-manager/guardian.cc@stripped, 2007-01-02 12:59:19-05:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.20.1.7

  server-tools/instance-manager/instance.cc@stripped, 2007-01-02 12:59:19-05:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.32.1.5

  sql/field.cc@stripped, 2007-01-02 12:59:20-05:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.256.1.81

  sql/field.h@stripped, 2007-01-02 12:59:21-05:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.153.12.9

  sql/item_sum.cc@stripped, 2007-01-02 12:59:21-05:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.170.1.24

  sql/item_sum.h@stripped, 2007-01-02 12:59:21-05:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.102.1.7

  sql/mysqld.cc@stripped, 2007-01-02 13:03:33-05:00, cmiller@stripped +1 -10
    Manual merge.
    MERGE: 1.439.1.146

  sql/net_serv.cc@stripped, 2007-01-02 12:59:22-05:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.88.1.7

  sql/opt_range.cc@stripped, 2007-01-02 12:59:22-05:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.159.1.77

  sql/share/charsets/hebrew.xml@stripped, 2007-01-02 12:59:24-05:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.5.1.1

  sql/sql_class.h@stripped, 2007-01-02 12:59:22-05:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.230.1.87

  sql/sql_parse.cc@stripped, 2007-01-02 12:59:23-05:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.426.1.171

  sql/sql_show.cc@stripped, 2007-01-02 12:59:24-05:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.253.1.82

  strings/conf_to_src.c@stripped, 2007-01-02 12:59:24-05:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.19.1.1

  vio/viossl.c@stripped, 2007-01-02 12:59:24-05:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.34.2.6

# 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:	cmiller
# Host:	zippy.cornsilk.net
# Root:	/home/cmiller/work/mysql/mysql-5.1-maint/RESYNC

--- 1.604/sql/mysqld.cc	2007-01-02 13:03:43 -05:00
+++ 1.605/sql/mysqld.cc	2007-01-02 13:03:43 -05:00
@@ -3477,7 +3477,7 @@ int main(int argc, char **argv)
 #endif
 {
   MY_INIT(argv[0]);		// init my_sys library & pthreads
-  /* nothing should come before this line ^^^ */
+  /* ^^^  Nothing should be before this line! */
 
   rpl_filter= new Rpl_filter;
   binlog_filter= new Rpl_filter;
@@ -3486,12 +3486,6 @@ int main(int argc, char **argv)
     sql_perror("Could not allocate replication and binlog filters");
     exit(1);
   }
-
-  /*
-    Perform basic logger initialization logger. Should be called after
-    MY_INIT, as it initializes mutexes. Log tables are inited later.
-  */
-  logger.init_base();
 
 #ifdef _CUSTOMSTARTUPCONFIG_
   if (_cust_check_startup())