Skip to content

Commit 1ac2270

Browse files
MDEV-37138: Innochecksum fails to handle doublewrite buffer and
multiple file tablespace - Fixing innodb.innochecksum_flags_and_skip test case failure in 11.4
1 parent 7905ea9 commit 1ac2270

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ Should exist when summary includes dblwr pages
1111
# restart
1212
CREATE TABLE ibd_1(f1 INT PRIMARY KEY)ENGINE=InnoDB;
1313
INSERT INTO ibd_1 VALUES(1), (2), (3), (4);
14+
SET GLOBAL innodb_file_per_table=0;
15+
CREATE TABLE ibd_2(f1 INT PRIMARY KEY)ENGINE=InnoDB;
16+
INSERT INTO ibd_2 SELECT seq FROM seq_1_to_8451;
1417
# Pass wrong tablespace flag for ibdata2
1518
FOUND 1 /Error: Page 0 checksum mismatch/ in result.log
1619
# Pass wrong tablespace flag for ibdata1
@@ -25,4 +28,4 @@ FOUND 1 /Error: First page of the tablespace file should be 0, but encountered p
2528
# Test innochecksum with the modified ibdata3 with tablespace flags
2629
FOUND 1 /Exceeded the maximum allowed checksum mismatch/ in result.log
2730
# restart
28-
DROP TABLE t1, ibd_1;
31+
DROP TABLE t1, ibd_1, ibd_2;

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
--source include/have_innodb.inc
22
--source include/not_embedded.inc
33
--source include/have_debug.inc
4+
--source include/have_sequence.inc
45
let MYSQLD_DATADIR= `SELECT @@datadir`;
56
CREATE TABLE t1(a INT PRIMARY KEY) ENGINE=InnoDB STATS_PERSISTENT=0;
67
SET GLOBAL innodb_log_checkpoint_now=ON;
@@ -84,6 +85,13 @@ remove_file $resultlog_1;
8485
--source include/start_mysqld.inc
8586
CREATE TABLE ibd_1(f1 INT PRIMARY KEY)ENGINE=InnoDB;
8687
INSERT INTO ibd_1 VALUES(1), (2), (3), (4);
88+
89+
disable_warnings;
90+
SET GLOBAL innodb_file_per_table=0;
91+
enable_warnings;
92+
CREATE TABLE ibd_2(f1 INT PRIMARY KEY)ENGINE=InnoDB;
93+
INSERT INTO ibd_2 SELECT seq FROM seq_1_to_8451;
94+
8795
let $shutdown_timeout=;
8896
--source include/shutdown_mysqld.inc
8997
--echo # Pass wrong tablespace flag for ibdata2
@@ -167,5 +175,5 @@ let SEARCH_PATTERN=Exceeded the maximum allowed checksum mismatch;
167175

168176
remove_file $ibdata3;
169177
--source include/start_mysqld.inc
170-
DROP TABLE t1, ibd_1;
178+
DROP TABLE t1, ibd_1, ibd_2;
171179
remove_file $resultlog;

0 commit comments

Comments
 (0)