bk commit into 5.1 tree (petr:1.2088)

[Petr Chardin]

Below is the list of changes that have just been committed into a local
5.1 repository of cps. When cps 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.2088 06/01/30 02:24:47 petr@stripped +2 -0
  Do not create log table handler if run in bootstrap mode.
  This patch also fixes annoying complains on the log tables
  absence, issued by the shell version of mysql-test-run.

  sql/mysqld.cc
    1.526 06/01/30 02:24:44 petr@stripped +4 -1
    do not create log table handler, if run
    in bootstrap mode.

  sql/log.h
    1.4 06/01/30 02:24:44 petr@stripped +8 -2
    check for the table log handler presence, as now it
    could be absent in some cases. Namely, during bootstrap.

# 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:	petr
# Host:	outpost.site
# Root:	/home/cps/mysql/trees/5.1/5.1-virgin-debug

--- 1.525/sql/mysqld.cc	2006-01-27 16:10:37 +03:00
+++ 1.526/sql/mysqld.cc	2006-01-30 02:24:44 +03:00
@@ -3086,7 +3086,10 @@
   }
 
 #ifdef WITH_CSV_STORAGE_ENGINE
-  logger.init_log_tables();
+  if (opt_bootstrap)
+    opt_old_log_format= TRUE;
+  else
+    logger.init_log_tables();
 
   if (opt_old_log_format || (have_csv_db != SHOW_OPTION_YES))
     logger.set_handlers(LEGACY, opt_slow_log ? LEGACY:NONE,

--- 1.3/sql/log.h	2006-01-27 16:10:37 +03:00
+++ 1.4/sql/log.h	2006-01-30 02:24:44 +03:00
@@ -473,11 +473,17 @@
   bool flush_logs(THD *thd);
   THD *get_general_log_thd()
   {
-    return (THD *) table_log_handler->general_log_thd;
+    if (table_log_handler)
+      return (THD *) table_log_handler->general_log_thd;
+    else
+      return NULL;
   }
   THD *get_slow_log_thd()
   {
-    return (THD *) table_log_handler->slow_log_thd;
+    if (table_log_handler)
+      return (THD *) table_log_handler->slow_log_thd;
+    else
+      return NULL;
   }
   /* Perform basic logger cleanup. this will leave e.g. error log open. */
   void cleanup_base();