diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-12-02 18:29:49 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-12-02 18:29:49 +0200 |
| commit | 6a1e655cb0d400d8ed44fbfd22151b1d3e7f22d8 (patch) | |
| tree | 3915bd814fa0ea7c0219b258a1fb458846a5b0bd /sql/mdl.cc | |
| parent | e76e12886fd37094d95ca40b8cce45ca3ef28021 (diff) | |
| parent | 24ec8eaf66ecd864529309c5edcb8dd6b685f2aa (diff) | |
| download | mariadb-git-6a1e655cb0d400d8ed44fbfd22151b1d3e7f22d8.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/mdl.cc')
| -rw-r--r-- | sql/mdl.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/mdl.cc b/sql/mdl.cc index 4772dc017f9..5f5e5c3ce9a 100644 --- a/sql/mdl.cc +++ b/sql/mdl.cc @@ -3039,15 +3039,17 @@ void MDL_context::rollback_to_savepoint(const MDL_savepoint &mdl_savepoint) implementation of COMMIT (implicit or explicit) and ROLLBACK. */ -void MDL_context::release_transactional_locks() +void MDL_context::release_transactional_locks(THD *thd) { DBUG_ENTER("MDL_context::release_transactional_locks"); + /* Fail if there are active transactions */ + DBUG_ASSERT(!(thd->server_status & + (SERVER_STATUS_IN_TRANS | SERVER_STATUS_IN_TRANS_READONLY))); release_locks_stored_before(MDL_STATEMENT, NULL); release_locks_stored_before(MDL_TRANSACTION, NULL); DBUG_VOID_RETURN; } - void MDL_context::release_statement_locks() { DBUG_ENTER("MDL_context::release_transactional_locks"); |