Merge MDEV-37949

Author: dr-m

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;
 		}
 

extra/mariabackup/xtrabackup.cc

@@ -2710,7 +2710,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,
@@ -4890,6 +4890,8 @@ static bool backup_wait_for_commit_lsn()
   lsn_t last_lsn= recv_sys.lsn;
 
   /* read the latest checkpoint lsn */
+  log_sys.last_checkpoint_lsn= 0;
+  recv_sys.file_checkpoint= 0;
   if (recv_sys.find_checkpoint() == DB_SUCCESS && log_sys.is_latest())
   {
     metadata_to_lsn= log_sys.last_checkpoint_lsn;
@@ -5487,6 +5489,7 @@ static bool xtrabackup_backup_func()
 
 	srv_n_purge_threads = 1;
 	srv_read_only_mode = TRUE;
+	recv_sys.rpo = LSN_MAX;
 
 	srv_operation = SRV_OPERATION_BACKUP;
 	log_file_op = backup_file_op;
@@ -5578,10 +5581,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;
 	}
 

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
+}

mysql-test/main/analyze_engine_stats2.result

@@ -18,7 +18,7 @@ repeat(uuid(), 7)
 from seq_1_to_16384;
 commit;
 SET GLOBAL innodb_fast_shutdown=0;
-# restart
+# restart: --innodb-log-recovery-start=0
 set log_slow_verbosity='engine';
 set long_query_time=0.0;
 set @js='$analyze_output';

mysql-test/main/analyze_engine_stats2.test

@@ -32,6 +32,8 @@ from seq_1_to_16384;
 commit;
 
 SET GLOBAL innodb_fast_shutdown=0;
+# Avoid any crash recovery that would load pages.
+--let $restart_parameters=--innodb-log-recovery-start=0
 source include/restart_mysqld.inc;
 set log_slow_verbosity='engine';
 set long_query_time=0.0;

mysql-test/main/analyze_stmt_prefetch_count.result

@@ -19,7 +19,7 @@ commit;
 # (in the test's .opt file we've disabled buffer pool saving/loading 
 #  and also tried to disable any background activity)
 SET GLOBAL innodb_fast_shutdown=0;
-# restart
+# restart: --innodb-log-recovery-start=0
 set @innodb_pages_read0= 
 (select variable_value 
 from information_schema.session_status 

mysql-test/main/analyze_stmt_prefetch_count.test

@@ -28,6 +28,8 @@ commit;
 --echo # (in the test's .opt file we've disabled buffer pool saving/loading 
 --echo #  and also tried to disable any background activity)
 SET GLOBAL innodb_fast_shutdown=0;
+# Avoid any crash recovery that would load pages.
+--let $restart_parameters=--innodb-log-recovery-start=0
 --source include/restart_mysqld.inc
 
 set @innodb_pages_read0= 

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);
     }
   }

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
+}

mysql-test/suite/encryption/r/doublewrite_debug.result

@@ -82,7 +82,7 @@ set global innodb_buf_flush_list_now = 1;
 # restart
 FOUND 1 /InnoDB: Encrypted page \[page id: space=[1-9]*, page number=3\] in file .*test.t1.ibd looks corrupted/ in mysqld.1.err
 select * from t1;
-ERROR 42000: Unknown storage engine 'InnoDB'
+Got one of the listed errors
 # shutdown server
 # remove datadir
 # xtrabackup move back