diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2021-02-02 17:55:53 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2021-02-02 17:55:53 +0100 |
| commit | 0f810b58faf487c7cd59f2ee520f62deb0f712eb (patch) | |
| tree | dfb52d41ffd83d0dbffb969c091fe190b9457a24 /sql/mdl.cc | |
| parent | 542d769ea1a22a7a6a87c9fe76ff911a162ade44 (diff) | |
| parent | 251b52190070095e4c65ffb0ae545d49330a02b2 (diff) | |
| download | mariadb-git-10.4-merge-attempt.tar.gz | |
Merge branch 'bb-10.3-release' into bb-10.4-release10.4-merge-attempt
Diffstat (limited to 'sql/mdl.cc')
| -rw-r--r-- | sql/mdl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/mdl.cc b/sql/mdl.cc index 93b7982c4a5..bea02f2bf6a 100644 --- a/sql/mdl.cc +++ b/sql/mdl.cc @@ -1138,7 +1138,7 @@ MDL_wait::timed_wait(MDL_context_owner *owner, struct timespec *abs_timeout, DBUG_ASSERT(!debug_sync_set_action((owner->get_thd()), STRING_WITH_LEN(act))); };); - if (wsrep_thd_is_BF(owner->get_thd(), false)) + if (WSREP_ON && wsrep_thd_is_BF(owner->get_thd(), false)) { wait_result= mysql_cond_wait(&m_COND_wait_status, &m_LOCK_wait_status); } @@ -1211,7 +1211,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)) && + if (WSREP_ON && (this == &(ticket->get_lock()->m_waiting)) && wsrep_thd_is_BF(ticket->get_ctx()->get_thd(), false)) { Ticket_iterator itw(ticket->get_lock()->m_waiting); @@ -1762,7 +1762,7 @@ MDL_lock::can_grant_lock(enum_mdl_type type_arg, non WSREP threads must report conflict immediately note: RSU processing wsrep threads, have wsrep_on==OFF */ - if (WSREP(requestor_ctx->get_thd()) || + if (WSREP_ON && WSREP(requestor_ctx->get_thd()) || requestor_ctx->get_thd()->wsrep_cs().mode() == wsrep::client_state::m_rsu) { |