Merge mysql.com:/home/mydev/mysql-4.0-4000

into  mysql.com:/home/mydev/mysql-4.1-4100


configure.in:
  Auto merged
include/my_global.h:
  Auto merged
sql/sql_base.cc:
  Auto merged

1 files changed, 7 insertions, 0 deletions

diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 1cedc89ef97..b48f2537069 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -868,6 +868,13 @@ TABLE *open_table(THD *thd,const char *db,const char *table_name,
   {
     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.