Commit 53683ef7 authored by ingo@mysql.com's avatar ingo@mysql.com

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

into  mysql.com:/home/mydev/mysql-4.1-4100
parents cb4f1320 e31c488d
...@@ -868,6 +868,13 @@ TABLE *open_table(THD *thd,const char *db,const char *table_name, ...@@ -868,6 +868,13 @@ TABLE *open_table(THD *thd,const char *db,const char *table_name,
{ {
if (table->version != refresh_version) 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 ** There is a refresh in progress for this table
** Wait until the table is freed or the thread is killed. ** Wait until the table is freed or the thread is killed.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment