diff options
author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-03-25 14:42:15 -0400 |
---|---|---|
committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-03-25 14:42:15 -0400 |
commit | 3088d52c20eca10e5b8689648edef8f7fd49830a (patch) | |
tree | fc75c000b47e753c04cb2c74e48d8b74d22a509f /sql/mdl.cc | |
parent | 3c0b3babd9fdaa6d6697289368022cc152c77593 (diff) | |
download | mariadb-git-3088d52c20eca10e5b8689648edef8f7fd49830a.tar.gz |
bzr merge -r3933..3945 codership/5.5 (Non-InnoDB changes only).
Diffstat (limited to 'sql/mdl.cc')
-rw-r--r-- | sql/mdl.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/mdl.cc b/sql/mdl.cc index 2f00388a14b..399863d4d73 100644 --- a/sql/mdl.cc +++ b/sql/mdl.cc @@ -1482,7 +1482,7 @@ void MDL_lock::Ticket_list::add_ticket(MDL_ticket *ticket) DBUG_ASSERT(ticket->get_lock()); #ifdef WITH_WSREP if ((this == &(ticket->get_lock()->m_waiting)) && - wsrep_thd_is_brute_force((void *)(ticket->get_ctx()->wsrep_get_thd()))) + wsrep_thd_is_BF((void *)(ticket->get_ctx()->get_thd()), false)) { Ticket_iterator itw(ticket->get_lock()->m_waiting); Ticket_iterator itg(ticket->get_lock()->m_granted); @@ -1493,7 +1493,7 @@ void MDL_lock::Ticket_list::add_ticket(MDL_ticket *ticket) while ((waiting= itw++) && !added) { - if (!wsrep_thd_is_brute_force((void *)(waiting->get_ctx()->wsrep_get_thd()))) + if (!wsrep_thd_is_BF((void *)(waiting->get_ctx()->get_thd()), true)) { WSREP_DEBUG("MDL add_ticket inserted before: %lu %s", wsrep_thd_thread_id(waiting->get_ctx()->wsrep_get_thd()), @@ -1894,7 +1894,7 @@ MDL_lock::can_grant_lock(enum_mdl_type type_arg, ticket->is_incompatible_when_granted(type_arg)) #ifdef WITH_WSREP { - if (wsrep_thd_is_brute_force((void *)(requestor_ctx->wsrep_get_thd())) && + if (wsrep_thd_is_BF((void *)(requestor_ctx->get_thd()), false) && key.mdl_namespace() == MDL_key::GLOBAL) { WSREP_DEBUG("global lock granted for BF: %lu %s", @@ -1935,7 +1935,7 @@ MDL_lock::can_grant_lock(enum_mdl_type type_arg, #ifdef WITH_WSREP else { - if (wsrep_thd_is_brute_force((void *)(requestor_ctx->wsrep_get_thd())) && + if (wsrep_thd_is_BF((void *)(requestor_ctx->get_thd()), false) && key.mdl_namespace() == MDL_key::GLOBAL) { WSREP_DEBUG("global lock granted for BF (waiting queue): %lu %s", |