Skip to content

Commit ea9caea

Browse files
committed
MDEV-11814 test fix
Do not kill the server after call mtr.add_suppression(), because the procedure modifies a crash-unsafe table, and we do not want to corrupt that table.
1 parent 732672c commit ea9caea

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
call mtr.add_suppression("InnoDB: Resizing redo log");
2-
call mtr.add_suppression("InnoDB: Starting to delete and rewrite log files");
3-
call mtr.add_suppression("InnoDB: New log files created");
4-
call mtr.add_suppression("InnoDB: The log sequence numbers [0-9]+ and [0-9]+ in ibdata files do not match the log sequence number [0-9]+ in the ib_logfiles");
51
CREATE TABLE t1(a INT PRIMARY KEY) ENGINE=InnoDB;
62
BEGIN;
73
INSERT INTO t1 VALUES (42);

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@ if (`SELECT @@innodb_log_file_size = 1048576`) {
1313
--skip Test requires innodb_log_file_size>1M.
1414
}
1515

16-
call mtr.add_suppression("InnoDB: Resizing redo log");
17-
call mtr.add_suppression("InnoDB: Starting to delete and rewrite log files");
18-
call mtr.add_suppression("InnoDB: New log files created");
19-
call mtr.add_suppression("InnoDB: The log sequence numbers [0-9]+ and [0-9]+ in ibdata files do not match the log sequence number [0-9]+ in the ib_logfiles");
20-
2116
CREATE TABLE t1(a INT PRIMARY KEY) ENGINE=InnoDB;
2217
BEGIN;
2318
INSERT INTO t1 VALUES (42);
@@ -181,5 +176,12 @@ let SEARCH_PATTERN= InnoDB: Renaming log file .*ib_logfile101 to .*ib_logfile0;
181176
--let $restart_parameters=
182177
--source include/start_mysqld.inc
183178

179+
--disable_query_log
180+
call mtr.add_suppression("InnoDB: Resizing redo log");
181+
call mtr.add_suppression("InnoDB: Starting to delete and rewrite log files");
182+
call mtr.add_suppression("InnoDB: New log files created");
183+
call mtr.add_suppression("InnoDB: The log sequence numbers [0-9]+ and [0-9]+ in ibdata files do not match the log sequence number [0-9]+ in the ib_logfiles");
184+
--enable_query_log
185+
184186
SELECT * FROM t1;
185187
DROP TABLE t1;

0 commit comments

Comments
 (0)