bk commit into 4.1 tree (ingo:1.2434)

[ingo]

Below is the list of changes that have just been committed into a local
4.1 repository of mydev. When mydev 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.2434 05/09/13 20:47:00 ingo@stripped +3 -0
  Merge mysql.com:/home/mydev/mysql-4.0-4000
  into  mysql.com:/home/mydev/mysql-4.1-4100

  sql/sql_base.cc
    1.259 05/09/13 20:46:53 ingo@stripped +0 -0
    Auto merged

  include/my_global.h
    1.103 05/09/13 20:46:53 ingo@stripped +0 -0
    Auto merged

  configure.in
    1.395 05/09/13 20:46:53 ingo@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:	ingo
# Host:	chilla.local
# Root:	/home/mydev/mysql-4.1-4100/RESYNC

--- 1.258/sql/sql_base.cc	2005-07-28 20:24:03 +02:00
+++ 1.259/sql/sql_base.cc	2005-09-13 20:46:53 +02:00
@@ -868,6 +868,13 @@
   {
     if (table->version != refresh_version)
     {
+      if (! refresh)
+      {
+        /* Ignore flush for now, but force close after usage. */
+        thd->version= table->version;
+        continue;
+      }
+
       /*
       ** There is a refresh in progress for this table
       ** Wait until the table is freed or the thread is killed.