diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-10 10:21:52 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-10 10:21:52 +0200 |
| commit | a9c55c0059351220674a1dd3d3bf8d4e884b3285 (patch) | |
| tree | f86148c5a37e3b507f80b0e29b978f16782b9f41 | |
| parent | a408e881cf73d06fc92097fce6ef9584e16edf77 (diff) | |
| download | mariadb-git-a9c55c0059351220674a1dd3d3bf8d4e884b3285.tar.gz | |
MDEV-13814 Extra logging when innodb_log_archive=ON
Backport the fix from 10.0.33 to 5.5, in case someone compiles XtraDB
with -DUNIV_LOG_ARCHIVE
| -rw-r--r-- | mysql-test/suite/innodb/t/innodb-master.opt | 1 | ||||
| -rw-r--r-- | storage/xtradb/log/log0log.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/suite/innodb/t/innodb-master.opt b/mysql-test/suite/innodb/t/innodb-master.opt index 8d9b0302a9e..2e71d62206d 100644 --- a/mysql-test/suite/innodb/t/innodb-master.opt +++ b/mysql-test/suite/innodb/t/innodb-master.opt @@ -3,3 +3,4 @@ --innodb-strict-mode=0 --innodb-file-per-table=0 --loose-innodb-track-changed-pages +--loose-innodb-log-archive diff --git a/storage/xtradb/log/log0log.c b/storage/xtradb/log/log0log.c index bed7e31da28..1f9003aa66e 100644 --- a/storage/xtradb/log/log0log.c +++ b/storage/xtradb/log/log0log.c @@ -2539,7 +2539,7 @@ loop: start_lsn += len; buf += len; - if (recv_sys) { + if (recv_recovery_is_on()) { ib_time_t time = ut_time(); if (recv_sys->progress_time - time >= 15) { |