diff options
Diffstat (limited to 'sql/mdl.cc')
| -rw-r--r-- | sql/mdl.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/mdl.cc b/sql/mdl.cc index 8c446e5d65f..44831c55b44 100644 --- a/sql/mdl.cc +++ b/sql/mdl.cc @@ -33,7 +33,8 @@ void sql_print_information(const char *format, ...) extern bool wsrep_grant_mdl_exception(MDL_context *requestor_ctx, - MDL_ticket *ticket); + MDL_ticket *ticket, + const MDL_key *key); #endif /* WITH_WSREP */ #ifdef HAVE_PSI_INTERFACE static PSI_mutex_key key_MDL_map_mutex; @@ -1549,7 +1550,8 @@ void MDL_lock::Ticket_list::add_ticket(MDL_ticket *ticket) if (granted->get_ctx() != ticket->get_ctx() && granted->is_incompatible_when_granted(ticket->get_type())) { - if (!wsrep_grant_mdl_exception(ticket->get_ctx(), granted)) + if (!wsrep_grant_mdl_exception(ticket->get_ctx(), granted, + &ticket->get_lock()->key)) { WSREP_DEBUG("MDL victim killed at add_ticket"); } @@ -1941,7 +1943,7 @@ MDL_lock::can_grant_lock(enum_mdl_type type_arg, wsrep_thd_query(requestor_ctx->wsrep_get_thd())); can_grant = true; } - else if (!wsrep_grant_mdl_exception(requestor_ctx, ticket)) + else if (!wsrep_grant_mdl_exception(requestor_ctx, ticket, &key)) { wsrep_can_grant= FALSE; if (wsrep_log_conflicts) |