summaryrefslogtreecommitdiff
path: root/sql/sql_base.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/sql_base.cc')
-rw-r--r--sql/sql_base.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index ed7a8027079..d69bc905c31 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -32,7 +32,6 @@
TABLE *unused_tables; /* Used by mysql_test */
HASH open_cache; /* Used by mysql_test */
-extern "C" ulong locks_waited, locks_immediate;
static int open_unireg_entry(THD *thd,TABLE *entry,const char *db,
const char *name, const char *alias, bool locked);
@@ -1167,8 +1166,8 @@ bool wait_for_tables(THD *thd)
{
/* Now we can open all tables without any interference */
thd->proc_info="Reopen tables";
- if(!(result=reopen_tables(thd,0,0)))
- ++locks_waited;
+ result=reopen_tables(thd,0,0);
+
}
pthread_mutex_unlock(&LOCK_open);
thd->proc_info=0;