diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-10-18 11:27:28 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-10-18 11:27:28 +0300 |
| commit | 22eb14645481e058b73cf4ffa04c278f3a5334c5 (patch) | |
| tree | 3f8e7f81e9b1765e3c7dbc3c4c1b5e3e40965767 /storage/innobase | |
| parent | 3eaae09669654a1846a6eff09408d65cd7a88056 (diff) | |
| parent | 56de2919781f0f8980510bd01f493f724e9538ab (diff) | |
| download | mariadb-git-22eb14645481e058b73cf4ffa04c278f3a5334c5.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase')
| -rw-r--r-- | storage/innobase/btr/btr0scrub.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/btr/btr0scrub.cc b/storage/innobase/btr/btr0scrub.cc index 25b2207d0cb..27539cb54ed 100644 --- a/storage/innobase/btr/btr0scrub.cc +++ b/storage/innobase/btr/btr0scrub.cc @@ -150,7 +150,7 @@ btr_scrub_lock_dict_func(ulint space_id, bool lock_to_close_table, "WARNING: %s:%u waited " TIMETPF " seconds for" " dict_sys lock, space: " ULINTPF " lock_to_close_table: %d\n", - file, line, long(now - start), space_id, + file, line, now - start, space_id, lock_to_close_table); last = now; |