diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-12-04 10:32:43 +0200 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-12-04 10:32:43 +0200 |
| commit | 496e22cf3bd2a481fd3502d86e5a4e8228bf9823 (patch) | |
| tree | 80549f8005fcf3236bfa004a5aea35e4e67b36ca /sql/mdl.cc | |
| parent | 45f484b8381a5923aec9c704e54c7f7bcfa02a40 (diff) | |
| parent | 26f56089c734852dc31d98fd73e1d8f1750bd1a8 (diff) | |
| download | mariadb-git-496e22cf3bd2a481fd3502d86e5a4e8228bf9823.tar.gz | |
merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6
and a number of fixes to make this buildable.
Run also few short multi-master high conflict rate tests, with no issues
Diffstat (limited to 'sql/mdl.cc')
| -rw-r--r-- | sql/mdl.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sql/mdl.cc b/sql/mdl.cc index a13aeb7904d..c74a3e964cb 100644 --- a/sql/mdl.cc +++ b/sql/mdl.cc @@ -1440,7 +1440,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()->get_thd()))) + wsrep_thd_is_brute_force((void *)(ticket->get_ctx()->wsrep_get_thd()))) { Ticket_iterator itw(ticket->get_lock()->m_waiting); Ticket_iterator itg(ticket->get_lock()->m_granted); @@ -1451,11 +1451,11 @@ void MDL_lock::Ticket_list::add_ticket(MDL_ticket *ticket) while ((waiting= itw++) && !added) { - if (!wsrep_thd_is_brute_force((void *)(waiting->get_ctx()->get_thd()))) + if (!wsrep_thd_is_brute_force((void *)(waiting->get_ctx()->wsrep_get_thd()))) { WSREP_DEBUG("MDL add_ticket inserted before: %lu %s", - wsrep_thd_thread_id(waiting->get_ctx()->get_thd()), - wsrep_thd_query(waiting->get_ctx()->get_thd())); + wsrep_thd_thread_id(waiting->get_ctx()->wsrep_get_thd()), + wsrep_thd_query(waiting->get_ctx()->wsrep_get_thd())); m_list.insert_after(prev, ticket); added= true; } @@ -1852,12 +1852,12 @@ 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->get_thd())) && + if (wsrep_thd_is_brute_force((void *)(requestor_ctx->wsrep_get_thd())) && key.mdl_namespace() == MDL_key::GLOBAL) { WSREP_DEBUG("global lock granted for BF: %lu %s", - wsrep_thd_thread_id(requestor_ctx->get_thd()), - wsrep_thd_query(requestor_ctx->get_thd())); + wsrep_thd_thread_id(requestor_ctx->wsrep_get_thd()), + wsrep_thd_query(requestor_ctx->wsrep_get_thd())); can_grant = true; } else if (!wsrep_grant_mdl_exception(requestor_ctx, ticket)) @@ -1893,12 +1893,12 @@ MDL_lock::can_grant_lock(enum_mdl_type type_arg, #ifdef WITH_WSREP else { - if (wsrep_thd_is_brute_force((void *)(requestor_ctx->get_thd())) && + if (wsrep_thd_is_brute_force((void *)(requestor_ctx->wsrep_get_thd())) && key.mdl_namespace() == MDL_key::GLOBAL) { WSREP_DEBUG("global lock granted for BF (waiting queue): %lu %s", - wsrep_thd_thread_id(requestor_ctx->get_thd()), - wsrep_thd_query(requestor_ctx->get_thd())); + wsrep_thd_thread_id(requestor_ctx->wsrep_get_thd()), + wsrep_thd_query(requestor_ctx->wsrep_get_thd())); can_grant = true; } } |