database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

MDEV-10739: encryption.innodb-page_encryption_compression fails with timeout on valgrind

Browse Source 
Test moved to big_test and not run on valgrind. Test heavy especially on debug builds.
This commit is contained in:
Jan Lindström
2016-11-29 08:35:51 +02:00
parent e493c6bb43
commit 9f31949b64
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/suite/encryption/t/innodb-page_encryption_compression.test
View File

@ -1,6 +1,9 @@
-- source include/have_innodb.inc -- source include/have_innodb.inc
-- source include/not_embedded.inc -- source include/not_embedded.inc
-- source include/have_file_key_management_plugin.inc -- source include/have_file_key_management_plugin.inc
-- source include/big_test.inc
# Test heavy not tested on valgrind
-- source include/not_valgrind.inc
--disable_query_log --disable_query_log
let $innodb_compression_algorithm_orig=`SELECT @@innodb_compression_algorithm`; let $innodb_compression_algorithm_orig=`SELECT @@innodb_compression_algorithm`;

2
storage/xtradb/include/fil0fil.ic
View File

@ -131,6 +131,7 @@ fil_page_type_validate(
page_type == FIL_PAGE_TYPE_XDES || page_type == FIL_PAGE_TYPE_XDES ||
page_type == FIL_PAGE_TYPE_BLOB || page_type == FIL_PAGE_TYPE_BLOB ||
page_type == FIL_PAGE_TYPE_ZBLOB || page_type == FIL_PAGE_TYPE_ZBLOB ||
page_type == FIL_PAGE_TYPE_ZBLOB2 ||
page_type == FIL_PAGE_TYPE_COMPRESSED))) { page_type == FIL_PAGE_TYPE_COMPRESSED))) {
uint key_version = mach_read_from_4(page + FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION); uint key_version = mach_read_from_4(page + FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION);
@ -166,6 +167,7 @@ fil_page_type_validate(
page_type == FIL_PAGE_TYPE_XDES || page_type == FIL_PAGE_TYPE_XDES ||
page_type == FIL_PAGE_TYPE_BLOB || page_type == FIL_PAGE_TYPE_BLOB ||
page_type == FIL_PAGE_TYPE_ZBLOB || page_type == FIL_PAGE_TYPE_ZBLOB ||
page_type == FIL_PAGE_TYPE_ZBLOB2 ||
page_type == FIL_PAGE_TYPE_COMPRESSED); page_type == FIL_PAGE_TYPE_COMPRESSED);
return false; return false;
} }