Commit c83810f4 authored by Jan Lindström's avatar Jan Lindström

Fix test failures seen on buildbot where file_key_management plugin

is linked statically and dynamic plugin is not available.
parent 7dd137c4
if (!$FILE_KEY_MANAGEMENT_SO)
{
--skip Needs dynamic file_key_management plugin
}
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
-- source include/not_valgrind.inc -- source include/not_valgrind.inc
# Avoid CrashReporter popup on Mac # Avoid CrashReporter popup on Mac
-- source include/not_crashrep.inc -- 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 # MDEV-8750: Server crashes in page_cur_is_after_last on altering table using a wrong encryption key
# #
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
-- source include/not_valgrind.inc -- source include/not_valgrind.inc
# Avoid CrashReporter popup on Mac # Avoid CrashReporter popup on Mac
-- source include/not_crashrep.inc -- 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 # MDEV-8772: Assertion failure in file ha_innodb.cc line 20027 when importing page compressed and encrypted tablespace using incorrect keys
# #
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
-- source include/not_valgrind.inc -- source include/not_valgrind.inc
# Avoid CrashReporter popup on Mac # Avoid CrashReporter popup on Mac
-- source include/not_crashrep.inc -- 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 # MDEV-8768: Server crash at file btr0btr.ic line 122 when checking encrypted table using incorrect keys
# #
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
-- source include/not_valgrind.inc -- source include/not_valgrind.inc
# Avoid CrashReporter popup on Mac # Avoid CrashReporter popup on Mac
-- source include/not_crashrep.inc -- 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 # MDEV-8769: Server crash at file btr0btr.ic line 122 when defragmenting encrypted table using incorrect keys
# #
......
...@@ -59,7 +59,7 @@ set autocommit=1; ...@@ -59,7 +59,7 @@ set autocommit=1;
--let $wait_condition=SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION = 0 --let $wait_condition=SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION = 0
--source include/wait_condition.inc --source include/wait_condition.inc
--sleep 5 --sleep 10
--let SEARCH_PATTERN=foobar --let SEARCH_PATTERN=foobar
--echo # t1 yes on expecting NOT FOUND --echo # t1 yes on expecting NOT FOUND
-- let SEARCH_FILE=$t1_IBD -- let SEARCH_FILE=$t1_IBD
...@@ -110,7 +110,7 @@ SHOW CREATE TABLE t5; ...@@ -110,7 +110,7 @@ SHOW CREATE TABLE t5;
SHOW CREATE TABLE t6; SHOW CREATE TABLE t6;
SHOW CREATE TABLE t7; SHOW CREATE TABLE t7;
--sleep 5 --sleep 10
--let SEARCH_PATTERN=foobar --let SEARCH_PATTERN=foobar
--echo # t1 yes on expecting NOT FOUND --echo # t1 yes on expecting NOT FOUND
-- let SEARCH_FILE=$t1_IBD -- let SEARCH_FILE=$t1_IBD
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment