bk commit into 5.1 tree (kroki:1.2269)

[kroki]

Below is the list of changes that have just been committed into a local
5.1 repository of tomash. When tomash 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-08-10 12:10:48+04:00, kroki@stripped +1 -0
  Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1
  into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge
  MERGE: 1.2266.1.3

  sql/sql_base.cc@stripped, 2006-08-10 12:10:43+04:00, kroki@stripped +0 -0
    Auto merged
    MERGE: 1.337.1.1

# 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:	kroki
# Host:	moonlight.intranet
# Root:	/home/tomash/src/mysql_ab/mysql-5.1-merge/RESYNC

--- 1.339/sql/sql_base.cc	2006-08-10 12:10:57 +04:00
+++ 1.340/sql/sql_base.cc	2006-08-10 12:10:57 +04:00
@@ -1997,17 +1997,17 @@ TABLE *open_table(THD *thd, TABLE_LIST *
        table= (TABLE*) hash_next(&open_cache, (byte*) key, key_length,
                                  &state))
   {
-    if (table->s->version != refresh_version)
+    /*
+      Here we flush tables marked for flush. However we never flush log
+      tables here. They are flushed only on FLUSH LOGS.
+    */
+    if (table->s->version != refresh_version && !table->s->log_table)
     {
       DBUG_PRINT("note",
                  ("Found table '%s.%s' with different refresh version",
                   table_list->db, table_list->table_name));
 
-      /*
-        Don't close tables if we are working with a log table or were
-        asked not to close the table explicitly
-      */
-      if (flags & MYSQL_LOCK_IGNORE_FLUSH || table->s->log_table)
+      if (flags & MYSQL_LOCK_IGNORE_FLUSH)
       {
         /* Force close at once after usage */
         thd->version= table->s->version;
@@ -2354,7 +2354,11 @@ void close_old_data_files(THD *thd, TABL
 
   for (; table ; table=table->next)
   {
-    if (table->s->version != refresh_version)
+    /*
+      Reopen marked for flush. But close log tables. They are flushed only
+      explicitly on FLUSH LOGS
+    */
+    if (table->s->version != refresh_version && !table->s->log_table)
     {
       found=1;
       if (table->db_stat)