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_rli.cc | |
| parent | e76e12886fd37094d95ca40b8cce45ca3ef28021 (diff) | |
| parent | 24ec8eaf66ecd864529309c5edcb8dd6b685f2aa (diff) | |
| download | mariadb-git-6a1e655cb0d400d8ed44fbfd22151b1d3e7f22d8.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/rpl_rli.cc')
| -rw-r--r-- | sql/rpl_rli.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc index b7127d86fcd..8b61a3a708b 100644 --- a/sql/rpl_rli.cc +++ b/sql/rpl_rli.cc @@ -1677,7 +1677,7 @@ end: { *out_hton= table->s->db_type(); close_thread_tables(thd); - thd->mdl_context.release_transactional_locks(); + thd->release_transactional_locks(); } return err; } @@ -1704,7 +1704,7 @@ scan_all_gtid_slave_pos_table(THD *thd, int (*cb)(THD *, LEX_CSTRING *, void *), { my_error(ER_FILE_NOT_FOUND, MYF(0), path, my_errno); close_thread_tables(thd); - thd->mdl_context.release_transactional_locks(); + thd->release_transactional_locks(); return 1; } else @@ -1717,7 +1717,7 @@ scan_all_gtid_slave_pos_table(THD *thd, int (*cb)(THD *, LEX_CSTRING *, void *), err= ha_discover_table_names(thd, &MYSQL_SCHEMA_NAME, dirp, &tl, false); my_dirend(dirp); close_thread_tables(thd); - thd->mdl_context.release_transactional_locks(); + thd->release_transactional_locks(); if (err) return err; @@ -2003,7 +2003,7 @@ end: ha_commit_trans(thd, FALSE); ha_commit_trans(thd, TRUE); close_thread_tables(thd); - thd->mdl_context.release_transactional_locks(); + thd->release_transactional_locks(); } return err; @@ -2292,7 +2292,7 @@ void rpl_group_info::cleanup_context(THD *thd, bool error) if (thd->transaction->xid_state.is_explicit_XA()) xa_trans_force_rollback(thd); - thd->mdl_context.release_transactional_locks(); + thd->release_transactional_locks(); if (thd == rli->sql_driver_thd) { @@ -2406,10 +2406,10 @@ void rpl_group_info::slave_close_thread_tables(THD *thd) if (thd->transaction_rollback_request) { trans_rollback_implicit(thd); - thd->mdl_context.release_transactional_locks(); + thd->release_transactional_locks(); } else if (! thd->in_multi_stmt_transaction_mode()) - thd->mdl_context.release_transactional_locks(); + thd->release_transactional_locks(); else thd->mdl_context.release_statement_locks(); |