diff options
author | Dmitry Lenev <dlenev@mysql.com> | 2010-02-03 22:55:46 +0300 |
---|---|---|
committer | Dmitry Lenev <dlenev@mysql.com> | 2010-02-03 22:55:46 +0300 |
commit | f677e97746e1c1c34858f70533625c0cc4180f92 (patch) | |
tree | 8c096d562e354b332762b23429271b728a858c64 /sql/mdl.cc | |
parent | 1397985d53b575ed51b51568a12695949ab00698 (diff) | |
download | mariadb-git-f677e97746e1c1c34858f70533625c0cc4180f92.tar.gz |
A follow-up for the patch which implemented new
type-of-operation-aware metadata locks and added a
wait-for graph based deadlock detector to the MDL
subsystem (this patch fixed bug #46272 "MySQL 5.4.4,
new MDL: unnecessary deadlock" and bug #37346
"innodb does not detect deadlock between update and
alter table").
Removed unused and redundant method.
Diffstat (limited to 'sql/mdl.cc')
-rw-r--r-- | sql/mdl.cc | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/sql/mdl.cc b/sql/mdl.cc index 5744467f576..6ecde849d80 100644 --- a/sql/mdl.cc +++ b/sql/mdl.cc @@ -1141,36 +1141,6 @@ bool MDL_ticket::is_incompatible_when_waiting(enum_mdl_type type) const /** - Acquire global intention exclusive lock. - - @param[in] mdl_request Lock request object for lock to be acquired - - @retval FALSE Success. The lock has been acquired. - @retval TRUE Error. -*/ - -bool -MDL_context::acquire_global_intention_exclusive_lock(MDL_request *mdl_request) -{ - DBUG_ASSERT(mdl_request->key.mdl_namespace() == MDL_key::GLOBAL && - mdl_request->type == MDL_INTENTION_EXCLUSIVE); - - /* - If this is a non-recursive attempt to acquire global intention - exclusive lock we might have to wait until active global shared - lock or pending requests will go away. Since we won't hold any - resources (except associated with open HANDLERs) while doing it - deadlocks are not possible. - */ - DBUG_ASSERT(is_lock_owner(MDL_key::GLOBAL, "", "", MDL_INTENTION_EXCLUSIVE) || - ! has_locks() || - (m_trans_sentinel && m_tickets.front() == m_trans_sentinel)); - - return acquire_lock(mdl_request); -} - - -/** Check whether the context already holds a compatible lock ticket on an object. Start searching the transactional locks. If not |