diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-25 12:08:50 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-25 12:14:27 +0300 |
| commit | b6ac67389dfed3255004b82d29625577c3335a0a (patch) | |
| tree | ca6d71736e041ee0f8db949f2609a395b9e724c7 /storage/innobase/include/trx0trx.h | |
| parent | ee555f8fc5fed02503d45cc4ad0d08b07d5a6355 (diff) | |
| parent | 8d0dabc56b09c6b40db15aac7da0da43d988759d (diff) | |
| download | mariadb-git-b6ac67389dfed3255004b82d29625577c3335a0a.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'storage/innobase/include/trx0trx.h')
| -rw-r--r-- | storage/innobase/include/trx0trx.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/storage/innobase/include/trx0trx.h b/storage/innobase/include/trx0trx.h index b2ab4979e26..4ab29e08e0f 100644 --- a/storage/innobase/include/trx0trx.h +++ b/storage/innobase/include/trx0trx.h @@ -963,10 +963,11 @@ struct trx_t { on dict_operation_lock. Protected by dict_operation_lock. */ - time_t start_time; /*!< time the state last time became - TRX_STATE_ACTIVE */ - ib_uint64_t start_time_micro; /*!< start time of transaction in - microseconds */ + /** wall-clock time of the latest transition to TRX_STATE_ACTIVE; + used for diagnostic purposes only */ + time_t start_time; + /** microsecond_interval_timer() of transaction start */ + ulonglong start_time_micro; lsn_t commit_lsn; /*!< lsn at the time of the commit */ table_id_t table_id; /*!< Table to drop iff dict_operation == TRX_DICT_OP_TABLE, or 0. */ |