List:Commits« Previous MessageNext Message »
From:Petr Chardin Date:April 12 2006 6:02pm
Subject:bk commit into 5.1 tree (petr:1.2335)
View as plain text  
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.2335 06/04/12 22:02:16 petr@stripped +1 -0
  Merge pchardin@stripped:/home/bk/mysql-5.1-new
  into  mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin

  sql/log.cc
    1.204 06/04/12 22:02:06 petr@stripped +0 -0
    Auto merged

# 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:	owlet.
# Root:	/home/cps/mysql/trees/mysql-5.1-virgin/RESYNC

--- 1.203/sql/log.cc	2006-04-11 01:03:33 +04:00
+++ 1.204/sql/log.cc	2006-04-12 22:02:06 +04:00
@@ -680,20 +680,27 @@
   /* reopen log files */
   file_log_handler->flush();
 
-  /*
-    this will lock and wait for all but the logger thread to release the
-    tables. Then we could reopen log tables. Then release the name locks.
-  */
-  lock_and_wait_for_table_name(thd, &close_slow_log);
-  lock_and_wait_for_table_name(thd, &close_general_log);
+  /* flush tables, in the case they are enabled */
+  if (logger.is_log_tables_initialized)
+  {
+    /*
+      This will lock and wait for all but the logger thread to release the
+      tables. Then we could reopen log tables. Then release the name locks.
+    */
+    lock_and_wait_for_table_name(thd, &close_slow_log);
+    lock_and_wait_for_table_name(thd, &close_general_log);
 
-  /* deny others from logging to general and slow log, while reopening tables */
-  logger.lock();
+    /*
+      Deny others from logging to general and slow log,
+      while reopening tables.
+    */
+    logger.lock();
 
-  table_log_handler->flush(thd, &close_slow_log, &close_general_log);
+    table_log_handler->flush(thd, &close_slow_log, &close_general_log);
 
-  /* end of log tables flush */
-  logger.unlock();
+    /* end of log tables flush */
+    logger.unlock();
+  }
   return FALSE;
 }
 
Thread
bk commit into 5.1 tree (petr:1.2335)Petr Chardin12 Apr