MDEV-14545 Backup fails due to MLOG_INDEX_LOAD record

- Fixing the windows failure of unsupported_redo test case.
mariabackup --tables-exclude option only restricts ibd file.

2 files changed, 4 insertions, 32 deletions

diff --git a/mysql-test/suite/mariabackup/unsupported_redo.result b/mysql-test/suite/mariabackup/unsupported_redo.result
index be563682697..325e8233fd8 100644
--- a/mysql-test/suite/mariabackup/unsupported_redo.result
+++ b/mysql-test/suite/mariabackup/unsupported_redo.result
@@ -23,24 +23,11 @@ CREATE TABLE t2(i int) ENGINE INNODB;
 ALTER TABLE t21 FORCE, ALGORITHM=INPLACE;
 # Create partial backup (excluding table t21), Ignore the
 # unsupported redo log for the table t21.
-t1.frm
 t1.ibd
-t2.frm
 t2.ibd
-# After partial restore operation, t21 files will be missing but t21
-# table information will be present in dictionary. It will
-# restrict creating the table t21 in the future test. To avoid
-# that, take the copy of t21 files and drop the table later.
 # Prepare the full backup
-# shutdown server
-# remove datadir
-# xtrabackup move back
-# restart server
-SHOW TABLES;
-Tables_in_test
-t1
-t2
+t1.ibd
+t2.ibd
 DROP TABLE t1;
 DROP TABLE t2;
-# Move the t21 files into data directory
 DROP TABLE t21;
diff --git a/mysql-test/suite/mariabackup/unsupported_redo.test b/mysql-test/suite/mariabackup/unsupported_redo.test
index 0e3cd9f6703..a9208a3f8ba 100644
--- a/mysql-test/suite/mariabackup/unsupported_redo.test
+++ b/mysql-test/suite/mariabackup/unsupported_redo.test
@@ -53,8 +53,6 @@ INSERT INTO t21 VALUES(1);
 
 let $MYSQLD_DATADIR= `select @@datadir`;
 let $targetdir=$MYSQLTEST_VARDIR/tmp/bk;
-let old_datadir=$MYSQLTEST_VARDIR/tmp/old_data;
---mkdir $old_datadir
 
 CREATE TABLE t2(i int) ENGINE INNODB;
 ALTER TABLE t21 FORCE, ALGORITHM=INPLACE;
@@ -65,28 +63,15 @@ ALTER TABLE t21 FORCE, ALGORITHM=INPLACE;
 --disable_result_log
 exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf  --backup "--tables-exclude=test.t21" --target-dir=$targetdir;
 --enable_result_log
---list_files $targetdir/test
-
---echo # After partial restore operation, t21 files will be missing but t21
---echo # table information will be present in dictionary. It will
---echo # restrict creating the table t21 in the future test. To avoid
---echo # that, take the copy of t21 files and drop the table later.
---copy_file $MYSQLD_DATADIR/test/t21.frm $old_datadir/t21.frm
+--list_files $targetdir/test *.ibd
 
 --echo # Prepare the full backup
 --disable_result_log
 exec $XTRABACKUP --prepare --target-dir=$targetdir;
---source include/restart_and_restore.inc
 --enable_result_log
-
-SHOW TABLES;
+--list_files $targetdir/test *.ibd
 
 DROP TABLE t1;
 DROP TABLE t2;
-
---echo # Move the t21 files into data directory
---copy_file $old_datadir/t21.frm $MYSQLD_DATADIR/test/t21.frm
-
 DROP TABLE t21;
 rmdir $targetdir;
-rmdir $old_datadir;