bk commit into 5.1 tree (stewart:1.1909)

[Stewart Smith]

Below is the list of changes that have just been committed into a local
5.1 repository of stewart. When stewart 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.1909 05/06/01 22:41:59 stewart@stripped +1 -0
  WL#2325 NDB Injector thread
  
  Fix assert on shutdown of mysqld (caused by having the binlog already closed when
  the injector thread was still running).

  sql/mysqld.cc
    1.470 05/06/01 22:41:51 stewart@stripped +4 -4
    Move cleanup of logs to after handlers have been shut down.
    
    This allows handlers to directly use the logs (e.g. ndb injector thread)

# 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:	stewart
# Host:	kennedy.(none)
# Root:	/home/stewart/Documents/MySQL/5.1/wl2325

--- 1.469/sql/mysqld.cc	2005-06-01 10:15:35 +10:00
+++ 1.470/sql/mysqld.cc	2005-06-01 22:41:51 +10:00
@@ -980,10 +980,6 @@
   if (cleanup_done++)
     return; /* purecov: inspected */
 
-  mysql_log.cleanup();
-  mysql_slow_log.cleanup();
-  mysql_bin_log.cleanup();
-
 #ifdef HAVE_REPLICATION
   if (use_slave_mask)
     bitmap_free(&slave_error_mask);
@@ -1006,6 +1002,10 @@
     udf_free();
 #endif
   (void) ha_panic(HA_PANIC_CLOSE);	/* close all tables and logs */
+  mysql_log.cleanup();
+  mysql_slow_log.cleanup();
+  mysql_bin_log.cleanup();
+
   if (tc_log)
     tc_log->close();
   delete_elements(&key_caches, (void (*)(const char*, gptr)) free_key_cache);