Skip to content

Commit 18ccbf0

Browse files
committed
Make the MDEV-14874 test case more robust
1 parent 29b6e80 commit 18ccbf0

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

mysql-test/suite/mariabackup/huge_lsn.result

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
# MDEV-13416 mariabackup fails with EFAULT "Bad Address"
33
#
44
call mtr.add_suppression("InnoDB: New log files created");
5-
FOUND /InnoDB: .*started; log sequence number 17596481010700/ in mysqld.1.err
5+
FOUND /InnoDB: New log files created, LSN=175964\d{8}/ in mysqld.1.err
66
CREATE TABLE t(i INT) ENGINE INNODB;
77
INSERT INTO t VALUES(1);
88
# xtrabackup backup
9+
SET GLOBAL innodb_flush_log_at_trx_commit=1;
910
INSERT INTO t VALUES(2);
1011
# xtrabackup prepare
1112
# shutdown server

mysql-test/suite/mariabackup/huge_lsn.test

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@ EOF
2828
--remove_files_wildcard $MYSQLD_DATADIR ib_logfile*
2929

3030
--source include/start_mysqld.inc
31+
let SEARCH_RANGE= -50000;
3132
let SEARCH_FILE= $MYSQLTEST_VARDIR/log/mysqld.1.err;
32-
--let SEARCH_PATTERN= InnoDB: .*started; log sequence number 17596481010700
33+
--let SEARCH_PATTERN= InnoDB: New log files created, LSN=175964\d{8}
3334
--source include/search_pattern_in_file.inc
3435

3536
CREATE TABLE t(i INT) ENGINE INNODB;
@@ -40,6 +41,7 @@ let $targetdir=$MYSQLTEST_VARDIR/tmp/backup;
4041
--disable_result_log
4142
exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir=$targetdir;
4243
--enable_result_log
44+
SET GLOBAL innodb_flush_log_at_trx_commit=1;
4345
INSERT INTO t VALUES(2);
4446
echo # xtrabackup prepare;
4547
--disable_result_log

0 commit comments

Comments
 (0)