diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-11-16 11:00:12 +0100 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-11-16 11:00:12 +0100 |
| commit | a84d7503008e0bb7d1b4dca72eaf42016ed1a5d9 (patch) | |
| tree | 51b238d7f54d17bf3bd843bab00120cc801d8b9c /sql/sql_table.h | |
| parent | 2ef19bdcc420d090d0bed822a884eef40cd347a9 (diff) | |
| download | mariadb-git-a84d7503008e0bb7d1b4dca72eaf42016ed1a5d9.tar.gz | |
Bug #57663 Concurrent statement using stored function and DROP DATABASE
breaks SBR
This pre-requisite patch refactors the code for dropping tables, used
by DROP TABLE and DROP DATABASE. The patch moves the code for acquiring
metadata locks out of mysql_rm_table_part2() and makes it the
responsibility of the caller. This in preparation of changing the
DROP DATABASE implementation to acquire all metadata locks before any
changes are made. mysql_rm_table_part2() is renamed
mysql_rm_table_no_locks() to reflect the change.
Diffstat (limited to 'sql/sql_table.h')
| -rw-r--r-- | sql/sql_table.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_table.h b/sql/sql_table.h index eb0b1aa94dd..aa5738fd4c9 100644 --- a/sql/sql_table.h +++ b/sql/sql_table.h @@ -174,8 +174,9 @@ bool mysql_checksum_table(THD* thd, TABLE_LIST* table_list, HA_CHECK_OPT* check_opt); bool mysql_rm_table(THD *thd,TABLE_LIST *tables, my_bool if_exists, my_bool drop_temporary); -int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists, - bool drop_temporary, bool drop_view, bool log_query); +int mysql_rm_table_no_locks(THD *thd, TABLE_LIST *tables, bool if_exists, + bool drop_temporary, bool drop_view, + bool log_query); bool quick_rm_table(handlerton *base,const char *db, const char *table_name, uint flags); void close_cached_table(THD *thd, TABLE *table); |