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/rpl_gtid.cc | |
| parent | e76e12886fd37094d95ca40b8cce45ca3ef28021 (diff) | |
| parent | 24ec8eaf66ecd864529309c5edcb8dd6b685f2aa (diff) | |
| download | mariadb-git-6a1e655cb0d400d8ed44fbfd22151b1d3e7f22d8.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/rpl_gtid.cc')
| -rw-r--r-- | sql/rpl_gtid.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/rpl_gtid.cc b/sql/rpl_gtid.cc index af0c4747d2b..bc06188af34 100644 --- a/sql/rpl_gtid.cc +++ b/sql/rpl_gtid.cc @@ -445,7 +445,7 @@ rpl_slave_state::truncate_state_table(THD *thd) close_thread_tables(thd); ha_commit_trans(thd, TRUE); } - thd->mdl_context.release_transactional_locks(); + thd->release_transactional_locks(); } return err; } @@ -736,7 +736,7 @@ end: if (in_transaction) thd->mdl_context.release_statement_locks(); else - thd->mdl_context.release_transactional_locks(); + thd->release_transactional_locks(); } thd->lex->restore_backup_query_tables_list(&lex_backup); thd->variables.option_bits= thd_saved_option; @@ -991,7 +991,7 @@ end: ha_rollback_trans(thd, FALSE); } close_thread_tables(thd); - thd->mdl_context.release_transactional_locks(); + thd->release_transactional_locks(); thd->lex->restore_backup_query_tables_list(&lex_backup); if (err) |