MariaDB · dr-m · Nov 12, 2025 · Dec 19, 2025 · Nov 12, 2025 · Dec 4, 2025
diff --git a/extra/mariabackup/backup_copy.cc b/extra/mariabackup/backup_copy.cc
@@ -1772,7 +1772,7 @@ copy_back()
 	if it exists. */
 
 	ds_tmp = ds_create(dst_dir, DS_TYPE_LOCAL);
-	if (!(ret = copy_or_move_file(ds_tmp, LOG_FILE_NAME, LOG_FILE_NAME,
+	if (!(ret = copy_or_move_file(ds_tmp, "ib_logfile0", "ib_logfile0",
 				      dst_dir, 1))) {
 		goto cleanup;
 	}
@@ -1869,7 +1869,7 @@ copy_back()
 		}
 
 		/* skip the redo log (it was already copied) */
-		if (!strcmp(filename, LOG_FILE_NAME)) {
+		if (!strcmp(filename, "ib_logfile0")) {
 			continue;
 		}
 

diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc
@@ -2705,7 +2705,7 @@ static bool innodb_init()
     srv_log_group_home_dir= xtrabackup_target_dir;
 
   bool ret;
-  const std::string ib_logfile0{get_log_file_path()};
+  const std::string ib_logfile0{log_sys.get_circular_path()};
   os_file_delete_if_exists_func(ib_logfile0.c_str(), nullptr);
   os_file_t file= os_file_create_func(ib_logfile0.c_str(),
                                       OS_FILE_CREATE,
@@ -5569,10 +5569,11 @@ static bool xtrabackup_backup_func()
 
 	/* open the log file */
 	memset(&stat_info, 0, sizeof(MY_STAT));
-	dst_log_file = ds_open(backup_datasinks.m_redo, LOG_FILE_NAME, &stat_info);
+	dst_log_file =
+		ds_open(backup_datasinks.m_redo, "ib_logfile0", &stat_info);
 	if (dst_log_file == NULL) {
-		msg("Error: failed to open the target stream for '%s'.",
-		    LOG_FILE_NAME);
+		msg("Error: failed to open the target stream"
+		    " for 'ib_logfile0'.");
 		goto fail;
 	}
 

diff --git a/mysql-test/include/innodb_encrypt_log.inc b/mysql-test/include/innodb_encrypt_log.inc
@@ -2,3 +2,7 @@
 # (see include/innodb_encrypt_log.combinations)
 
 --source include/have_innodb.inc
+if ($MTR_COMBINATION_CRYPT)
+{
+--source ../suite/encryption/include/skip_innodb_log_archive.inc
+}
diff --git a/mysql-test/mariadb-test-run.pl b/mysql-test/mariadb-test-run.pl
@@ -326,7 +326,7 @@ END
 my $opt_debug_sync_timeout= 300; # Default timeout for WAIT_FOR actions.
 my $warn_seconds = 60;
 
-my $rebootstrap_re= '--innodb[-_](?:page[-_]size|checksum[-_]algorithm|undo[-_]tablespaces|log[-_]group[-_]home[-_]dir|data[-_]home[-_]dir)|data[-_]file[-_]path|force_rebootstrap';
+my $rebootstrap_re= '--innodb[-_](?:page[-_]size|checksum[-_]algorithm|undo[-_]tablespaces|log[-_](group[-_]home[-_]dir|archive)|data[-_]home[-_]dir)|data[-_]file[-_]path|force_rebootstrap';
 
 sub testcase_timeout ($) { return $opt_testcase_timeout * 60; }
 sub check_timeout ($) { return testcase_timeout($_[0]); }
@@ -3145,7 +3145,7 @@ sub mysql_install_db {
   # need to be given to the bootstrap process as well as the
   # server process.
   foreach my $extra_opt ( @opt_extra_mysqld_opt ) {
-    if ($extra_opt =~ /--innodb/) {
+    if ($extra_opt =~ /--((loose|skip)[-_])*innodb/) {
       mtr_add_arg($args, $extra_opt);
     }
   }

diff --git a/mysql-test/suite/encryption/include/skip_innodb_log_archive.inc b/mysql-test/suite/encryption/include/skip_innodb_log_archive.inc
@@ -0,0 +1,12 @@
+--disable_query_log
+SET STATEMENT sql_log_bin=0 FOR
+call mtr.add_suppression("Plugin 'InnoDB' registration as a STORAGE ENGINE failed\\.");
+SET STATEMENT sql_log_bin=0 FOR
+call mtr.add_suppression("InnoDB: Plugin initialization aborted");
+SET STATEMENT sql_log_bin=0 FOR
+call mtr.add_suppression("InnoDB: ib_0.*\\.log does not match innodb_encrypt_log");
+--enable_query_log
+if (`SELECT COUNT(*)=0 FROM information_schema.global_variables where variable_name='innodb_log_archive' and variable_value='OFF'`)
+{
+  --skip Test requires innodb_log_archive=OFF
+}
diff --git a/mysql-test/suite/encryption/r/innodb_encrypt_log_corruption.result b/mysql-test/suite/encryption/r/innodb_encrypt_log_corruption.result
@@ -20,6 +20,13 @@ AND support IN ('YES', 'DEFAULT', 'ENABLED');
 ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS
 FOUND 1 /InnoDB: Upgrade after a crash is not supported. This redo log was created before MariaDB 10\.2\.2, and we did not find a valid checkpoint/ in mysqld.1.err
 # empty redo log from before MariaDB 10.2.2
+# restart: --innodb-data-home-dir=MYSQLTEST_VARDIR/tmp/log_corruption --innodb-log-group-home-dir=MYSQLTEST_VARDIR/tmp/log_corruption --innodb-log-recovery-target=12345
+SELECT COUNT(*) FROM INFORMATION_SCHEMA.ENGINES
+WHERE engine = 'innodb'
+AND support IN ('YES', 'DEFAULT', 'ENABLED');
+COUNT(*)
+0
+FOUND 1 /InnoDB: cannot fulfill innodb_log_recovery_target=12345!=/ in mysqld.1.err
 # restart: --innodb-data-home-dir=MYSQLTEST_VARDIR/tmp/log_corruption --innodb-log-group-home-dir=MYSQLTEST_VARDIR/tmp/log_corruption --innodb-force-recovery=5 --innodb-log-file-size=4m
 SELECT COUNT(*) FROM INFORMATION_SCHEMA.ENGINES
 WHERE engine = 'innodb'

diff --git a/mysql-test/suite/encryption/t/bulk_insert.test b/mysql-test/suite/encryption/t/bulk_insert.test
@@ -1,4 +1,5 @@
 --source include/have_innodb.inc
+--source include/skip_innodb_log_archive.inc # innodb_encrypt_log
 --source include/have_sequence.inc
 --source include/have_file_key_management_plugin.inc
 

diff --git a/mysql-test/suite/encryption/t/corrupted_during_recovery.test b/mysql-test/suite/encryption/t/corrupted_during_recovery.test
@@ -1,4 +1,5 @@
 --source include/have_innodb.inc
+--source ../../suite/innodb/include/skip_innodb_log_archive.inc # FIXME
 --source include/have_file_key_management_plugin.inc
 
 --disable_query_log

diff --git a/mysql-test/suite/encryption/t/debug_key_management.test b/mysql-test/suite/encryption/t/debug_key_management.test
@@ -1,4 +1,5 @@
 -- source include/have_innodb.inc
+-- source include/skip_innodb_log_archive.inc # innodb_encrypt_log
 -- source include/have_debug.inc
 -- source include/innodb_undo_tablespaces.inc
 -- source include/not_embedded.inc

diff --git a/mysql-test/suite/encryption/t/doublewrite_debug.test b/mysql-test/suite/encryption/t/doublewrite_debug.test
@@ -1,4 +1,5 @@
 --source include/have_innodb.inc
+--source ../../suite/innodb/include/skip_innodb_log_archive.inc # FIXME
 --source include/have_debug.inc
 --source include/not_embedded.inc
 --source include/have_file_key_management_plugin.inc

diff --git a/mysql-test/suite/encryption/t/encrypt_and_grep.test b/mysql-test/suite/encryption/t/encrypt_and_grep.test
@@ -1,4 +1,5 @@
 -- source include/have_innodb.inc
+-- source include/skip_innodb_log_archive.inc # innodb_encrypt_log
 -- source include/innodb_undo_tablespaces.inc
 -- source include/have_file_key_management_plugin.inc
 

diff --git a/mysql-test/suite/encryption/t/encryption_force.test b/mysql-test/suite/encryption/t/encryption_force.test
@@ -1,4 +1,5 @@
 -- source include/have_innodb.inc
+-- source include/skip_innodb_log_archive.inc # innodb_encrypt_log
 -- source include/have_partition.inc
 -- source include/have_example_key_management_plugin.inc
 

diff --git a/mysql-test/suite/encryption/t/file_creation.test b/mysql-test/suite/encryption/t/file_creation.test
@@ -1,4 +1,5 @@
 --source include/have_innodb.inc
+--source ../../suite/innodb/include/skip_innodb_log_archive.inc # FIXME
 --source include/have_example_key_management_plugin.inc
 let $restart_noprint=2;
 # embedded does not support restart

diff --git a/mysql-test/suite/encryption/t/innodb-first-page-read.opt b/mysql-test/suite/encryption/t/innodb-first-page-read.opt
diff --git a/mysql-test/suite/encryption/t/innodb-key-rotation-disable.test b/mysql-test/suite/encryption/t/innodb-key-rotation-disable.test
@@ -1,4 +1,5 @@
 -- source include/have_innodb.inc
+-- source include/skip_innodb_log_archive.inc # innodb_encrypt_log
 -- source include/have_file_key_management_plugin.inc
 # not embedded because of restarts
 -- source include/not_embedded.inc

diff --git a/mysql-test/suite/encryption/t/innodb-page_encryption_log_encryption.test b/mysql-test/suite/encryption/t/innodb-page_encryption_log_encryption.test
@@ -1,4 +1,5 @@
 -- source include/have_innodb.inc
+-- source include/skip_innodb_log_archive.inc # innodb_encrypt_log
 -- source include/not_embedded.inc
 -- source include/have_file_key_management_plugin.inc
 

diff --git a/mysql-test/suite/encryption/t/innodb-redo-badkey.test b/mysql-test/suite/encryption/t/innodb-redo-badkey.test
@@ -1,4 +1,5 @@
 -- source include/have_innodb.inc
+--source ../../suite/innodb/include/skip_innodb_log_archive.inc # FIXME
 -- source include/have_file_key_management_plugin.inc
 # embedded does not support restart
 -- source include/not_embedded.inc

diff --git a/mysql-test/suite/encryption/t/innodb-redo-nokeys.test b/mysql-test/suite/encryption/t/innodb-redo-nokeys.test
@@ -1,4 +1,5 @@
 -- source include/have_innodb.inc
+--source ../../suite/innodb/include/skip_innodb_log_archive.inc # FIXME
 -- source include/have_file_key_management_plugin.inc
 # embedded does not support restart
 -- source include/not_embedded.inc

diff --git a/mysql-test/suite/encryption/t/innodb_encrypt_freed.test b/mysql-test/suite/encryption/t/innodb_encrypt_freed.test
@@ -1,4 +1,5 @@
 --source include/have_innodb.inc
+--source include/skip_innodb_log_archive.inc # innodb_encrypt_log
 --source include/have_example_key_management_plugin.inc
 --source include/have_debug.inc
 --source include/not_embedded.inc

diff --git a/mysql-test/suite/encryption/t/innodb_encrypt_log.test b/mysql-test/suite/encryption/t/innodb_encrypt_log.test
@@ -1,4 +1,5 @@
 -- source include/have_innodb.inc
+-- source include/skip_innodb_log_archive.inc # innodb_encrypt_log
 -- source include/not_embedded.inc
 -- source filekeys_plugin.inc
 

diff --git a/mysql-test/suite/encryption/t/innodb_encrypt_log_corruption.test b/mysql-test/suite/encryption/t/innodb_encrypt_log_corruption.test
@@ -1,3 +1,4 @@
+--source include/skip_innodb_log_archive.inc # innodb_encrypt_log
 --let $no_cleanup=1
 --source ../../innodb/t/log_corruption.test
 

diff --git a/mysql-test/suite/encryption/t/innodb_encryption-page-compression.test b/mysql-test/suite/encryption/t/innodb_encryption-page-compression.test
@@ -1,4 +1,5 @@
 -- source include/have_innodb.inc
+-- source include/skip_innodb_log_archive.inc # innodb_encrypt_log
 -- source include/have_example_key_management_plugin.inc
 -- source include/not_embedded.inc
 # This test is too slow for valgrind and causes innnodb semaphores to time out

diff --git a/mysql-test/suite/encryption/t/innodb_encryption.test b/mysql-test/suite/encryption/t/innodb_encryption.test
@@ -2,6 +2,7 @@
 #
 #
 -- source include/have_innodb.inc
+-- source include/skip_innodb_log_archive.inc # innodb_encrypt_log
 -- source include/have_example_key_management_plugin.inc
 -- source include/innodb_undo_tablespaces.inc
 

diff --git a/mysql-test/suite/encryption/t/innodb_encryption_discard_import.test b/mysql-test/suite/encryption/t/innodb_encryption_discard_import.test
@@ -1,4 +1,5 @@
 -- source include/have_innodb.inc
+-- source include/skip_innodb_log_archive.inc # innodb_encrypt_log
 -- source include/have_example_key_management_plugin.inc
 -- source include/not_valgrind.inc
 -- source include/not_embedded.inc

diff --git a/mysql-test/suite/encryption/t/innodb_encryption_tables.test b/mysql-test/suite/encryption/t/innodb_encryption_tables.test
@@ -1,4 +1,5 @@
 -- source include/have_innodb.inc
+-- source include/skip_innodb_log_archive.inc # innodb_encrypt_log
 -- source include/have_example_key_management_plugin.inc
 -- source include/not_embedded.inc
 # We can't run this test under valgrind as it 'takes forever'

diff --git a/mysql-test/suite/encryption/t/innodb_first_page.test b/mysql-test/suite/encryption/t/innodb_first_page.test
@@ -3,6 +3,7 @@
 #
 
 --source include/have_innodb.inc
+--source include/skip_innodb_log_archive.inc # innodb_encrypt_log
 --source include/have_file_key_management_plugin.inc
 --source include/innodb_undo_tablespaces.inc
 

diff --git a/mysql-test/suite/encryption/t/innodb_onlinealter_encryption.test b/mysql-test/suite/encryption/t/innodb_onlinealter_encryption.test
@@ -1,4 +1,5 @@
 -- source include/have_innodb.inc
+-- source include/skip_innodb_log_archive.inc # innodb_encrypt_log
 -- source include/have_file_key_management_plugin.inc
 # test uses restart
 -- source include/not_embedded.inc

diff --git a/mysql-test/suite/encryption/t/recovery_memory.test b/mysql-test/suite/encryption/t/recovery_memory.test
@@ -1,5 +1,6 @@
 --source include/have_debug.inc
 --source include/have_innodb.inc
+--source include/skip_innodb_log_archive.inc # innodb_encrypt_log
 --source include/have_sequence.inc
 --source filekeys_plugin.inc
 

diff --git a/mysql-test/suite/innodb/include/skip_innodb_log_archive.inc b/mysql-test/suite/innodb/include/skip_innodb_log_archive.inc
@@ -0,0 +1,4 @@
+if (`SELECT @@GLOBAL.innodb_log_archive`)
+{
+  --skip Test requires innodb_log_archive=OFF
+}
diff --git a/mysql-test/suite/innodb/r/corrupted_during_recovery.result b/mysql-test/suite/innodb/r/corrupted_during_recovery.result
@@ -1,14 +1,19 @@
-CREATE TABLE t1(a BIGINT PRIMARY KEY) ENGINE=InnoDB;
+CREATE TABLE t1(a BIGINT PRIMARY KEY) ENGINE=InnoDB STATS_PERSISTENT=0;
 INSERT INTO t1 VALUES(1);
+SET GLOBAL innodb_max_purge_lag_wait=0, innodb_log_checkpoint_now=ON;
 CREATE TABLE t2(a BIGINT PRIMARY KEY) ENGINE=InnoDB;
 INSERT INTO t1 VALUES(2);
 SET GLOBAL innodb_flush_log_at_trx_commit=1;
 INSERT INTO t2 VALUES(1);
 # Kill the server
+SELECT * FROM t2;
+Got one of the listed errors
+SELECT * FROM t2;
+ERROR 42000: Unknown storage engine 'InnoDB'
+FOUND 1 /InnoDB: impossible innodb_log_recovery_start=/ in mysqld.1.err
 # Corrupt the pages
 SELECT * FROM t1;
 ERROR 42000: Unknown storage engine 'InnoDB'
-FOUND 1 /InnoDB: Page \[page id: space=[1-9][0-9]*, page number=3\] log sequence number 1311768467463790320 is in the future!/ in mysqld.1.err
 SELECT * FROM t1;
 a
 1
@@ -18,6 +23,7 @@ a
 CHECK TABLE t2;
 Table	Op	Msg_type	Msg_text
 test.t2	check	status	OK
+FOUND 1 /InnoDB: Page \[page id: space=[1-9][0-9]*, page number=3\] log sequence number 1311768467463790320 is in the future!/ in mysqld.1.err
 DROP TABLE t1, t2;
 CREATE TABLE t1(pk SERIAL) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1),(2),(3);

diff --git a/mysql-test/suite/innodb/r/innodb-wl5522,strict_crc32.rdiff b/mysql-test/suite/innodb/r/innodb-wl5522,strict_crc32.rdiff
@@ -1,12 +1,33 @@
 --- innodb-wl5522.result
 +++ innodb-wl5522,strict_crc32.result~
-@@ -131,8 +131,7 @@
+@@ -1,9 +1,6 @@
+ call mtr.add_suppression("InnoDB: Unable to import tablespace .* because it already exists.  Please DISCARD the tablespace before IMPORT\\.");
+ call mtr.add_suppression("Index for table 't2' is corrupt; try to repair it");
+ call mtr.add_suppression("InnoDB: Cannot save statistics for table `test`\\.`t1` because the \\.ibd file is missing");
+-call mtr.add_suppression("InnoDB: cannot fulfill innodb_log_recovery_target=123456<");
+-call mtr.add_suppression("InnoDB: Plugin initialization aborted");
+-call mtr.add_suppression("Plugin 'InnoDB' registration as a STORAGE ENGINE failed\\.");
+ FLUSH TABLES;
+ CREATE TABLE t1
+ (a INT AUTO_INCREMENT PRIMARY KEY,
+@@ -37,10 +34,6 @@
+ t1.ibd
+ t2.frm
+ t2.ibd
+-# restart: --innodb-log-recovery-target=123456
+-FOUND 1 /InnoDB: cannot fulfill innodb_log_recovery_target=123456</ in mysqld.1.err
+-FLUSH TABLE t1, t2 FOR EXPORT;
+-ERROR 42000: Unknown storage engine 'InnoDB'
+ # restart
+ FLUSH TABLE t1, t2 FOR EXPORT;
+ # List before copying files
+@@ -138,8 +131,7 @@
  ALTER TABLE t2 IMPORT TABLESPACE;
  ERROR HY000: Schema mismatch (Table flags don't match, server table has 0x21 and the meta-data file has 0x1; .cfg file uses ROW_FORMAT=COMPACT)
  ALTER TABLE t2 IMPORT TABLESPACE;
 -Warnings:
 -Warning	1810	IO Read error: (2, No such file or directory) Error opening './test/t2.cfg', will attempt to import without schema verification
 +ERROR HY000: Schema mismatch (Expected FSP_SPACE_FLAGS=0x*, .ibd file contains 0x*.)
  DROP TABLE t2;
- SET GLOBAL innodb_file_per_table = 1;
  SELECT @@innodb_file_per_table;
+ @@innodb_file_per_table
diff --git a/mysql-test/suite/innodb/r/innodb-wl5522.result b/mysql-test/suite/innodb/r/innodb-wl5522.result
@@ -1,6 +1,9 @@
 call mtr.add_suppression("InnoDB: Unable to import tablespace .* because it already exists.  Please DISCARD the tablespace before IMPORT\\.");
 call mtr.add_suppression("Index for table 't2' is corrupt; try to repair it");
 call mtr.add_suppression("InnoDB: Cannot save statistics for table `test`\\.`t1` because the \\.ibd file is missing");
+call mtr.add_suppression("InnoDB: cannot fulfill innodb_log_recovery_target=123456<");
+call mtr.add_suppression("InnoDB: Plugin initialization aborted");
+call mtr.add_suppression("Plugin 'InnoDB' registration as a STORAGE ENGINE failed\\.");
 FLUSH TABLES;
 CREATE TABLE t1
 (a INT AUTO_INCREMENT PRIMARY KEY,
@@ -34,6 +37,10 @@ t1.frm
 t1.ibd
 t2.frm
 t2.ibd
+# restart: --innodb-log-recovery-target=123456
+FOUND 1 /InnoDB: cannot fulfill innodb_log_recovery_target=123456</ in mysqld.1.err
+FLUSH TABLE t1, t2 FOR EXPORT;
+ERROR 42000: Unknown storage engine 'InnoDB'
 # restart
 FLUSH TABLE t1, t2 FOR EXPORT;
 # List before copying files

diff --git a/mysql-test/suite/innodb/r/innodb_force_recovery.result b/mysql-test/suite/innodb/r/innodb_force_recovery.result
@@ -3,6 +3,13 @@ create table t2(f1 int primary key, f2 int, index idx(f2))engine=innodb;
 insert into t1 values(1, 2);
 insert into t2 values(1, 2);
 SET GLOBAL innodb_fast_shutdown = 0;
+# restart: --innodb-log-recovery-target=20480
+SELECT COUNT(*) FROM INFORMATION_SCHEMA.ENGINES
+WHERE engine = 'innodb'
+AND support IN ('YES', 'DEFAULT', 'ENABLED');
+COUNT(*)
+0
+FOUND 1 /InnoDB: cannot fulfill innodb_log_recovery_target=20480</ in mysqld.1.err
 # restart: --innodb-force-recovery=4
 select variable_name,variable_value from information_schema.global_status
 WHERE variable_name LIKE 'innodb_buffer_pool_%_requests';

diff --git a/mysql-test/suite/innodb/r/innodb_status_variables.result b/mysql-test/suite/innodb/r/innodb_status_variables.result
@@ -51,6 +51,7 @@ INNODB_LOG_WRITES
 INNODB_LSN_CURRENT
 INNODB_LSN_FLUSHED
 INNODB_LSN_LAST_CHECKPOINT
+INNODB_LSN_ARCHIVED
 INNODB_MASTER_THREAD_ACTIVE_LOOPS
 INNODB_MASTER_THREAD_IDLE_LOOPS
 INNODB_MAX_TRX_ID

diff --git a/mysql-test/suite/innodb/r/log_corruption.result b/mysql-test/suite/innodb/r/log_corruption.result
@@ -20,6 +20,13 @@ AND support IN ('YES', 'DEFAULT', 'ENABLED');
 ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS
 FOUND 1 /InnoDB: Upgrade after a crash is not supported. This redo log was created before MariaDB 10\.2\.2, and we did not find a valid checkpoint/ in mysqld.1.err
 # empty redo log from before MariaDB 10.2.2
+# restart: --innodb-data-home-dir=MYSQLTEST_VARDIR/tmp/log_corruption --innodb-log-group-home-dir=MYSQLTEST_VARDIR/tmp/log_corruption --innodb-log-recovery-target=12345
+SELECT COUNT(*) FROM INFORMATION_SCHEMA.ENGINES
+WHERE engine = 'innodb'
+AND support IN ('YES', 'DEFAULT', 'ENABLED');
+COUNT(*)
+0
+FOUND 1 /InnoDB: cannot fulfill innodb_log_recovery_target=12345!=/ in mysqld.1.err
 # restart: --innodb-data-home-dir=MYSQLTEST_VARDIR/tmp/log_corruption --innodb-log-group-home-dir=MYSQLTEST_VARDIR/tmp/log_corruption --innodb-force-recovery=5 --innodb-log-file-size=4m
 SELECT COUNT(*) FROM INFORMATION_SCHEMA.ENGINES
 WHERE engine = 'innodb'