diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-05 16:05:47 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-05 16:05:47 +0200 |
| commit | 03ff588d153f22f00ff00923e82498cbac63505f (patch) | |
| tree | e415dbf0def73c61587833066fd22d4538297a96 /storage/innobase/trx/trx0trx.cc | |
| parent | 33cf577ad86f3a7dd6ff86fee4ecd9c535161f02 (diff) | |
| parent | f6cb9e6e2dd0fb2e29a09030e74de7946139e1f4 (diff) | |
| download | mariadb-git-03ff588d153f22f00ff00923e82498cbac63505f.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'storage/innobase/trx/trx0trx.cc')
| -rw-r--r-- | storage/innobase/trx/trx0trx.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/innobase/trx/trx0trx.cc b/storage/innobase/trx/trx0trx.cc index 5f23a0ef1b2..526ed86d6db 100644 --- a/storage/innobase/trx/trx0trx.cc +++ b/storage/innobase/trx/trx0trx.cc @@ -1233,7 +1233,7 @@ inline void trx_t::commit_tables() const trx_id_t max_trx_id= trx_sys.get_max_trx_id(); const auto now= start_time; - for (const auto& p : mod_tables) + for (const auto &p : mod_tables) { dict_table_t *table= p.first; table->update_time= now; @@ -1337,7 +1337,6 @@ inline void trx_t::commit_in_memory(const mtr_t *mtr) release_locks(); id= 0; - DEBUG_SYNC_C("after_trx_committed_in_memory"); while (dict_table_t *table= UT_LIST_GET_FIRST(lock.evicted_tables)) |