summaryrefslogtreecommitdiff
path: root/sql/lock.cc
diff options
context:
space:
mode:
authormonty@tik.mysql.com <>2000-11-13 23:55:10 +0200
committermonty@tik.mysql.com <>2000-11-13 23:55:10 +0200
commit7a013339f84c48ea6194a35d9c00d0d549466b1d (patch)
tree6689cb755cdb6ba0fb4cc6fbb215d75b175228d2 /sql/lock.cc
parentcb1d81f650df9fc3ec5965cf2dfbcb1fd8559d31 (diff)
downloadmariadb-git-7a013339f84c48ea6194a35d9c00d0d549466b1d.tar.gz
Bug fixes, TRUNCATE, safer passwords on command line and connect timeout
Diffstat (limited to 'sql/lock.cc')
-rw-r--r--sql/lock.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/lock.cc b/sql/lock.cc
index 4c7ae8e950b..c85983b65d6 100644
--- a/sql/lock.cc
+++ b/sql/lock.cc
@@ -70,8 +70,8 @@ MYSQL_LOCK *mysql_lock_tables(THD *thd,TABLE **tables,uint count)
thd->proc_info="Waiting for table";
pthread_mutex_unlock(&thd->mysys_var->mutex);
- while (global_read_lock && ! thd->killed ||
- thd->version != refresh_version)
+ while (global_read_lock && ! thd->killed &&
+ thd->version == refresh_version)
{
(void) pthread_cond_wait(&COND_refresh,&LOCK_open);
}