summaryrefslogtreecommitdiff
path: root/storage/innobase/include/trx0trx.h
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-07-25 15:31:11 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-07-25 15:31:11 +0300
commitfdef9f9b8960479919285d6aec0bb30d27fa4723 (patch)
treef358b0f34305572ddf5b4fd2466c3a09ba37c7db /storage/innobase/include/trx0trx.h
parent55d8ff0de8168d3b7d465644dc93dca01f53f4f6 (diff)
parenta7e9395f9de0cc19cf79064f5df796d98ec19762 (diff)
downloadmariadb-git-fdef9f9b8960479919285d6aec0bb30d27fa4723.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/include/trx0trx.h')
-rw-r--r--storage/innobase/include/trx0trx.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/storage/innobase/include/trx0trx.h b/storage/innobase/include/trx0trx.h
index 46d1ea7efe4..e537bf80fe2 100644
--- a/storage/innobase/include/trx0trx.h
+++ b/storage/innobase/include/trx0trx.h
@@ -918,10 +918,11 @@ public:
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. */