diff options
| author | sasha@mysql.sashanet.com <> | 2001-01-27 15:33:31 -0700 |
|---|---|---|
| committer | sasha@mysql.sashanet.com <> | 2001-01-27 15:33:31 -0700 |
| commit | 70f619856b0692c4f0df13065e54670bb56ec52d (patch) | |
| tree | b2d2f6b0dd73eec46bc4a16978de2f24b148927a /sql/sql_base.cc | |
| parent | 5f6561ec885e200b7e5c6fd7907d8f3388d348ad (diff) | |
| download | mariadb-git-70f619856b0692c4f0df13065e54670bb56ec52d.tar.gz | |
fixed up lock counting code - Monty's suggestions
updated manual about table lock counter
fixed coredump in DROP DATABASE with long bogus name by non-root user
fixed bug in handling STOP immediately after ROTATE
added test case for buffer overrun on DROP DATABASE by non-root user
added test case for the STOP bug in replication
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 5 |
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; |