revision-id: 4b88d5ee516fc7d2e51f55409623c63a1bde25f3 (mariadb-10.3.10-94-g4b88d5ee516) parent(s): 36359157cf2af0161f9ff856ed49c5a147c541f3 author: Jan Lindström committer: Jan Lindström timestamp: 2018-11-27 15:26:18 +0200 message: MDEV-17771: Add Galera ist and sst tests using mariabackup Add check that file key management plugin is found. --- mysql-test/suite/galera/disabled.def | 1 - mysql-test/suite/galera/include/have_filekeymanagement.inc | 3 +++ mysql-test/suite/galera/suite.pm | 2 ++ mysql-test/suite/galera/t/galera_sst_mariabackup_table_options.test | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def index 8be4f7e4748..bfceb370682 100644 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@ -56,4 +56,3 @@ galera_sst_xtrabackup-v2-options : xtrabackup is deprecated galera_ist_innodb_flush_logs : xtrabackup is deprecated galera_sst_xtrabackup-v2 : xtrabackup is deprecated -galera_sst_mariabackup_table_options : refuses to start due to encryption diff --git a/mysql-test/suite/galera/include/have_filekeymanagement.inc b/mysql-test/suite/galera/include/have_filekeymanagement.inc new file mode 100644 index 00000000000..f5507ca4548 --- /dev/null +++ b/mysql-test/suite/galera/include/have_filekeymanagement.inc @@ -0,0 +1,3 @@ +# +# Used in galera/suite.pm to check file key management plugin +# diff --git a/mysql-test/suite/galera/suite.pm b/mysql-test/suite/galera/suite.pm index c3ae4d358f2..1aabc697db1 100644 --- a/mysql-test/suite/galera/suite.pm +++ b/mysql-test/suite/galera/suite.pm @@ -98,6 +98,8 @@ if (which(socat)) { sub skip_combinations { my %skip = (); + $skip{'include/have_filekeymanagement.inc'} = 'needs file_key_management plugin' + unless $ENV{FILE_KEY_MANAGEMENT_SO}; $skip{'include/have_mariabackup.inc'} = 'Need mariabackup' unless which(mariabackup); $skip{'include/have_mariabackup.inc'} = 'Need ss' diff --git a/mysql-test/suite/galera/t/galera_sst_mariabackup_table_options.test b/mysql-test/suite/galera/t/galera_sst_mariabackup_table_options.test index 267ec9ce681..9d4f50f66ee 100644 --- a/mysql-test/suite/galera/t/galera_sst_mariabackup_table_options.test +++ b/mysql-test/suite/galera/t/galera_sst_mariabackup_table_options.test @@ -1,5 +1,6 @@ --source include/big_test.inc --source include/galera_cluster.inc +--source include/have_filekeymanagement.inc --source include/innodb_encrypt_tables.inc --source include/innodb_page_size_small.inc --source include/have_mariabackup.inc