diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-12-01 14:55:46 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-12-01 14:55:46 +0200 |
| commit | 81ab9ea63f5d3ad4909bb75552008d6b035a371b (patch) | |
| tree | 6e65113d85d36c9f488da15540ddd601e7641fee /sql/mdl.cc | |
| parent | c537576495e1e651bf3dc63e5a569fcddd9fbec8 (diff) | |
| parent | e6b3e38d62d13206ae982fc7b740d5d8024b207a (diff) | |
| download | mariadb-git-81ab9ea63f5d3ad4909bb75552008d6b035a371b.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/mdl.cc')
| -rw-r--r-- | sql/mdl.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/mdl.cc b/sql/mdl.cc index 8d6780671d1..952648ce2d8 100644 --- a/sql/mdl.cc +++ b/sql/mdl.cc @@ -2845,6 +2845,9 @@ void MDL_context::rollback_to_savepoint(const MDL_savepoint &mdl_savepoint) void MDL_context::release_transactional_locks() { DBUG_ENTER("MDL_context::release_transactional_locks"); + /* Fail if there are active transactions */ + DBUG_ASSERT(!(current_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; |