diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-03-11 17:52:49 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-03-11 17:52:49 +0100 |
| commit | fad47df9957d754bec12d4d327c77ae04f71d903 (patch) | |
| tree | 58aaf6077adcb0bc0003228d30bed59687527650 /sql/mdl.cc | |
| parent | 9d7ed94f6a526748eff29dae2939a3fd341f118b (diff) | |
| parent | b7362d5fbc37dec340aeacd1fb0967c4226c022a (diff) | |
| download | mariadb-git-fad47df9957d754bec12d4d327c77ae04f71d903.tar.gz | |
Merge branch '10.4' into 10.5
Diffstat (limited to 'sql/mdl.cc')
| -rw-r--r-- | sql/mdl.cc | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sql/mdl.cc b/sql/mdl.cc index 5f229f73b2f..98a9d8f0d01 100644 --- a/sql/mdl.cc +++ b/sql/mdl.cc @@ -3227,19 +3227,14 @@ void MDL_context::set_transaction_duration_for_all_locks() DBUG_ASSERT(m_tickets[MDL_STATEMENT].is_empty()); - /* Don't swap locks if this thread is running backup stages */ - if (current_thd->current_backup_stage == BACKUP_FINISHED) - m_tickets[MDL_TRANSACTION].swap(m_tickets[MDL_EXPLICIT]); + m_tickets[MDL_TRANSACTION].swap(m_tickets[MDL_EXPLICIT]); Ticket_iterator it_ticket(m_tickets[MDL_EXPLICIT]); while ((ticket= it_ticket++)) { - if (ticket->get_key()->mdl_namespace() != MDL_key::BACKUP) - { - m_tickets[MDL_EXPLICIT].remove(ticket); - m_tickets[MDL_TRANSACTION].push_front(ticket); - } + m_tickets[MDL_EXPLICIT].remove(ticket); + m_tickets[MDL_TRANSACTION].push_front(ticket); } #ifndef DBUG_OFF |