database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-18025: Apply the fix to XtraDB and adjust tests

Browse Source 
The fix was accidentally only applied to InnoDB, and encryption tests
were not adjusted.
This commit is contained in:
Marko Mäkelä
2018-12-18 16:24:52 +02:00
parent 171271edf8
commit 1b471face8
7 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/encryption/r/innodb-bad-key-change.result
View File

@ -1,6 +1,7 @@
call mtr.add_suppression("Plugin 'file_key_management' init function returned error"); call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
call mtr.add_suppression("Plugin 'file_key_management' registration.*failed"); call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
call mtr.add_suppression("InnoDB: The page \\[page id: space=[1-9][0-9]*, page number=[0-9]+\\] in file '.*test.t[12]\\.ibd' cannot be decrypted\\."); call mtr.add_suppression("InnoDB: The page \\[page id: space=[1-9][0-9]*, page number=[0-9]+\\] in file '.*test.t[12]\\.ibd' cannot be decrypted\\.");
call mtr.add_suppression("InnoDB: Encrypted page [1-9][0-9]*:3 in file .*test.t1.ibd looks corrupted; key_version=1");
call mtr.add_suppression("mysqld: File .*keysbad3.txt' not found "); call mtr.add_suppression("mysqld: File .*keysbad3.txt' not found ");
# Start server with keys2.txt # Start server with keys2.txt

1
mysql-test/suite/encryption/r/innodb-encryption-disable.result
View File

@ -1,4 +1,5 @@
call mtr.add_suppression("InnoDB: The page \\[page id: space=[1-9][0-9]*, page number=[1-9][0-9]*\\] in file '.*test.t[15]\\.ibd' cannot be decrypted\\."); call mtr.add_suppression("InnoDB: The page \\[page id: space=[1-9][0-9]*, page number=[1-9][0-9]*\\] in file '.*test.t[15]\\.ibd' cannot be decrypted\\.");
call mtr.add_suppression("InnoDB: Encrypted page [1-9][0-9]*:3 in file .*test.t[15].ibd looks corrupted; key_version=1");
call mtr.add_suppression("Couldn't load plugins from 'file_key_management*"); call mtr.add_suppression("Couldn't load plugins from 'file_key_management*");
create table t5 ( create table t5 (
`intcol1` int(32) DEFAULT NULL, `intcol1` int(32) DEFAULT NULL,

1
mysql-test/suite/encryption/r/innodb-missing-key.result
View File

@ -1,4 +1,5 @@
call mtr.add_suppression("InnoDB: The page \\[page id: space=[1-9][0-9]*, page number=[1-9][0-9]*\\] in file '.*test.t[123]\\.ibd' cannot be decrypted\\."); call mtr.add_suppression("InnoDB: The page \\[page id: space=[1-9][0-9]*, page number=[1-9][0-9]*\\] in file '.*test.t[123]\\.ibd' cannot be decrypted\\.");
call mtr.add_suppression("InnoDB: Encrypted page [1-9][0-9]*:3 in file .*test.t[12].ibd looks corrupted; key_version=1");
# Start server with keys2.txt # Start server with keys2.txt
CREATE TABLE t1(a int not null primary key auto_increment, b varchar(128)) engine=innodb ENCRYPTED=YES ENCRYPTION_KEY_ID=19; CREATE TABLE t1(a int not null primary key auto_increment, b varchar(128)) engine=innodb ENCRYPTED=YES ENCRYPTION_KEY_ID=19;

1
mysql-test/suite/encryption/t/innodb-bad-key-change.test
View File

@ -11,6 +11,7 @@
call mtr.add_suppression("Plugin 'file_key_management' init function returned error"); call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
call mtr.add_suppression("Plugin 'file_key_management' registration.*failed"); call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
call mtr.add_suppression("InnoDB: The page \\[page id: space=[1-9][0-9]*, page number=[0-9]+\\] in file '.*test.t[12]\\.ibd' cannot be decrypted\\."); call mtr.add_suppression("InnoDB: The page \\[page id: space=[1-9][0-9]*, page number=[0-9]+\\] in file '.*test.t[12]\\.ibd' cannot be decrypted\\.");
call mtr.add_suppression("InnoDB: Encrypted page [1-9][0-9]*:3 in file .*test.t1.ibd looks corrupted; key_version=1");
call mtr.add_suppression("mysqld: File .*keysbad3.txt' not found "); call mtr.add_suppression("mysqld: File .*keysbad3.txt' not found ");

1
mysql-test/suite/encryption/t/innodb-encryption-disable.test
View File

@ -8,6 +8,7 @@
# #
call mtr.add_suppression("InnoDB: The page \\[page id: space=[1-9][0-9]*, page number=[1-9][0-9]*\\] in file '.*test.t[15]\\.ibd' cannot be decrypted\\."); call mtr.add_suppression("InnoDB: The page \\[page id: space=[1-9][0-9]*, page number=[1-9][0-9]*\\] in file '.*test.t[15]\\.ibd' cannot be decrypted\\.");
call mtr.add_suppression("InnoDB: Encrypted page [1-9][0-9]*:3 in file .*test.t[15].ibd looks corrupted; key_version=1");
# Suppression for builds where file_key_management plugin is linked statically # Suppression for builds where file_key_management plugin is linked statically
call mtr.add_suppression("Couldn't load plugins from 'file_key_management*"); call mtr.add_suppression("Couldn't load plugins from 'file_key_management*");

1
mysql-test/suite/encryption/t/innodb-missing-key.test
View File

@ -8,6 +8,7 @@
# #
call mtr.add_suppression("InnoDB: The page \\[page id: space=[1-9][0-9]*, page number=[1-9][0-9]*\\] in file '.*test.t[123]\\.ibd' cannot be decrypted\\."); call mtr.add_suppression("InnoDB: The page \\[page id: space=[1-9][0-9]*, page number=[1-9][0-9]*\\] in file '.*test.t[123]\\.ibd' cannot be decrypted\\.");
call mtr.add_suppression("InnoDB: Encrypted page [1-9][0-9]*:3 in file .*test.t[12].ibd looks corrupted; key_version=1");
--echo --echo
--echo # Start server with keys2.txt --echo # Start server with keys2.txt

5
storage/xtradb/buf/buf0buf.cc
View File

@ -482,6 +482,8 @@ decompress_with_slot:
decrypt. */ decrypt. */
if (!fil_space_verify_crypt_checksum( if (!fil_space_verify_crypt_checksum(
dst_frame, buf_page_get_zip_size(bpage))) { dst_frame, buf_page_get_zip_size(bpage))) {
decrypt_failed:
ib_logf(IB_LOG_LEVEL_ERROR, ib_logf(IB_LOG_LEVEL_ERROR,
"Encrypted page %u:%u in file %s" "Encrypted page %u:%u in file %s"
" looks corrupted; key_version=" ULINTPF, " looks corrupted; key_version=" ULINTPF,
@ -490,7 +492,7 @@ decompress_with_slot:
mach_read_from_4( mach_read_from_4(
FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION
+ dst_frame)); + dst_frame));
decrypt_failed:
/* Mark page encrypted in case it should be. */ /* Mark page encrypted in case it should be. */
if (space->crypt_data->type if (space->crypt_data->type
!= CRYPT_SCHEME_UNENCRYPTED) { != CRYPT_SCHEME_UNENCRYPTED) {
@ -4794,7 +4796,6 @@ static dberr_t buf_page_check_corrupt(buf_page_t* bpage, fil_space_t* space)
not anymore encrypted. */ not anymore encrypted. */
corrupted = buf_page_is_corrupted(true, dst_frame, zip_size, corrupted = buf_page_is_corrupted(true, dst_frame, zip_size,
space); space);
if (!corrupted) { if (!corrupted) {
bpage->encrypted = false; bpage->encrypted = false;
} else { } else {