From c83810f402d65c7dee2cf15fd38b8bf6281610f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= Date: Thu, 17 Sep 2015 12:38:06 +0300 Subject: [PATCH] Fix test failures seen on buildbot where file_key_management plugin is linked statically and dynamic plugin is not available. --- mysql-test/suite/encryption/t/filekeys_plugin_exists.inc | 4 ++++ mysql-test/suite/encryption/t/innodb-bad-key-change2.test | 1 + mysql-test/suite/encryption/t/innodb-bad-key-change3.test | 2 +- mysql-test/suite/encryption/t/innodb-bad-key-change4.test | 1 + mysql-test/suite/encryption/t/innodb-bad-key-change5.test | 1 + .../suite/encryption/t/innodb_onlinealter_encryption.test | 4 ++-- 6 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 mysql-test/suite/encryption/t/filekeys_plugin_exists.inc diff --git a/mysql-test/suite/encryption/t/filekeys_plugin_exists.inc b/mysql-test/suite/encryption/t/filekeys_plugin_exists.inc new file mode 100644 index 00000000000..a9bde3b06e6 --- /dev/null +++ b/mysql-test/suite/encryption/t/filekeys_plugin_exists.inc @@ -0,0 +1,4 @@ +if (!$FILE_KEY_MANAGEMENT_SO) +{ + --skip Needs dynamic file_key_management plugin +} diff --git a/mysql-test/suite/encryption/t/innodb-bad-key-change2.test b/mysql-test/suite/encryption/t/innodb-bad-key-change2.test index 907c95e04d6..7c61c34ec59 100644 --- a/mysql-test/suite/encryption/t/innodb-bad-key-change2.test +++ b/mysql-test/suite/encryption/t/innodb-bad-key-change2.test @@ -4,6 +4,7 @@ -- source include/not_valgrind.inc # Avoid CrashReporter popup on Mac -- source include/not_crashrep.inc +-- source filekeys_plugin_exists.inc # # MDEV-8750: Server crashes in page_cur_is_after_last on altering table using a wrong encryption key # diff --git a/mysql-test/suite/encryption/t/innodb-bad-key-change3.test b/mysql-test/suite/encryption/t/innodb-bad-key-change3.test index 5aef6c42b0a..20d63b10649 100644 --- a/mysql-test/suite/encryption/t/innodb-bad-key-change3.test +++ b/mysql-test/suite/encryption/t/innodb-bad-key-change3.test @@ -4,7 +4,7 @@ -- source include/not_valgrind.inc # Avoid CrashReporter popup on Mac -- source include/not_crashrep.inc - +-- source filekeys_plugin_exists.inc # # MDEV-8772: Assertion failure in file ha_innodb.cc line 20027 when importing page compressed and encrypted tablespace using incorrect keys # diff --git a/mysql-test/suite/encryption/t/innodb-bad-key-change4.test b/mysql-test/suite/encryption/t/innodb-bad-key-change4.test index baeae273915..96f9563fb3b 100644 --- a/mysql-test/suite/encryption/t/innodb-bad-key-change4.test +++ b/mysql-test/suite/encryption/t/innodb-bad-key-change4.test @@ -4,6 +4,7 @@ -- source include/not_valgrind.inc # Avoid CrashReporter popup on Mac -- source include/not_crashrep.inc +-- source filekeys_plugin_exists.inc # # MDEV-8768: Server crash at file btr0btr.ic line 122 when checking encrypted table using incorrect keys # diff --git a/mysql-test/suite/encryption/t/innodb-bad-key-change5.test b/mysql-test/suite/encryption/t/innodb-bad-key-change5.test index f7d3f6da97b..c6c0c963818 100644 --- a/mysql-test/suite/encryption/t/innodb-bad-key-change5.test +++ b/mysql-test/suite/encryption/t/innodb-bad-key-change5.test @@ -4,6 +4,7 @@ -- source include/not_valgrind.inc # Avoid CrashReporter popup on Mac -- source include/not_crashrep.inc +-- source filekeys_plugin_exists.inc # # MDEV-8769: Server crash at file btr0btr.ic line 122 when defragmenting encrypted table using incorrect keys # diff --git a/mysql-test/suite/encryption/t/innodb_onlinealter_encryption.test b/mysql-test/suite/encryption/t/innodb_onlinealter_encryption.test index e8aaf304b7e..40beb10bcdb 100644 --- a/mysql-test/suite/encryption/t/innodb_onlinealter_encryption.test +++ b/mysql-test/suite/encryption/t/innodb_onlinealter_encryption.test @@ -59,7 +59,7 @@ set autocommit=1; --let $wait_condition=SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION = 0 --source include/wait_condition.inc ---sleep 5 +--sleep 10 --let SEARCH_PATTERN=foobar --echo # t1 yes on expecting NOT FOUND -- let SEARCH_FILE=$t1_IBD @@ -110,7 +110,7 @@ SHOW CREATE TABLE t5; SHOW CREATE TABLE t6; SHOW CREATE TABLE t7; ---sleep 5 +--sleep 10 --let SEARCH_PATTERN=foobar --echo # t1 yes on expecting NOT FOUND -- let SEARCH_FILE=$t1_IBD