diff options
Diffstat (limited to 'mysql-test/suite/mariabackup')
49 files changed, 108 insertions, 61 deletions
diff --git a/mysql-test/suite/mariabackup/absolute_ibdata_paths.result b/mysql-test/suite/mariabackup/absolute_ibdata_paths.result index fe211e71f2f..a29d9af65de 100644 --- a/mysql-test/suite/mariabackup/absolute_ibdata_paths.result +++ b/mysql-test/suite/mariabackup/absolute_ibdata_paths.result @@ -1,9 +1,11 @@ CREATE TABLE t(i INT) ENGINE INNODB; INSERT INTO t VALUES(1); +# restart # xtrabackup backup # remove datadir # xtrabackup copy back # restart server +# restart SELECT * from t; i 1 diff --git a/mysql-test/suite/mariabackup/apply-log-only-incr.result b/mysql-test/suite/mariabackup/apply-log-only-incr.result index 917a9647511..f84e8ea5607 100644 --- a/mysql-test/suite/mariabackup/apply-log-only-incr.result +++ b/mysql-test/suite/mariabackup/apply-log-only-incr.result @@ -22,7 +22,7 @@ count(*) # shutdown server # remove datadir # xtrabackup move back -# restart server +# restart: --innodb-force-recovery=3 SELECT COUNT(*) FROM t; COUNT(*) 1 @@ -30,6 +30,7 @@ SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; SELECT COUNT(*) FROM t; COUNT(*) 201 +# restart SELECT * FROM t; a 0 diff --git a/mysql-test/suite/mariabackup/backup_ssl.result b/mysql-test/suite/mariabackup/backup_ssl.result index 6e59da6d43a..099b8d42a85 100644 --- a/mysql-test/suite/mariabackup/backup_ssl.result +++ b/mysql-test/suite/mariabackup/backup_ssl.result @@ -5,5 +5,5 @@ FLUSH PRIVILEGES; # shutdown server # remove datadir # xtrabackup move back -# restart server +# restart DROP USER backup_user; diff --git a/mysql-test/suite/mariabackup/big_innodb_log.result b/mysql-test/suite/mariabackup/big_innodb_log.result index 6577c0c9aae..7bd5d20049d 100644 --- a/mysql-test/suite/mariabackup/big_innodb_log.result +++ b/mysql-test/suite/mariabackup/big_innodb_log.result @@ -1,4 +1,5 @@ # Kill the server +# restart: --debug-dbug=+d,innodb_small_log_block_no_limit CREATE TABLE t(i INT) ENGINE InnoDB; INSERT INTO t VALUES (0), (1), (2), (3), (4), (5), (6), (7), (8), (9), @@ -20,7 +21,7 @@ count(*) # shutdown server # remove datadir # xtrabackup move back -# restart server +# restart: --debug-dbug=+d,innodb_small_log_block_no_limit SELECT count(*) FROM t WHERE i = 0; count(*) 0 @@ -28,3 +29,4 @@ Ok Ok DROP TABLE t; # Kill the server +# restart diff --git a/mysql-test/suite/mariabackup/compress_qpress.result b/mysql-test/suite/mariabackup/compress_qpress.result index 69427f5fc4d..ff940813440 100644 --- a/mysql-test/suite/mariabackup/compress_qpress.result +++ b/mysql-test/suite/mariabackup/compress_qpress.result @@ -9,7 +9,7 @@ t.ibd.qp # shutdown server # remove datadir # xtrabackup move back -# restart server +# restart SELECT * FROM t; i 1 diff --git a/mysql-test/suite/mariabackup/create_during_backup.result b/mysql-test/suite/mariabackup/create_during_backup.result index f99c2633ab5..374c3dfc137 100644 --- a/mysql-test/suite/mariabackup/create_during_backup.result +++ b/mysql-test/suite/mariabackup/create_during_backup.result @@ -3,7 +3,7 @@ # shutdown server # remove datadir # xtrabackup move back -# restart server +# restart SELECT COUNT(*) from t1; COUNT(*) 10000 diff --git a/mysql-test/suite/mariabackup/create_with_data_directory_during_backup.result b/mysql-test/suite/mariabackup/create_with_data_directory_during_backup.result index a06150bcb6a..be97675c40f 100644 --- a/mysql-test/suite/mariabackup/create_with_data_directory_during_backup.result +++ b/mysql-test/suite/mariabackup/create_with_data_directory_during_backup.result @@ -4,7 +4,7 @@ DROP TABLE t; # shutdown server # remove datadir # xtrabackup move back -# restart server +# restart SELECT * FROM t; i DROP TABLE t; diff --git a/mysql-test/suite/mariabackup/data_directory.result b/mysql-test/suite/mariabackup/data_directory.result index e7201918cbd..4e45127bd6a 100644 --- a/mysql-test/suite/mariabackup/data_directory.result +++ b/mysql-test/suite/mariabackup/data_directory.result @@ -6,7 +6,7 @@ DROP TABLE t; # shutdown server # remove datadir # xtrabackup move back -# restart server +# restart SELECT * FROM t; a 1 diff --git a/mysql-test/suite/mariabackup/drop_table_during_backup.result b/mysql-test/suite/mariabackup/drop_table_during_backup.result index 8a77945e586..a0fa9db5b94 100644 --- a/mysql-test/suite/mariabackup/drop_table_during_backup.result +++ b/mysql-test/suite/mariabackup/drop_table_during_backup.result @@ -7,7 +7,7 @@ CREATE TABLE t5 (i int) ENGINE=INNODB; # shutdown server # remove datadir # xtrabackup move back -# restart server +# restart CREATE TABLE t1(i int); DROP TABLE t1; CREATE TABLE t2(i int); diff --git a/mysql-test/suite/mariabackup/encrypted_page_compressed.result b/mysql-test/suite/mariabackup/encrypted_page_compressed.result index 293addd2b03..de4c966caf4 100644 --- a/mysql-test/suite/mariabackup/encrypted_page_compressed.result +++ b/mysql-test/suite/mariabackup/encrypted_page_compressed.result @@ -1,7 +1,9 @@ call mtr.add_suppression("InnoDB: Table `test`.`t1` has an unreadable root page"); +call mtr.add_suppression("InnoDB: Encrypted page .* in file .*test.t1\\.ibd looks corrupted; key_version=1"); CREATE TABLE t1 (a INT AUTO_INCREMENT PRIMARY KEY, b TEXT, c char(200)) ENGINE=InnoDB page_compressed=yes encrypted=yes; insert into t1(b, c) values("mariadb", "mariabackup"); # Corrupt the table +# restart # xtrabackup backup FOUND 1 /Database page corruption detected.*/ in backup.log drop table t1; diff --git a/mysql-test/suite/mariabackup/encrypted_page_compressed.test b/mysql-test/suite/mariabackup/encrypted_page_compressed.test index b0bcdd9e33b..54fffb7d08f 100644 --- a/mysql-test/suite/mariabackup/encrypted_page_compressed.test +++ b/mysql-test/suite/mariabackup/encrypted_page_compressed.test @@ -1,5 +1,6 @@ source include/have_file_key_management.inc; call mtr.add_suppression("InnoDB: Table `test`.`t1` has an unreadable root page"); +call mtr.add_suppression("InnoDB: Encrypted page .* in file .*test.t1\\.ibd looks corrupted; key_version=1"); CREATE TABLE t1 (a INT AUTO_INCREMENT PRIMARY KEY, b TEXT, c char(200)) ENGINE=InnoDB page_compressed=yes encrypted=yes; insert into t1(b, c) values("mariadb", "mariabackup"); diff --git a/mysql-test/suite/mariabackup/encrypted_page_corruption,full_crc32.rdiff b/mysql-test/suite/mariabackup/encrypted_page_corruption,full_crc32.rdiff new file mode 100644 index 00000000000..3326f0ca3d3 --- /dev/null +++ b/mysql-test/suite/mariabackup/encrypted_page_corruption,full_crc32.rdiff @@ -0,0 +1,9 @@ +--- encrypted_page_corruption,crc32.result ++++ encrypted_page_corruption,full_crc32.result +@@ -5,5 +5,5 @@ + # Corrupt the table + # restart + # xtrabackup backup +-FOUND 1 /Database page corruption detected.*/ in backup.log ++NOT FOUND /Database page corruption detected.*/ in backup.log + drop table t1; diff --git a/mysql-test/suite/mariabackup/encrypted_page_corruption.combinations b/mysql-test/suite/mariabackup/encrypted_page_corruption.combinations new file mode 100644 index 00000000000..79e5f7836ed --- /dev/null +++ b/mysql-test/suite/mariabackup/encrypted_page_corruption.combinations @@ -0,0 +1,5 @@ +[crc32] +--innodb-checksum-algorithm=crc32 + +[full_crc32] +--innodb-checksum-algorithm=full_crc32 diff --git a/mysql-test/suite/mariabackup/encrypted_page_corruption.result b/mysql-test/suite/mariabackup/encrypted_page_corruption.result index 9a6202a5ea1..b328d361cd6 100644 --- a/mysql-test/suite/mariabackup/encrypted_page_corruption.result +++ b/mysql-test/suite/mariabackup/encrypted_page_corruption.result @@ -3,6 +3,7 @@ call mtr.add_suppression("\\[ERROR\\] InnoDB: Table `test`\\.`t1` has an unreada CREATE TABLE t1(c VARCHAR(128)) ENGINE INNODB, encrypted=yes; insert into t1 select repeat('a',100); # Corrupt the table +# restart # xtrabackup backup FOUND 1 /Database page corruption detected.*/ in backup.log drop table t1; diff --git a/mysql-test/suite/mariabackup/encrypted_page_corruption.test b/mysql-test/suite/mariabackup/encrypted_page_corruption.test index 5ba77597b35..1beb020b463 100644 --- a/mysql-test/suite/mariabackup/encrypted_page_corruption.test +++ b/mysql-test/suite/mariabackup/encrypted_page_corruption.test @@ -19,27 +19,36 @@ use warnings; use Fcntl qw(:DEFAULT :seek); do "$ENV{MTR_SUITE_DIR}/../innodb/include/crc32.pl"; -my $page_size = $ENV{INNODB_PAGE_SIZE}; +my $ps = $ENV{INNODB_PAGE_SIZE}; sysopen IBD_FILE, "$ENV{MYSQLD_DATADIR}/test/t1.ibd", O_RDWR || die "Cannot open t1.ibd\n"; -sysread(IBD_FILE, $_, 38) || die "Cannot read t1.ibd\n"; +sysread(IBD_FILE, $_, 58) || die "Cannot read t1.ibd\n"; my $space = unpack("x[34]N", $_); -sysseek(IBD_FILE, $page_size * 3, SEEK_SET) || die "Cannot seek t1.ibd\n"; +my $full_crc32 = unpack("N",substr($_,54,4)) & 0x10; # FIL_SPACE_FLAGS +sysseek(IBD_FILE, $ps * 3, SEEK_SET) || die "Cannot seek t1.ibd\n"; -my $head = pack("Nx[18]", 3); # better to have a valid page number -my $body = chr(0) x ($page_size - 38 - 8); +# better to have a valid page number (3) +my $page = pack("x[4]Nx[18]Nx[4]N", 3, 1, $space) . chr(0) x ($ps - 38); -# Calculate innodb_checksum_algorithm=crc32 for the unencrypted page. -# The following bytes are excluded: -# bytes 0..3 (the checksum is stored there) -# bytes 26..37 (encryption key version, post-encryption checksum, tablespace id) -# bytes $page_size-8..$page_size-1 (checksum, LSB of FIL_PAGE_LSN) my $polynomial = 0x82f63b78; # CRC-32C -my $ck = mycrc32($head, 0, $polynomial) ^ mycrc32($body, 0, $polynomial); - -my $page= pack("N",$ck).$head.pack("NNN",1,$ck,$space).$body.pack("Nx[4]",$ck); -die unless syswrite(IBD_FILE, $page, $page_size) == $page_size; +if ($full_crc32) +{ + # no possibility of bug here + my $ck = mycrc32(substr($page, 0, $ps - 4), 0, $polynomial); + substr($page, $ps - 4, 4) = pack("N", $ck); +} +else +{ + my $ck= pack("N",mycrc32(substr($page, 4, 22), 0, $polynomial) ^ + mycrc32(substr($page, 38, $ps - 38 - 8), 0, $polynomial)); + substr($page,0,4)=$ck; + substr($page,$ps-8,4)=$ck; + # trigger the bug by having the same "post-encryption" checksum! + substr($page,30,4)=$ck; +} + +die unless syswrite(IBD_FILE, $page, $ps) == $ps; close IBD_FILE; EOF @@ -49,8 +58,13 @@ echo # xtrabackup backup; let $targetdir=$MYSQLTEST_VARDIR/tmp/backup; let $backuplog=$MYSQLTEST_VARDIR/tmp/backup.log; +let $expect_error= 1; +if (`select @@innodb_checksum_algorithm LIKE '%full_crc32'`) +{ + let $expect_error= 0; +} --disable_result_log ---error 1 +--error $expect_error exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --extended-validation --target-dir=$targetdir --core-file > $backuplog; --enable_result_log diff --git a/mysql-test/suite/mariabackup/full_backup.result b/mysql-test/suite/mariabackup/full_backup.result index c387f5328a7..690c5e64b4a 100644 --- a/mysql-test/suite/mariabackup/full_backup.result +++ b/mysql-test/suite/mariabackup/full_backup.result @@ -6,7 +6,7 @@ INSERT INTO t VALUES(2); # shutdown server # remove datadir # xtrabackup move back -# restart server +# restart SELECT * FROM t; i 1 diff --git a/mysql-test/suite/mariabackup/huge_lsn.combinations b/mysql-test/suite/mariabackup/huge_lsn.combinations new file mode 100644 index 00000000000..729380593f3 --- /dev/null +++ b/mysql-test/suite/mariabackup/huge_lsn.combinations @@ -0,0 +1,5 @@ +[strict_crc32] +--innodb-checksum-algorithm=strict_crc32 + +[strict_full_crc32] +--innodb-checksum-algorithm=strict_full_crc32 diff --git a/mysql-test/suite/mariabackup/huge_lsn.result b/mysql-test/suite/mariabackup/huge_lsn.result index e7c4cc9471d..82d743bbad4 100644 --- a/mysql-test/suite/mariabackup/huge_lsn.result +++ b/mysql-test/suite/mariabackup/huge_lsn.result @@ -1,6 +1,7 @@ # # MDEV-13416 mariabackup fails with EFAULT "Bad Address" # +# restart FOUND 1 /InnoDB: New log files created, LSN=175964\d{8}/ in mysqld.1.err CREATE TABLE t(i INT) ENGINE INNODB; INSERT INTO t VALUES(1); @@ -11,7 +12,7 @@ INSERT INTO t VALUES(2); # shutdown server # remove datadir # xtrabackup move back -# restart server +# restart SELECT * FROM t; i 1 diff --git a/mysql-test/suite/mariabackup/huge_lsn.test b/mysql-test/suite/mariabackup/huge_lsn.test index dcdc118df6f..d41bb61a096 100644 --- a/mysql-test/suite/mariabackup/huge_lsn.test +++ b/mysql-test/suite/mariabackup/huge_lsn.test @@ -20,10 +20,12 @@ my $page; die "Unable to read $file" unless sysread(FILE, $page, $ps) == $ps; substr($page,26,8) = pack("NN", 4096, ~1024); my $polynomial = 0x82f63b78; # CRC-32C -my $ck= pack("N",mycrc32(substr($page, 4, 22), 0, $polynomial) ^ - mycrc32(substr($page, 38, $ps - 38 - 8), 0, $polynomial)); -substr($page,0,4)=$ck; -substr($page,$ps-8,4)=$ck; +my $full_crc32 = unpack("N",substr($page,54,4)) & 0x10; # FIL_SPACE_FLAGS +if ($full_crc32) +{ + my $ck = mycrc32(substr($page, 0, $ps-4), 0, $polynomial); + substr($page, $ps-4, 4) = pack("N", $ck); +} sysseek(FILE, 0, 0) || die "Unable to rewind $file\n"; syswrite(FILE, $page, $ps)==$ps || die "Unable to write $file\n"; close(FILE) || die "Unable to close $file\n"; diff --git a/mysql-test/suite/mariabackup/include/restart_and_restore.inc b/mysql-test/suite/mariabackup/include/restart_and_restore.inc index 9056867b07f..2d1e5493957 100644 --- a/mysql-test/suite/mariabackup/include/restart_and_restore.inc +++ b/mysql-test/suite/mariabackup/include/restart_and_restore.inc @@ -5,5 +5,4 @@ echo # remove datadir; rmdir $_datadir; echo # xtrabackup move back; exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --copy-back --datadir=$_datadir --target-dir=$targetdir --parallel=2 --throttle=1; -echo # restart server; --source include/start_mysqld.inc diff --git a/mysql-test/suite/mariabackup/incremental_backup.result b/mysql-test/suite/mariabackup/incremental_backup.result index 70cc2cf8c4a..d6a78655a0c 100644 --- a/mysql-test/suite/mariabackup/incremental_backup.result +++ b/mysql-test/suite/mariabackup/incremental_backup.result @@ -24,7 +24,7 @@ disconnect con1; # shutdown server # remove datadir # xtrabackup move back -# restart server +# restart SELECT * FROM t; i 1 diff --git a/mysql-test/suite/mariabackup/incremental_ddl_before_backup.result b/mysql-test/suite/mariabackup/incremental_ddl_before_backup.result index a6273a20ff5..71f250bfd8d 100644 --- a/mysql-test/suite/mariabackup/incremental_ddl_before_backup.result +++ b/mysql-test/suite/mariabackup/incremental_ddl_before_backup.result @@ -25,7 +25,7 @@ count(*) # shutdown server # remove datadir # xtrabackup move back -# restart server +# restart select count(*) from t7; count(*) 7168 diff --git a/mysql-test/suite/mariabackup/incremental_ddl_during_backup.result b/mysql-test/suite/mariabackup/incremental_ddl_during_backup.result index ffca1ef0e1f..505e834b4d1 100644 --- a/mysql-test/suite/mariabackup/incremental_ddl_during_backup.result +++ b/mysql-test/suite/mariabackup/incremental_ddl_during_backup.result @@ -9,7 +9,7 @@ INSERT into t1 values(1); # shutdown server # remove datadir # xtrabackup move back -# restart server +# restart CREATE TABLE t1(i int); DROP TABLE t1; SELECT * from t1_renamed; diff --git a/mysql-test/suite/mariabackup/incremental_encrypted.result b/mysql-test/suite/mariabackup/incremental_encrypted.result index e9525c9c4b7..6a23f399f0e 100644 --- a/mysql-test/suite/mariabackup/incremental_encrypted.result +++ b/mysql-test/suite/mariabackup/incremental_encrypted.result @@ -13,7 +13,7 @@ i # shutdown server # remove datadir # xtrabackup move back -# restart server +# restart SELECT * FROM t; i 1 diff --git a/mysql-test/suite/mariabackup/incremental_rocksdb.result b/mysql-test/suite/mariabackup/incremental_rocksdb.result index 4e5b9c43389..f319b46669d 100644 --- a/mysql-test/suite/mariabackup/incremental_rocksdb.result +++ b/mysql-test/suite/mariabackup/incremental_rocksdb.result @@ -10,7 +10,7 @@ INSERT INTO t2 VALUES(2); # shutdown server # remove datadir # xtrabackup move back -# restart server +# restart SELECT * FROM t2; i 2 diff --git a/mysql-test/suite/mariabackup/innodb_log_optimize_ddl.result b/mysql-test/suite/mariabackup/innodb_log_optimize_ddl.result index 47b74e0f709..f27f9d0d303 100644 --- a/mysql-test/suite/mariabackup/innodb_log_optimize_ddl.result +++ b/mysql-test/suite/mariabackup/innodb_log_optimize_ddl.result @@ -18,7 +18,7 @@ call a(); # shutdown server # remove datadir # xtrabackup move back -# restart server +# restart DROP PROCEDURE a; CHECK TABLE tz,tr,td; Table Op Msg_type Msg_text diff --git a/mysql-test/suite/mariabackup/innodb_xa_rollback.result b/mysql-test/suite/mariabackup/innodb_xa_rollback.result index cd5e2cd39a9..1bf6a9a23d3 100644 --- a/mysql-test/suite/mariabackup/innodb_xa_rollback.result +++ b/mysql-test/suite/mariabackup/innodb_xa_rollback.result @@ -14,14 +14,14 @@ XA ROLLBACK 'test1'; # shutdown server # remove datadir # xtrabackup move back -# restart server +# restart XA RECOVER; formatID gtrid_length bqual_length data # xtrabackup prepare and DO NOT rollback prepared XA # shutdown server # remove datadir # xtrabackup move back -# restart server +# restart XA RECOVER; formatID gtrid_length bqual_length data 1 5 0 test1 @@ -30,14 +30,14 @@ XA ROLLBACK 'test1'; # shutdown server # remove datadir # xtrabackup move back -# restart server +# restart XA RECOVER; formatID gtrid_length bqual_length data # xtrabackup prepare for export and DO NOT rollback prepared XA # shutdown server # remove datadir # xtrabackup move back -# restart server +# restart XA RECOVER; formatID gtrid_length bqual_length data 1 5 0 test1 diff --git a/mysql-test/suite/mariabackup/log_checksum_mismatch.result b/mysql-test/suite/mariabackup/log_checksum_mismatch.result index 806a5e62cb6..31bd9dcc0d1 100644 --- a/mysql-test/suite/mariabackup/log_checksum_mismatch.result +++ b/mysql-test/suite/mariabackup/log_checksum_mismatch.result @@ -7,7 +7,7 @@ INSERT INTO t VALUES(2); # shutdown server # remove datadir # xtrabackup move back -# restart server +# restart SELECT * FROM t; i 1 diff --git a/mysql-test/suite/mariabackup/mdev-14447.result b/mysql-test/suite/mariabackup/mdev-14447.result index 6600c13ed74..357e883178b 100644 --- a/mysql-test/suite/mariabackup/mdev-14447.result +++ b/mysql-test/suite/mariabackup/mdev-14447.result @@ -14,6 +14,7 @@ FOUND 1 /Checksum mismatch in datafile/ in backup.log # remove datadir # xtrabackup move back # restart server +# restart SELECT count(*) FROM t; count(*) 100000 diff --git a/mysql-test/suite/mariabackup/mdev-14447.test b/mysql-test/suite/mariabackup/mdev-14447.test index 799d81a8710..17f78b4d1c9 100644 --- a/mysql-test/suite/mariabackup/mdev-14447.test +++ b/mysql-test/suite/mariabackup/mdev-14447.test @@ -36,7 +36,6 @@ exec $XTRABACKUP --prepare --verbose --apply-log-only --target-dir=$basedir --in echo # Restore and check results; let $targetdir=$basedir; -#-- source include/restart_and_restore.inc let $_datadir= `SELECT @@datadir`; let $innodb_data_file_path=`SELECT @@innodb_data_file_path`; diff --git a/mysql-test/suite/mariabackup/missing_ibd.result b/mysql-test/suite/mariabackup/missing_ibd.result index 7ff63b7d434..1ad18e8b14d 100644 --- a/mysql-test/suite/mariabackup/missing_ibd.result +++ b/mysql-test/suite/mariabackup/missing_ibd.result @@ -1,5 +1,6 @@ create table t1(c1 int) engine=InnoDB; INSERT INTO t1 VALUES(1); +# restart # xtrabackup backup select * from t1; ERROR HY000: Got error 194 "Tablespace is missing for a table" from storage engine InnoDB diff --git a/mysql-test/suite/mariabackup/mlog_index_load.result b/mysql-test/suite/mariabackup/mlog_index_load.result index bc83981106e..1748bc920e8 100644 --- a/mysql-test/suite/mariabackup/mlog_index_load.result +++ b/mysql-test/suite/mariabackup/mlog_index_load.result @@ -8,7 +8,7 @@ t1.new # shutdown server # remove datadir # xtrabackup move back -# restart server +# restart SELECT COUNT(*) from t1; COUNT(*) 10000 diff --git a/mysql-test/suite/mariabackup/partition_datadir.result b/mysql-test/suite/mariabackup/partition_datadir.result index 3fc5fe30907..f00db641fea 100644 --- a/mysql-test/suite/mariabackup/partition_datadir.result +++ b/mysql-test/suite/mariabackup/partition_datadir.result @@ -11,7 +11,7 @@ DROP TABLE t; # shutdown server # remove datadir # xtrabackup move back -# restart server +# restart SELECT * FROM t; i 1 diff --git a/mysql-test/suite/mariabackup/recreate_table_during_backup.result b/mysql-test/suite/mariabackup/recreate_table_during_backup.result index 4e038fee71a..821f9301ab6 100644 --- a/mysql-test/suite/mariabackup/recreate_table_during_backup.result +++ b/mysql-test/suite/mariabackup/recreate_table_during_backup.result @@ -7,7 +7,7 @@ INSERT INTO t3 SELECT UUID() FROM seq_1_to_1000; # shutdown server # remove datadir # xtrabackup move back -# restart server +# restart SELECT COUNT(*) from t1; COUNT(*) 100 diff --git a/mysql-test/suite/mariabackup/rename_during_backup.result b/mysql-test/suite/mariabackup/rename_during_backup.result index a4cf06b7633..ba1dbec0e1b 100644 --- a/mysql-test/suite/mariabackup/rename_during_backup.result +++ b/mysql-test/suite/mariabackup/rename_during_backup.result @@ -18,7 +18,7 @@ INSERT INTO b1 VALUES('b1'); # shutdown server # remove datadir # xtrabackup move back -# restart server +# restart CREATE TABLE t1(i int); DROP TABLE t1; SELECT * from t1_renamed; diff --git a/mysql-test/suite/mariabackup/rename_during_mdl_lock.result b/mysql-test/suite/mariabackup/rename_during_mdl_lock.result index 3b64cdc38bc..607460f4f05 100644 --- a/mysql-test/suite/mariabackup/rename_during_mdl_lock.result +++ b/mysql-test/suite/mariabackup/rename_during_mdl_lock.result @@ -3,7 +3,7 @@ CREATE TABLE t1(i int) ENGINE INNODB; # shutdown server # remove datadir # xtrabackup move back -# restart server +# restart CREATE TABLE t1(i int); DROP TABLE t1; SELECT * from t2; diff --git a/mysql-test/suite/mariabackup/skip_innodb.result b/mysql-test/suite/mariabackup/skip_innodb.result index 0d56b55bf4b..859b3c56f43 100644 --- a/mysql-test/suite/mariabackup/skip_innodb.result +++ b/mysql-test/suite/mariabackup/skip_innodb.result @@ -3,7 +3,7 @@ INSERT INTO t VALUES(1); # shutdown server # remove datadir # xtrabackup move back -# restart server +# restart SELECT * from t; i 1 diff --git a/mysql-test/suite/mariabackup/suite.pm b/mysql-test/suite/mariabackup/suite.pm index 14e38d16158..f0db4482156 100644 --- a/mysql-test/suite/mariabackup/suite.pm +++ b/mysql-test/suite/mariabackup/suite.pm @@ -7,12 +7,13 @@ use strict; return "Not run for embedded server" if $::opt_embedded_server; -return "No mariabackup" unless ::have_mariabackup(); +return "No mariabackup" unless $ENV{XTRABACKUP}; my $have_qpress = index(`qpress 2>&1`,"Compression") > 0; sub skip_combinations { my %skip; + $skip{'include/have_file_key_management.inc'} = 'needs file_key_management plugin' unless $ENV{FILE_KEY_MANAGEMENT_SO}; $skip{'compress_qpress.test'}= 'needs qpress executable in PATH' unless $have_qpress; %skip; } diff --git a/mysql-test/suite/mariabackup/system_versioning.result b/mysql-test/suite/mariabackup/system_versioning.result index 0e1e9253dd0..83e9cf04150 100644 --- a/mysql-test/suite/mariabackup/system_versioning.result +++ b/mysql-test/suite/mariabackup/system_versioning.result @@ -5,7 +5,7 @@ insert into t values (3); # shutdown server # remove datadir # xtrabackup move back -# restart server +# restart show create table t; Table Create Table t CREATE TABLE `t` ( @@ -30,7 +30,7 @@ insert into t values (3); # shutdown server # remove datadir # xtrabackup move back -# restart server +# restart show create table t; Table Create Table t CREATE TABLE `t` ( diff --git a/mysql-test/suite/mariabackup/unencrypted_page_compressed.result b/mysql-test/suite/mariabackup/unencrypted_page_compressed.result index daeb9ecf8b7..7edf66b027a 100644 --- a/mysql-test/suite/mariabackup/unencrypted_page_compressed.result +++ b/mysql-test/suite/mariabackup/unencrypted_page_compressed.result @@ -4,6 +4,7 @@ CREATE TABLE t1 (a INT AUTO_INCREMENT PRIMARY KEY, b TEXT, c char(200)) ENGINE=I insert into t1(b, c) values("mariadb", "mariabackup"); InnoDB 0 transactions not purged # Corrupt the table +# restart: --skip-innodb-buffer-pool-load-at-startup # xtrabackup backup FOUND 1 /Database page corruption detected.*/ in backup.log drop table t1; diff --git a/mysql-test/suite/mariabackup/xb_aws_key_management.result b/mysql-test/suite/mariabackup/xb_aws_key_management.result index fd12344dfa0..0ca72291b1c 100644 --- a/mysql-test/suite/mariabackup/xb_aws_key_management.result +++ b/mysql-test/suite/mariabackup/xb_aws_key_management.result @@ -1,13 +1,10 @@ CREATE TABLE t(c VARCHAR(10)) ENGINE INNODB encrypted=yes; -Warnings: -Note 1105 AWS KMS plugin: generated encrypted datakey for key id=1, version=1 -Note 1105 AWS KMS plugin: loaded key 1, version 1, key length 128 bit INSERT INTO t VALUES('foobar1'); # xtrabackup backup # shutdown server # remove datadir # xtrabackup move back -# restart server +# restart SELECT * from t; c foobar1 diff --git a/mysql-test/suite/mariabackup/xb_compressed_encrypted.result b/mysql-test/suite/mariabackup/xb_compressed_encrypted.result index 9ba332b7ca5..22a4c151b07 100644 --- a/mysql-test/suite/mariabackup/xb_compressed_encrypted.result +++ b/mysql-test/suite/mariabackup/xb_compressed_encrypted.result @@ -7,7 +7,7 @@ drop table t1; # shutdown server # remove datadir # xtrabackup move back -# restart server +# restart select sum(c1) from t1; sum(c1) 12497500 diff --git a/mysql-test/suite/mariabackup/xb_file_key_management.result b/mysql-test/suite/mariabackup/xb_file_key_management.result index 721d10a9d91..6cedfd2213b 100644 --- a/mysql-test/suite/mariabackup/xb_file_key_management.result +++ b/mysql-test/suite/mariabackup/xb_file_key_management.result @@ -8,7 +8,7 @@ INSERT INTO t VALUES('foobar2'); # shutdown server # remove datadir # xtrabackup move back -# restart server +# restart ib_logfile0 SELECT * FROM t; c diff --git a/mysql-test/suite/mariabackup/xb_fulltext_encrypted.result b/mysql-test/suite/mariabackup/xb_fulltext_encrypted.result index 01a99e59200..7c0a6451820 100644 --- a/mysql-test/suite/mariabackup/xb_fulltext_encrypted.result +++ b/mysql-test/suite/mariabackup/xb_fulltext_encrypted.result @@ -10,5 +10,5 @@ FULLTEXT KEY (title) # shutdown server # remove datadir # xtrabackup move back -# restart server +# restart drop table film_text; diff --git a/mysql-test/suite/mariabackup/xb_partition.result b/mysql-test/suite/mariabackup/xb_partition.result index f5b6ae0b24d..69896371f25 100644 --- a/mysql-test/suite/mariabackup/xb_partition.result +++ b/mysql-test/suite/mariabackup/xb_partition.result @@ -45,7 +45,7 @@ INSERT INTO isam_p VALUES (401), (501); # shutdown server # remove datadir # xtrabackup move back -# restart server +# restart SELECT * from p; a 201 diff --git a/mysql-test/suite/mariabackup/xb_rocksdb.result b/mysql-test/suite/mariabackup/xb_rocksdb.result index 84476eeaba0..fafa4925e93 100644 --- a/mysql-test/suite/mariabackup/xb_rocksdb.result +++ b/mysql-test/suite/mariabackup/xb_rocksdb.result @@ -6,7 +6,7 @@ INSERT INTO t VALUES(2); # shutdown server # remove datadir # xtrabackup move back -# restart server +# restart SELECT * FROM t; i 1 @@ -16,6 +16,7 @@ i # remove datadir # xtrabackup move back # restart server +# restart SELECT * FROM t; i 1 diff --git a/mysql-test/suite/mariabackup/xb_rocksdb_datadir.result b/mysql-test/suite/mariabackup/xb_rocksdb_datadir.result index 9227198cbec..76130c2f041 100644 --- a/mysql-test/suite/mariabackup/xb_rocksdb_datadir.result +++ b/mysql-test/suite/mariabackup/xb_rocksdb_datadir.result @@ -3,6 +3,7 @@ INSERT INTO t VALUES(1); # xtrabackup backup INSERT INTO t VALUES(2); # xtrabackup prepare +# restart SELECT * FROM t; i 1 diff --git a/mysql-test/suite/mariabackup/xb_rocksdb_datadir_debug.result b/mysql-test/suite/mariabackup/xb_rocksdb_datadir_debug.result index 9227198cbec..76130c2f041 100644 --- a/mysql-test/suite/mariabackup/xb_rocksdb_datadir_debug.result +++ b/mysql-test/suite/mariabackup/xb_rocksdb_datadir_debug.result @@ -3,6 +3,7 @@ INSERT INTO t VALUES(1); # xtrabackup backup INSERT INTO t VALUES(2); # xtrabackup prepare +# restart SELECT * FROM t; i 1 diff --git a/mysql-test/suite/mariabackup/xbstream.result b/mysql-test/suite/mariabackup/xbstream.result index f340fedb861..93f68eca9ef 100644 --- a/mysql-test/suite/mariabackup/xbstream.result +++ b/mysql-test/suite/mariabackup/xbstream.result @@ -6,7 +6,7 @@ INSERT INTO t VALUES(1); # shutdown server # remove datadir # xtrabackup move back -# restart server +# restart SELECT * FROM t; i 1 |