Skip to content

Commit b05be3e

Browse files
committed
Add encryption.innodb-redo-badkey,strict_full_crc32
In commit 0f7732d we introduced a innodb_checksum_algorithm=full_crc32 combination to a number of encryption tests, and also fixed the code accordingly. The default in MariaDB 10.5 is innodb_checksum_algorithm=full_crc32. In a test merge to 10.5, the test encryption.innodb-redo-badkey failed once due to a message that had been added in that commit. Let us introduce a full_crc32 option to that test. And let us use strict_crc32 and strict_full_crc32 instead of the non-strict variants, for the previously augmented tests, to be in line with the earlier tests encryption.corrupted_during_recovery and encryption.innodb_encrypt_temporary_tables.
1 parent 09afd3d commit b05be3e

7 files changed

+28
-16
lines changed

mysql-test/suite/encryption/r/innodb-redo-badkey.result

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ call mtr.add_suppression("InnoDB: Database page corruption on disk or a failed f
77
call mtr.add_suppression("InnoDB: Failed to read file '.*' at offset .*");
88
call mtr.add_suppression("InnoDB: Plugin initialization aborted");
99
call mtr.add_suppression("Plugin 'InnoDB' registration as a STORAGE ENGINE failed");
10+
call mtr.add_suppression("\\[ERROR\\] InnoDB: Cannot decrypt \\[page id: space=");
1011
# restart: --file-key-management-filename=MYSQL_TEST_DIR/std_data/keys2.txt
1112
# Wait max 10 min for key encryption threads to encrypt all spaces
1213
SET GLOBAL innodb_file_per_table = ON;
Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
[crc32]
2-
loose-innodb-checksum-algorithm=crc32
3-
[full_crc32]
4-
loose-innodb-checksum-algorithm=full_crc32
1+
[strict_crc32]
2+
--innodb-checksum-algorithm=strict_crc32
3+
4+
[strict_full_crc32]
5+
--innodb-checksum-algorithm=strict_full_crc32
Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
[crc32]
2-
loose-innodb-checksum-algorithm=crc32
3-
[full_crc32]
4-
loose-innodb-checksum-algorithm=full_crc32
1+
[strict_crc32]
2+
--innodb-checksum-algorithm=strict_crc32
3+
4+
[strict_full_crc32]
5+
--innodb-checksum-algorithm=strict_full_crc32
Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
[crc32]
2-
loose-innodb-checksum-algorithm=crc32
3-
[full_crc32]
4-
loose-innodb-checksum-algorithm=full_crc32
1+
[strict_crc32]
2+
--innodb-checksum-algorithm=strict_crc32
3+
4+
[strict_full_crc32]
5+
--innodb-checksum-algorithm=strict_full_crc32
Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
[crc32]
2-
loose-innodb-checksum-algorithm=crc32
3-
[full_crc32]
4-
loose-innodb-checksum-algorithm=full_crc32
1+
[strict_crc32]
2+
--innodb-checksum-algorithm=strict_crc32
3+
4+
[strict_full_crc32]
5+
--innodb-checksum-algorithm=strict_full_crc32
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[strict_crc32]
2+
--innodb-checksum-algorithm=strict_crc32
3+
4+
[strict_full_crc32]
5+
--innodb-checksum-algorithm=strict_full_crc32

mysql-test/suite/encryption/t/innodb-redo-badkey.test

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ call mtr.add_suppression("InnoDB: Database page corruption on disk or a failed f
1212
call mtr.add_suppression("InnoDB: Failed to read file '.*' at offset .*");
1313
call mtr.add_suppression("InnoDB: Plugin initialization aborted");
1414
call mtr.add_suppression("Plugin 'InnoDB' registration as a STORAGE ENGINE failed");
15+
# for innodb_checksum_algorithm=full_crc32 only
16+
call mtr.add_suppression("\\[ERROR\\] InnoDB: Cannot decrypt \\[page id: space=");
1517

1618
-- let $restart_parameters=--file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys2.txt
1719
-- source include/restart_mysqld.inc

0 commit comments

Comments
 (0)