Skip to content

Commit 2842c36

Browse files
committed
MDEV-20425: Enable a test for debug builds
1 parent 67e2252 commit 2842c36

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

mysql-test/suite/innodb/r/trx_id_future.result

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,11 @@ INSERT INTO t1 VALUES(1);
88
InnoDB 0 transactions not purged
99
NOT FOUND /\[Warning\] InnoDB: A transaction id in a record of table `test`\.`t1` is newer than the system-wide maximum/ in mysqld.1.err
1010
call mtr.add_suppression("\\[Warning\\] InnoDB: A transaction id in a record of table `test`\\.`t1` is newer than the system-wide maximum");
11+
SET @save_count = @@max_error_count;
12+
SET max_error_count = 1;
1113
SELECT * FROM t1;
1214
a
1315
Warnings:
1416
Warning 1642 InnoDB: Transaction id in a record of table `test`.`t1` is newer than system-wide maximum.
17+
SET max_error_count = @save_count;
1518
DROP TABLE t1;

mysql-test/suite/innodb/t/trx_id_future.test

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
--echo # IN THE FUTURE
44
--echo #
55

6-
--source include/not_debug.inc
76
--source include/have_innodb.inc
87
--source include/not_embedded.inc
98

@@ -47,6 +46,8 @@ syswrite(FILE, $page, $ps)==$ps || die "Unable to write $file\n";
4746
close(FILE) || die "Unable to close $file";
4847
EOF
4948

49+
# Debug assertions would fail due to the injected corruption.
50+
--let $restart_parameters= --loose-skip-debug-assert
5051
--source include/start_mysqld.inc
5152

5253
let SEARCH_FILE= $MYSQLTEST_VARDIR/log/mysqld.1.err;
@@ -55,5 +56,9 @@ let SEARCH_PATTERN= \[Warning\] InnoDB: A transaction id in a record of table `t
5556

5657
call mtr.add_suppression("\\[Warning\\] InnoDB: A transaction id in a record of table `test`\\.`t1` is newer than the system-wide maximum");
5758

59+
# A debug assertion would cause a duplicated message to be output.
60+
SET @save_count = @@max_error_count;
61+
SET max_error_count = 1;
5862
SELECT * FROM t1;
63+
SET max_error_count = @save_count;
5964
DROP TABLE t1;

0 commit comments

Comments
 (0)