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 | 10582e2abec2e05589125131bf0150c568a7cc31 (patch) | |
| tree | c8a4b1e4824988427b1b8cda93bb15a32cdf8cdd /sql/sql_base.h | |
| parent | 9ff272fbbd9f8e8bb412cf8ddc12d6e97242ef63 (diff) | |
| download | mariadb-git-10582e2abec2e05589125131bf0150c568a7cc31.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_base.h')
| -rw-r--r-- | sql/sql_base.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/sql_base.h b/sql/sql_base.h index 67e5601663a..24669bd2597 100644 --- a/sql/sql_base.h +++ b/sql/sql_base.h @@ -203,8 +203,6 @@ int setup_conds(THD *thd, TABLE_LIST *tables, TABLE_LIST *leaves, COND **conds); int setup_ftfuncs(SELECT_LEX* select); int init_ftfuncs(THD *thd, SELECT_LEX* select, bool no_order); -void wait_for_condition(THD *thd, mysql_mutex_t *mutex, - mysql_cond_t *cond); bool lock_table_names(THD *thd, TABLE_LIST *table_list, TABLE_LIST *table_list_end, ulong lock_wait_timeout, uint flags); |