database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2021-06-01 11:39:38 +03:00
parent 5727d56260 9c7a456a92
commit a722ee88f3
82 changed files with 1758 additions and 938 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_trigger.cc
View File

@ -719,8 +719,13 @@ end:
thd->lex->spname->m_name.str, static_cast<uint>(thd->lex->spname->m_name.length));
}
if (mdl_request_for_trn.ticket)
thd->mdl_context.release_lock(mdl_request_for_trn.ticket);
/* In Locked_tables_list::reopen_tables(),
MDL_context::set_transaction_duration_for_all_locks() may have been invoked,
converting our explicit MDL to transaction scope. In that case, we will not
release the lock, to avoid a debug assertion failure. */
if (MDL_ticket *ticket= mdl_request_for_trn.ticket)
if (thd->mdl_context.has_explicit_locks())
thd->mdl_context.release_lock(ticket);
DBUG_RETURN(result);