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/trx/trx0i_s.cc | |
| parent | ee555f8fc5fed02503d45cc4ad0d08b07d5a6355 (diff) | |
| parent | 8d0dabc56b09c6b40db15aac7da0da43d988759d (diff) | |
| download | mariadb-git-b6ac67389dfed3255004b82d29625577c3335a0a.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'storage/innobase/trx/trx0i_s.cc')
| -rw-r--r-- | storage/innobase/trx/trx0i_s.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/trx/trx0i_s.cc b/storage/innobase/trx/trx0i_s.cc index bdd62528a22..6dba53dee6b 100644 --- a/storage/innobase/trx/trx0i_s.cc +++ b/storage/innobase/trx/trx0i_s.cc @@ -456,7 +456,7 @@ fill_trx_row( ut_ad(lock_mutex_own()); row->trx_id = trx_get_id_for_print(trx); - row->trx_started = (ib_time_t) trx->start_time; + row->trx_started = trx->start_time; row->trx_state = trx_get_que_state_str(trx); row->requested_lock_row = requested_lock_row; ut_ad(requested_lock_row == NULL @@ -465,7 +465,7 @@ fill_trx_row( if (trx->lock.wait_lock != NULL) { ut_a(requested_lock_row != NULL); - row->trx_wait_started = (ib_time_t) trx->lock.wait_started; + row->trx_wait_started = trx->lock.wait_started; } else { ut_a(requested_lock_row == NULL); row->trx_wait_started = 0; |