bk commit into 5.1 tree (serg:1.2270)

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
5.1 repository of serg. When serg 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:39:59+02:00, serg@stripped +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
  into  janus.mylan:/usr/home/serg/Abk/m51
  MERGE: 1.2266.1.6

  configure.in@stripped, 2006-08-10 12:39:54+02:00, serg@stripped +0 -0
    Auto merged
    MERGE: 1.373.1.1

  sql/sql_base.cc@stripped, 2006-08-10 12:39:55+02:00, serg@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:	serg
# Host:	janus.mylan
# Root:	/usr/home/serg/Abk/m51/RESYNC

--- 1.374/configure.in	2006-08-10 12:40:04 +02:00
+++ 1.375/configure.in	2006-08-10 12:40:04 +02:00
@@ -1687,7 +1687,7 @@
   AC_MSG_ERROR("MySQL needs a long long type.")
 fi
 # off_t is not a builtin type
-MYSQL_CHECK_SIZEOF(off_t, 4)
+AC_CHECK_SIZEOF(off_t, 4)
 if test "$ac_cv_sizeof_off_t" -eq 0
 then
   AC_MSG_ERROR("MySQL needs a off_t type.")

--- 1.339/sql/sql_base.cc	2006-08-10 12:40:04 +02:00
+++ 1.340/sql/sql_base.cc	2006-08-10 12:40:04 +02:00
@@ -1997,17 +1997,17 @@
        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 @@
 
   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)