diff options
| author | sasha@mysql.sashanet.com <> | 2001-01-26 20:00:42 -0700 |
|---|---|---|
| committer | sasha@mysql.sashanet.com <> | 2001-01-26 20:00:42 -0700 |
| commit | 5f6561ec885e200b7e5c6fd7907d8f3388d348ad (patch) | |
| tree | 34fc82c32df58fa2ccbcfe388b654b363c872ab2 /sql/sql_base.cc | |
| parent | 7c5db0d36468456fd47f5aa67115fc266e77b711 (diff) | |
| download | mariadb-git-5f6561ec885e200b7e5c6fd7907d8f3388d348ad.tar.gz | |
Table_locks_waited
Table_locks_immediate
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 96d6ea660aa..ed7a8027079 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -32,6 +32,7 @@ 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); @@ -1166,7 +1167,8 @@ bool wait_for_tables(THD *thd) { /* Now we can open all tables without any interference */ thd->proc_info="Reopen tables"; - result=reopen_tables(thd,0,0); + if(!(result=reopen_tables(thd,0,0))) + ++locks_waited; } pthread_mutex_unlock(&LOCK_open); thd->proc_info=0; |