summaryrefslogtreecommitdiff
path: root/sql/lock.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/lock.cc')
-rw-r--r--sql/lock.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/lock.cc b/sql/lock.cc
index d35f2c359fb..52d97a2422b 100644
--- a/sql/lock.cc
+++ b/sql/lock.cc
@@ -1298,7 +1298,8 @@ wait_if_global_read_lock(THD *thd, bool abort_on_refresh,
old_message=thd->enter_cond(&COND_global_read_lock, &LOCK_global_read_lock,
"Waiting for release of readlock");
while (must_wait && ! thd->killed &&
- (!abort_on_refresh || thd->version == refresh_version))
+ (!abort_on_refresh || !thd->open_tables ||
+ thd->open_tables->s->version == refresh_version))
{
DBUG_PRINT("signal", ("Waiting for COND_global_read_lock"));
mysql_cond_wait(&COND_global_read_lock, &LOCK_global_read_lock);