diff options
| author | Dmitry Lenev <dlenev@mysql.com> | 2010-07-01 18:58:47 +0400 |
|---|---|---|
| committer | Dmitry Lenev <dlenev@mysql.com> | 2010-07-01 18:58:47 +0400 |
| commit | 8ad1aa562f70374e49a3550f4d0f9a16cddfd4d2 (patch) | |
| tree | c8a4b1e4824988427b1b8cda93bb15a32cdf8cdd /sql/sql_db.cc | |
| parent | 41a3dfe49093e41806a0f3b36dbb654ef1b8f29a (diff) | |
| download | mariadb-git-8ad1aa562f70374e49a3550f4d0f9a16cddfd4d2.tar.gz | |
A follow-up for 5.5 version of fix for bug#54360 "Deadlock
DROP/ALTER/CREATE DATABASE with open HANDLER".
Remove wait_for_condition() which became unused after
database locks were replaced with MDL scoped locks.
If one needs functionality provided by this call one can
always use THD::enter_cond()/exit_cond() methods.
Also removed an unused include from sql_db.cc and updated
comment describing one of used includes to reflect current
situation.
Diffstat (limited to 'sql/sql_db.cc')
| -rw-r--r-- | sql/sql_db.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc index c4a7dc53972..fe4b112196c 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -21,14 +21,12 @@ #include "unireg.h" #include "sql_db.h" #include "sql_cache.h" // query_cache_* -#include "lock.h" // wait_if_global_read_lock, - // start_waiting_global_read_lock +#include "lock.h" // lock_schema_name #include "sql_table.h" // build_table_filename, // filename_to_tablename #include "sql_rename.h" // mysql_rename_tables #include "sql_acl.h" // SELECT_ACL, DB_ACLS, // acl_get, check_grant_db -#include "sql_base.h" // wait_for_condition #include "log_event.h" // Query_log_event #include <mysys_err.h> #include "sp.h" |