diff options
| author | Dmitry Lenev <dlenev@mysql.com> | 2010-05-25 16:35:01 +0400 |
|---|---|---|
| committer | Dmitry Lenev <dlenev@mysql.com> | 2010-05-25 16:35:01 +0400 |
| commit | a3c080be7ac95ce7f6f384a07f9ff0b31fd33a0f (patch) | |
| tree | 5ca3eccef7fd43ef9cca0e1b7c7d9d307f34add2 /sql/sp_head.h | |
| parent | 6ceacd4fb94f84faeb6d637d068cea2722a016c1 (diff) | |
| download | mariadb-git-a3c080be7ac95ce7f6f384a07f9ff0b31fd33a0f.tar.gz | |
Pre-requisite patch for bug #51263 "Deadlock between
transactional SELECT and ALTER TABLE ... REBUILD PARTITION".
The goal of this patch is to decouple type of metadata
lock acquired for table by open_tables() from type of
table-level lock to be acquired on it.
To achieve this we change approach to how we determine what
type of metadata lock should be acquired on table to be open.
Now instead of inferring it at open_tables() time from flags
and type of table-level lock we rely on that type of metadata
lock is properly set at parsing time and is not changed
further.
Diffstat (limited to 'sql/sp_head.h')
| -rw-r--r-- | sql/sp_head.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sp_head.h b/sql/sp_head.h index 165f88321a9..8975c239810 100644 --- a/sql/sp_head.h +++ b/sql/sp_head.h @@ -1346,7 +1346,9 @@ set_routine_security_ctx(THD *thd, sp_head *sp, bool is_proc, TABLE_LIST * sp_add_to_query_tables(THD *thd, LEX *lex, const char *db, const char *name, - thr_lock_type locktype); + thr_lock_type locktype, + enum_mdl_type mdl_type); + Item * sp_prepare_func_item(THD* thd, Item **it_addr); |