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
MariaDB · Jan 10, 2018 · a9c55c0 · a9c55c0
1 parent a408e88
commit a9c55c0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -2539,7 +2539,7 @@ log_group_read_log_seg(
 	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) {