diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-25 18:42:06 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-25 18:42:06 +0300 |
| commit | e9c1701e11e2441435223cc7c00c467f58aaff19 (patch) | |
| tree | 6be7d0e8fe87272e1abb2704fdb9859481d8acc2 /storage/innobase/trx/trx0roll.cc | |
| parent | 17794fb9aac9ca4fcb0b1e5904671a025a1b6b74 (diff) | |
| parent | f3eb82f048d342c11fc3869eca2e6faed9a4835d (diff) | |
| download | mariadb-git-e9c1701e11e2441435223cc7c00c467f58aaff19.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/innobase/trx/trx0roll.cc')
| -rw-r--r-- | storage/innobase/trx/trx0roll.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/trx/trx0roll.cc b/storage/innobase/trx/trx0roll.cc index 310e7982352..61f0ce57777 100644 --- a/storage/innobase/trx/trx0roll.cc +++ b/storage/innobase/trx/trx0roll.cc @@ -726,9 +726,9 @@ static my_bool trx_roll_count_callback(rw_trx_hash_element_t *element, /** Report progress when rolling back a row of a recovered transaction. */ void trx_roll_report_progress() { - ib_time_t time = ut_time(); + time_t now = time(NULL); mutex_enter(&recv_sys.mutex); - bool report = recv_sys.report(time); + bool report = recv_sys.report(now); mutex_exit(&recv_sys.mutex); if (report) { |