diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-05 15:03:48 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-05 15:06:44 +0300 |
| commit | d3dcec5d657b83ca08b32f5a64b5dff01edfb13e (patch) | |
| tree | 5fd801aa0daf5e74689b17ed50a086a8acd7d6e7 /sql/lock.cc | |
| parent | b132b8895e2e59df457e063451f186b53576b034 (diff) | |
| parent | e8dd18a474ee6b48eb7f92e3831f9e359b0bdc6e (diff) | |
| download | mariadb-git-d3dcec5d657b83ca08b32f5a64b5dff01edfb13e.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/lock.cc')
| -rw-r--r-- | sql/lock.cc | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sql/lock.cc b/sql/lock.cc index fe745b49003..d53aad5a2ba 100644 --- a/sql/lock.cc +++ b/sql/lock.cc @@ -253,16 +253,11 @@ static void track_table_access(THD *thd, TABLE **tables, size_t count) { if (thd->variables.session_track_transaction_info > TX_TRACK_NONE) { - Transaction_state_tracker *tst= (Transaction_state_tracker *) - thd->session_tracker.get_tracker(TRANSACTION_INFO_TRACKER); - while (count--) { - TABLE *t= tables[count]; - - if (t) - tst->add_trx_state(thd, t->reginfo.lock_type, - t->file->has_transaction_manager()); + if (TABLE *t= tables[count]) + thd->session_tracker.transaction_info.add_trx_state(thd, + t->reginfo.lock_type, t->file->has_transaction_manager()); } } } |