diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-12-02 16:16:29 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-12-02 16:16:29 +0200 |
| commit | 24ec8eaf66ecd864529309c5edcb8dd6b685f2aa (patch) | |
| tree | 092e6e25b30833ee3521d1179b1b8767db020981 /sql/mdl.cc | |
| parent | 589cf8dbf3accf57673d7e2f7a4435f7eaf33565 (diff) | |
| download | mariadb-git-24ec8eaf66ecd864529309c5edcb8dd6b685f2aa.tar.gz | |
MDEV-15532 after-merge fixes from Monty
The Galera tests were massively failing with debug assertions.
Diffstat (limited to 'sql/mdl.cc')
| -rw-r--r-- | sql/mdl.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/mdl.cc b/sql/mdl.cc index ebe1bb75927..93b7982c4a5 100644 --- a/sql/mdl.cc +++ b/sql/mdl.cc @@ -3033,18 +3033,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(!(current_thd->server_status & + 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"); |