diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-12-01 19:51:14 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-12-01 19:51:14 +0200 |
| commit | 589cf8dbf3accf57673d7e2f7a4435f7eaf33565 (patch) | |
| tree | aa38a67d10f71fc781188341857e34d437fa9199 /sql/mdl.cc | |
| parent | a3531775b1efe06e2439a0c8ab668a2b69c859eb (diff) | |
| parent | e30a05f4540b581df2e7d98bd7e812aeff603744 (diff) | |
| download | mariadb-git-589cf8dbf3accf57673d7e2f7a4435f7eaf33565.tar.gz | |
Merge 10.3 into 10.4
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 54128c2ee97..ebe1bb75927 100644 --- a/sql/mdl.cc +++ b/sql/mdl.cc @@ -3036,6 +3036,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; |