@@ -11,33 +11,15 @@ let $basedir=$MYSQLTEST_VARDIR/tmp/backup;
11
11
let $incremental_dir=$MYSQLTEST_VARDIR/tmp/backup_inc1;
12
12
13
13
CREATE TABLE t1(i INT PRIMARY KEY auto_increment, a int) ENGINE INNODB;
14
- --source ../../suite/innodb/include/no_checkpoint_start.inc
15
14
ALTER TABLE t1 FORCE, ALGORITHM=INPLACE;
16
15
17
- # Below mariabackup operation may complete successfully if checkpoint happens
18
- # after the alter table command.
19
-
20
- echo # Fails during full backup;
16
+ echo # No longer fails during full backup;
21
17
--disable_result_log
22
- --error 0,1
23
18
exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir=$basedir;
24
19
--enable_result_log
25
20
26
21
DROP TABLE t1;
27
22
28
- --let MYSQLD_DATADIR=$basedir/
29
- perl;
30
- open(OUT, ">$ENV{MYSQLTEST_VARDIR}/log/check.txt") || die;
31
- print OUT '
32
- --let no_checkpoint_end=1
33
- --let CLEANUP_IF_CHECKPOINT=rmdir $basedir;
34
- --source ../../suite/innodb/include/no_checkpoint_end.inc
35
- --exit Backup failed to fail despite MLOG_INDEX_LOAD record
36
- ' if (-f "$ENV{MYSQLD_DATADIR}/xtrabackup_info");
37
- close(OUT);
38
- EOF
39
- --source $MYSQLTEST_VARDIR/log/check.txt
40
- --remove_file $MYSQLTEST_VARDIR/log/check.txt
41
23
rmdir $basedir;
42
24
43
25
CREATE TABLE t1(i INT PRIMARY KEY auto_increment, a int) ENGINE INNODB;
@@ -50,29 +32,14 @@ INSERT INTO t1(a) select 1 union select 2 union select 3;
50
32
exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir=$basedir;
51
33
--enable_result_log
52
34
53
- --source ../../suite/innodb/include/no_checkpoint_start.inc
54
35
ALTER TABLE t1 FORCE, ALGORITHM=INPLACE;
55
36
56
37
--disable_result_log
57
- --error 0,1
58
38
exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir=$incremental_dir --incremental-basedir=$basedir;
59
39
--enable_result_log
60
40
61
41
DROP TABLE t1;
62
42
63
- --let MYSQLD_DATADIR=$incremental_dir/
64
- perl;
65
- open(OUT, ">$ENV{MYSQLTEST_VARDIR}/log/check.txt") || die;
66
- print OUT '
67
- --let no_checkpoint_end=1
68
- --let CLEANUP_IF_CHECKPOINT=rmdir $basedir;rmdir $incremental_dir;
69
- --source ../../suite/innodb/include/no_checkpoint_end.inc
70
- --exit Backup failed to fail despite MLOG_INDEX_LOAD record
71
- ' if (-f "$ENV{MYSQLD_DATADIR}/xtrabackup_info");
72
- close(OUT);
73
- EOF
74
- --source $MYSQLTEST_VARDIR/log/check.txt
75
- --remove_file $MYSQLTEST_VARDIR/log/check.txt
76
43
rmdir $basedir;rmdir $incremental_dir;
77
44
78
45
CREATE TABLE t1(i INT) ENGINE INNODB;
0 commit comments