diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-06 12:25:41 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-06 12:29:25 +0300 |
| commit | 3498a656c90a579ab0bb26a3566c14474b5ad6aa (patch) | |
| tree | dcf8ef4e3e9a71ed1b3cffbf8fb79dbfd0c5113d /storage/xtradb/log | |
| parent | d61ed5dd8a7e63cebf52efc2d067706263df2061 (diff) | |
| download | mariadb-git-3498a656c90a579ab0bb26a3566c14474b5ad6aa.tar.gz | |
MDEV-14705: Follow-up fixes
buf_flush_remove(): Disable the output for now, because we
certainly do not want this after every page flush on shutdown.
It must be rate-limited somehow. There already is a timeout
extension for waiting the page cleaner to exit in
logs_empty_and_mark_files_at_shutdown().
log_write_up_to(): Use correct format.
srv_purge_should_exit(): Move the timeout extension to the
appropriate place, from one of the callers.
Diffstat (limited to 'storage/xtradb/log')
| -rw-r--r-- | storage/xtradb/log/log0log.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/xtradb/log/log0log.cc b/storage/xtradb/log/log0log.cc index 4387dddc16a..6acafeb4dab 100644 --- a/storage/xtradb/log/log0log.cc +++ b/storage/xtradb/log/log0log.cc @@ -2,7 +2,7 @@ Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2009, Google Inc. -Copyright (c) 2014, 2017, MariaDB Corporation. +Copyright (c) 2014, 2018, MariaDB Corporation. Portions of this file contain modifications contributed and copyrighted by Google, Inc. Those modifications are gratefully acknowledged and are described @@ -1563,7 +1563,7 @@ log_write_up_to( if (srv_shutdown_state != SRV_SHUTDOWN_NONE) { service_manager_extend_timeout(INNODB_EXTEND_TIMEOUT_INTERVAL, - "log write up to: %llu", lsn); + "log write up to: " LSNPF, lsn); } loop: |