diff --git a/mysql-test/include/encryption_algorithms.combinations b/mysql-test/include/encryption_algorithms.combinations deleted file mode 100644 index f8598401e5f..00000000000 --- a/mysql-test/include/encryption_algorithms.combinations +++ /dev/null @@ -1,5 +0,0 @@ -[cbc] -file-key-management-encryption-algorithm=aes_cbc - -[ctr] -file-key-management-encryption-algorithm=aes_ctr diff --git a/mysql-test/include/encryption_algorithms.inc b/mysql-test/include/encryption_algorithms.inc deleted file mode 100644 index 546cc1b9b93..00000000000 --- a/mysql-test/include/encryption_algorithms.inc +++ /dev/null @@ -1,3 +0,0 @@ -# -# See suite.pm for the actual check -# diff --git a/mysql-test/include/have_file_key_management_plugin.opt b/mysql-test/include/have_file_key_management_plugin.opt deleted file mode 100644 index 76808d02a7a..00000000000 --- a/mysql-test/include/have_file_key_management_plugin.opt +++ /dev/null @@ -1,4 +0,0 @@ ---plugin-load-add=$FILE_KEY_MANAGEMENT_SO ---loose-file-key-management ---loose-file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys.txt - diff --git a/mysql-test/include/have_innodb_encryption.inc b/mysql-test/include/have_innodb_encryption.inc deleted file mode 100644 index f81d1527d50..00000000000 --- a/mysql-test/include/have_innodb_encryption.inc +++ /dev/null @@ -1,7 +0,0 @@ -# -# Ensure we have innodb encryption incompiled - -if (`select count(*)=0 from information_schema.global_variables where variable_name="innodb_data_encryption_providertype"`) -{ - --skip Test requires InnoDB encryption. -} diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 12611f387b1..f3602f2d197 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -171,6 +171,7 @@ my @DEFAULT_SUITES= qw( archive- binlog- csv- + encryption- federated- funcs_1- funcs_2- diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm index 5eafd4e2ffd..b063f32c506 100644 --- a/mysql-test/suite.pm +++ b/mysql-test/suite.pm @@ -66,10 +66,6 @@ sub skip_combinations { unless $::mysqld_variables{'version-ssl-library'} =~ /OpenSSL (\S+)/ and $1 ge "1.0.1"; - $skip{'include/encryption_algorithms.combinations'} = [ 'ctr' ] - unless $::mysqld_variables{'version-ssl-library'} =~ /OpenSSL (\S+)/ - and $1 ge "1.0.1"; - %skip; } diff --git a/mysql-test/include/have_example_key_management_plugin.inc b/mysql-test/suite/encryption/include/have_example_key_management_plugin.inc similarity index 100% rename from mysql-test/include/have_example_key_management_plugin.inc rename to mysql-test/suite/encryption/include/have_example_key_management_plugin.inc diff --git a/mysql-test/include/have_example_key_management_plugin.opt b/mysql-test/suite/encryption/include/have_example_key_management_plugin.opt similarity index 100% rename from mysql-test/include/have_example_key_management_plugin.opt rename to mysql-test/suite/encryption/include/have_example_key_management_plugin.opt diff --git a/mysql-test/suite/encryption/include/have_file_key_management_plugin.combinations b/mysql-test/suite/encryption/include/have_file_key_management_plugin.combinations new file mode 100644 index 00000000000..4f6317cdf67 --- /dev/null +++ b/mysql-test/suite/encryption/include/have_file_key_management_plugin.combinations @@ -0,0 +1,11 @@ +[cbc] +plugin-load-add=$FILE_KEY_MANAGEMENT_SO +loose-file-key-management +loose-file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys.txt +file-key-management-encryption-algorithm=aes_cbc + +[ctr] +plugin-load-add=$FILE_KEY_MANAGEMENT_SO +loose-file-key-management +loose-file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys.txt +file-key-management-encryption-algorithm=aes_ctr diff --git a/mysql-test/suite/plugins/t/filekeys_plugin.inc b/mysql-test/suite/encryption/include/have_file_key_management_plugin.inc similarity index 100% rename from mysql-test/suite/plugins/t/filekeys_plugin.inc rename to mysql-test/suite/encryption/include/have_file_key_management_plugin.inc diff --git a/mysql-test/suite/innodb/r/innodb_encryption_debug.result b/mysql-test/suite/encryption/r/debug_key_management.result similarity index 100% rename from mysql-test/suite/innodb/r/innodb_encryption_debug.result rename to mysql-test/suite/encryption/r/debug_key_management.result diff --git a/mysql-test/suite/innodb/r/innodb_encryption_force.result b/mysql-test/suite/encryption/r/encryption_force.result similarity index 100% rename from mysql-test/suite/innodb/r/innodb_encryption_force.result rename to mysql-test/suite/encryption/r/encryption_force.result diff --git a/mysql-test/suite/plugins/r/filekeys_encfile.result b/mysql-test/suite/encryption/r/filekeys_encfile.result similarity index 100% rename from mysql-test/suite/plugins/r/filekeys_encfile.result rename to mysql-test/suite/encryption/r/filekeys_encfile.result diff --git a/mysql-test/suite/plugins/r/filekeys_encfile_bad.result b/mysql-test/suite/encryption/r/filekeys_encfile_bad.result similarity index 100% rename from mysql-test/suite/plugins/r/filekeys_encfile_bad.result rename to mysql-test/suite/encryption/r/filekeys_encfile_bad.result diff --git a/mysql-test/suite/plugins/r/filekeys_encfile_badfile.result b/mysql-test/suite/encryption/r/filekeys_encfile_badfile.result similarity index 100% rename from mysql-test/suite/plugins/r/filekeys_encfile_badfile.result rename to mysql-test/suite/encryption/r/filekeys_encfile_badfile.result diff --git a/mysql-test/suite/plugins/r/filekeys_encfile_file.result b/mysql-test/suite/encryption/r/filekeys_encfile_file.result similarity index 100% rename from mysql-test/suite/plugins/r/filekeys_encfile_file.result rename to mysql-test/suite/encryption/r/filekeys_encfile_file.result diff --git a/mysql-test/suite/plugins/r/filekeys_encfile_no.result b/mysql-test/suite/encryption/r/filekeys_encfile_no.result similarity index 100% rename from mysql-test/suite/plugins/r/filekeys_encfile_no.result rename to mysql-test/suite/encryption/r/filekeys_encfile_no.result diff --git a/mysql-test/suite/plugins/r/filekeys_nofile.result b/mysql-test/suite/encryption/r/filekeys_nofile.result similarity index 100% rename from mysql-test/suite/plugins/r/filekeys_nofile.result rename to mysql-test/suite/encryption/r/filekeys_nofile.result diff --git a/mysql-test/suite/plugins/r/filekeys_syntax.result b/mysql-test/suite/encryption/r/filekeys_syntax.result similarity index 100% rename from mysql-test/suite/plugins/r/filekeys_syntax.result rename to mysql-test/suite/encryption/r/filekeys_syntax.result diff --git a/mysql-test/suite/plugins/r/filekeys_unencfile.result b/mysql-test/suite/encryption/r/filekeys_unencfile.result similarity index 100% rename from mysql-test/suite/plugins/r/filekeys_unencfile.result rename to mysql-test/suite/encryption/r/filekeys_unencfile.result diff --git a/mysql-test/suite/innodb/r/innodb-page_encryption-32k.result b/mysql-test/suite/encryption/r/innodb-page_encryption-32k.result similarity index 100% rename from mysql-test/suite/innodb/r/innodb-page_encryption-32k.result rename to mysql-test/suite/encryption/r/innodb-page_encryption-32k.result diff --git a/mysql-test/suite/innodb/r/innodb-page_encryption.result b/mysql-test/suite/encryption/r/innodb-page_encryption.result similarity index 100% rename from mysql-test/suite/innodb/r/innodb-page_encryption.result rename to mysql-test/suite/encryption/r/innodb-page_encryption.result diff --git a/mysql-test/suite/innodb/r/innodb-page_encryption_compression.result b/mysql-test/suite/encryption/r/innodb-page_encryption_compression.result similarity index 100% rename from mysql-test/suite/innodb/r/innodb-page_encryption_compression.result rename to mysql-test/suite/encryption/r/innodb-page_encryption_compression.result diff --git a/mysql-test/suite/innodb/r/innodb-page_encryption_log_encryption.result b/mysql-test/suite/encryption/r/innodb-page_encryption_log_encryption.result similarity index 100% rename from mysql-test/suite/innodb/r/innodb-page_encryption_log_encryption.result rename to mysql-test/suite/encryption/r/innodb-page_encryption_log_encryption.result diff --git a/mysql-test/suite/innodb/r/innodb_encryption-page-compression.result b/mysql-test/suite/encryption/r/innodb_encryption-page-compression.result similarity index 100% rename from mysql-test/suite/innodb/r/innodb_encryption-page-compression.result rename to mysql-test/suite/encryption/r/innodb_encryption-page-compression.result diff --git a/mysql-test/suite/innodb/r/innodb_encryption.result b/mysql-test/suite/encryption/r/innodb_encryption.result similarity index 100% rename from mysql-test/suite/innodb/r/innodb_encryption.result rename to mysql-test/suite/encryption/r/innodb_encryption.result diff --git a/mysql-test/suite/innodb/r/innodb_encryption_tables.result b/mysql-test/suite/encryption/r/innodb_encryption_tables.result similarity index 100% rename from mysql-test/suite/innodb/r/innodb_encryption_tables.result rename to mysql-test/suite/encryption/r/innodb_encryption_tables.result diff --git a/mysql-test/suite/innodb/r/encryption_first_page.result b/mysql-test/suite/encryption/r/innodb_first_page.result similarity index 100% rename from mysql-test/suite/innodb/r/encryption_first_page.result rename to mysql-test/suite/encryption/r/innodb_first_page.result diff --git a/mysql-test/suite/innodb/r/innodb_scrub.result b/mysql-test/suite/encryption/r/innodb_scrub.result similarity index 100% rename from mysql-test/suite/innodb/r/innodb_scrub.result rename to mysql-test/suite/encryption/r/innodb_scrub.result diff --git a/mysql-test/suite/innodb/r/innodb_scrub_background.result b/mysql-test/suite/encryption/r/innodb_scrub_background.result similarity index 100% rename from mysql-test/suite/innodb/r/innodb_scrub_background.result rename to mysql-test/suite/encryption/r/innodb_scrub_background.result diff --git a/mysql-test/suite/innodb/r/innodb_scrub_compressed.result b/mysql-test/suite/encryption/r/innodb_scrub_compressed.result similarity index 100% rename from mysql-test/suite/innodb/r/innodb_scrub_compressed.result rename to mysql-test/suite/encryption/r/innodb_scrub_compressed.result diff --git a/mysql-test/suite/encryption/suite.pm b/mysql-test/suite/encryption/suite.pm new file mode 100644 index 00000000000..bfd7ec71649 --- /dev/null +++ b/mysql-test/suite/encryption/suite.pm @@ -0,0 +1,16 @@ +package My::Suite::Encryption; + +@ISA = qw(My::Suite); + +sub skip_combinations { + my @combinations; + + $skip{'include/have_file_key_management_plugin.combinations'} = [ 'ctr' ] + unless $::mysqld_variables{'version-ssl-library'} =~ /OpenSSL (\S+)/ + and $1 ge "1.0.1"; + + %skip; +} + +bless { }; + diff --git a/mysql-test/suite/innodb/t/innodb_encryption_debug.opt b/mysql-test/suite/encryption/t/debug_key_management.opt similarity index 100% rename from mysql-test/suite/innodb/t/innodb_encryption_debug.opt rename to mysql-test/suite/encryption/t/debug_key_management.opt diff --git a/mysql-test/suite/innodb/t/innodb_encryption_debug.test b/mysql-test/suite/encryption/t/debug_key_management.test similarity index 100% rename from mysql-test/suite/innodb/t/innodb_encryption_debug.test rename to mysql-test/suite/encryption/t/debug_key_management.test diff --git a/mysql-test/suite/innodb/t/innodb_encryption_force.opt b/mysql-test/suite/encryption/t/encryption_force.opt similarity index 100% rename from mysql-test/suite/innodb/t/innodb_encryption_force.opt rename to mysql-test/suite/encryption/t/encryption_force.opt diff --git a/mysql-test/suite/innodb/t/innodb_encryption_force.test b/mysql-test/suite/encryption/t/encryption_force.test similarity index 100% rename from mysql-test/suite/innodb/t/innodb_encryption_force.test rename to mysql-test/suite/encryption/t/encryption_force.test diff --git a/mysql-test/suite/plugins/t/filekeys-data.enc b/mysql-test/suite/encryption/t/filekeys-data.enc similarity index 100% rename from mysql-test/suite/plugins/t/filekeys-data.enc rename to mysql-test/suite/encryption/t/filekeys-data.enc diff --git a/mysql-test/suite/plugins/t/filekeys-data.key b/mysql-test/suite/encryption/t/filekeys-data.key similarity index 100% rename from mysql-test/suite/plugins/t/filekeys-data.key rename to mysql-test/suite/encryption/t/filekeys-data.key diff --git a/mysql-test/suite/plugins/t/filekeys_badtest.inc b/mysql-test/suite/encryption/t/filekeys_badtest.inc similarity index 100% rename from mysql-test/suite/plugins/t/filekeys_badtest.inc rename to mysql-test/suite/encryption/t/filekeys_badtest.inc diff --git a/mysql-test/suite/plugins/t/filekeys_encfile.opt b/mysql-test/suite/encryption/t/filekeys_encfile.opt similarity index 100% rename from mysql-test/suite/plugins/t/filekeys_encfile.opt rename to mysql-test/suite/encryption/t/filekeys_encfile.opt diff --git a/mysql-test/suite/plugins/t/filekeys_encfile.test b/mysql-test/suite/encryption/t/filekeys_encfile.test similarity index 100% rename from mysql-test/suite/plugins/t/filekeys_encfile.test rename to mysql-test/suite/encryption/t/filekeys_encfile.test diff --git a/mysql-test/suite/plugins/t/filekeys_encfile_bad.opt b/mysql-test/suite/encryption/t/filekeys_encfile_bad.opt similarity index 100% rename from mysql-test/suite/plugins/t/filekeys_encfile_bad.opt rename to mysql-test/suite/encryption/t/filekeys_encfile_bad.opt diff --git a/mysql-test/suite/plugins/t/filekeys_encfile_bad.test b/mysql-test/suite/encryption/t/filekeys_encfile_bad.test similarity index 100% rename from mysql-test/suite/plugins/t/filekeys_encfile_bad.test rename to mysql-test/suite/encryption/t/filekeys_encfile_bad.test diff --git a/mysql-test/suite/plugins/t/filekeys_encfile_badfile.opt b/mysql-test/suite/encryption/t/filekeys_encfile_badfile.opt similarity index 100% rename from mysql-test/suite/plugins/t/filekeys_encfile_badfile.opt rename to mysql-test/suite/encryption/t/filekeys_encfile_badfile.opt diff --git a/mysql-test/suite/plugins/t/filekeys_encfile_badfile.test b/mysql-test/suite/encryption/t/filekeys_encfile_badfile.test similarity index 100% rename from mysql-test/suite/plugins/t/filekeys_encfile_badfile.test rename to mysql-test/suite/encryption/t/filekeys_encfile_badfile.test diff --git a/mysql-test/suite/plugins/t/filekeys_encfile_file.opt b/mysql-test/suite/encryption/t/filekeys_encfile_file.opt similarity index 100% rename from mysql-test/suite/plugins/t/filekeys_encfile_file.opt rename to mysql-test/suite/encryption/t/filekeys_encfile_file.opt diff --git a/mysql-test/suite/plugins/t/filekeys_encfile_file.test b/mysql-test/suite/encryption/t/filekeys_encfile_file.test similarity index 100% rename from mysql-test/suite/plugins/t/filekeys_encfile_file.test rename to mysql-test/suite/encryption/t/filekeys_encfile_file.test diff --git a/mysql-test/suite/plugins/t/filekeys_encfile_no.opt b/mysql-test/suite/encryption/t/filekeys_encfile_no.opt similarity index 100% rename from mysql-test/suite/plugins/t/filekeys_encfile_no.opt rename to mysql-test/suite/encryption/t/filekeys_encfile_no.opt diff --git a/mysql-test/suite/plugins/t/filekeys_encfile_no.test b/mysql-test/suite/encryption/t/filekeys_encfile_no.test similarity index 100% rename from mysql-test/suite/plugins/t/filekeys_encfile_no.test rename to mysql-test/suite/encryption/t/filekeys_encfile_no.test diff --git a/mysql-test/suite/plugins/t/filekeys_goodtest.inc b/mysql-test/suite/encryption/t/filekeys_goodtest.inc similarity index 100% rename from mysql-test/suite/plugins/t/filekeys_goodtest.inc rename to mysql-test/suite/encryption/t/filekeys_goodtest.inc diff --git a/mysql-test/suite/plugins/t/filekeys_nofile.test b/mysql-test/suite/encryption/t/filekeys_nofile.test similarity index 100% rename from mysql-test/suite/plugins/t/filekeys_nofile.test rename to mysql-test/suite/encryption/t/filekeys_nofile.test diff --git a/mysql-test/include/have_file_key_management_plugin.inc b/mysql-test/suite/encryption/t/filekeys_plugin.inc similarity index 65% rename from mysql-test/include/have_file_key_management_plugin.inc rename to mysql-test/suite/encryption/t/filekeys_plugin.inc index baada3a7d47..8f0634a9076 100644 --- a/mysql-test/include/have_file_key_management_plugin.inc +++ b/mysql-test/suite/encryption/t/filekeys_plugin.inc @@ -1,5 +1,3 @@ ---source encryption_algorithms.inc - if (!$FILE_KEY_MANAGEMENT_SO) { --skip Needs file_key_management diff --git a/mysql-test/suite/plugins/t/filekeys_plugin.opt b/mysql-test/suite/encryption/t/filekeys_plugin.opt similarity index 100% rename from mysql-test/suite/plugins/t/filekeys_plugin.opt rename to mysql-test/suite/encryption/t/filekeys_plugin.opt diff --git a/mysql-test/suite/plugins/t/filekeys_syntax.opt b/mysql-test/suite/encryption/t/filekeys_syntax.opt similarity index 100% rename from mysql-test/suite/plugins/t/filekeys_syntax.opt rename to mysql-test/suite/encryption/t/filekeys_syntax.opt diff --git a/mysql-test/suite/plugins/t/filekeys_syntax.test b/mysql-test/suite/encryption/t/filekeys_syntax.test similarity index 100% rename from mysql-test/suite/plugins/t/filekeys_syntax.test rename to mysql-test/suite/encryption/t/filekeys_syntax.test diff --git a/mysql-test/suite/plugins/t/filekeys_unencfile.opt b/mysql-test/suite/encryption/t/filekeys_unencfile.opt similarity index 100% rename from mysql-test/suite/plugins/t/filekeys_unencfile.opt rename to mysql-test/suite/encryption/t/filekeys_unencfile.opt diff --git a/mysql-test/suite/plugins/t/filekeys_unencfile.test b/mysql-test/suite/encryption/t/filekeys_unencfile.test similarity index 100% rename from mysql-test/suite/plugins/t/filekeys_unencfile.test rename to mysql-test/suite/encryption/t/filekeys_unencfile.test diff --git a/mysql-test/suite/innodb/t/innodb-page_encryption-32k.opt b/mysql-test/suite/encryption/t/innodb-page_encryption-32k.opt similarity index 100% rename from mysql-test/suite/innodb/t/innodb-page_encryption-32k.opt rename to mysql-test/suite/encryption/t/innodb-page_encryption-32k.opt diff --git a/mysql-test/suite/innodb/t/innodb-page_encryption-32k.test b/mysql-test/suite/encryption/t/innodb-page_encryption-32k.test similarity index 100% rename from mysql-test/suite/innodb/t/innodb-page_encryption-32k.test rename to mysql-test/suite/encryption/t/innodb-page_encryption-32k.test diff --git a/mysql-test/suite/innodb/t/innodb-page_encryption.test b/mysql-test/suite/encryption/t/innodb-page_encryption.test similarity index 100% rename from mysql-test/suite/innodb/t/innodb-page_encryption.test rename to mysql-test/suite/encryption/t/innodb-page_encryption.test diff --git a/mysql-test/suite/innodb/t/innodb-page_encryption_compression.test b/mysql-test/suite/encryption/t/innodb-page_encryption_compression.test similarity index 100% rename from mysql-test/suite/innodb/t/innodb-page_encryption_compression.test rename to mysql-test/suite/encryption/t/innodb-page_encryption_compression.test diff --git a/mysql-test/suite/innodb/t/innodb-page_encryption_log_encryption.opt b/mysql-test/suite/encryption/t/innodb-page_encryption_log_encryption.opt similarity index 100% rename from mysql-test/suite/innodb/t/innodb-page_encryption_log_encryption.opt rename to mysql-test/suite/encryption/t/innodb-page_encryption_log_encryption.opt diff --git a/mysql-test/suite/innodb/t/innodb-page_encryption_log_encryption.test b/mysql-test/suite/encryption/t/innodb-page_encryption_log_encryption.test similarity index 100% rename from mysql-test/suite/innodb/t/innodb-page_encryption_log_encryption.test rename to mysql-test/suite/encryption/t/innodb-page_encryption_log_encryption.test diff --git a/mysql-test/suite/innodb/t/innodb_encryption-page-compression.opt b/mysql-test/suite/encryption/t/innodb_encryption-page-compression.opt similarity index 100% rename from mysql-test/suite/innodb/t/innodb_encryption-page-compression.opt rename to mysql-test/suite/encryption/t/innodb_encryption-page-compression.opt diff --git a/mysql-test/suite/innodb/t/innodb_encryption-page-compression.test b/mysql-test/suite/encryption/t/innodb_encryption-page-compression.test similarity index 100% rename from mysql-test/suite/innodb/t/innodb_encryption-page-compression.test rename to mysql-test/suite/encryption/t/innodb_encryption-page-compression.test diff --git a/mysql-test/suite/innodb/t/innodb_encryption.opt b/mysql-test/suite/encryption/t/innodb_encryption.opt similarity index 100% rename from mysql-test/suite/innodb/t/innodb_encryption.opt rename to mysql-test/suite/encryption/t/innodb_encryption.opt diff --git a/mysql-test/suite/innodb/t/innodb_encryption.test b/mysql-test/suite/encryption/t/innodb_encryption.test similarity index 100% rename from mysql-test/suite/innodb/t/innodb_encryption.test rename to mysql-test/suite/encryption/t/innodb_encryption.test diff --git a/mysql-test/suite/innodb/t/innodb_encryption_tables.opt b/mysql-test/suite/encryption/t/innodb_encryption_tables.opt similarity index 100% rename from mysql-test/suite/innodb/t/innodb_encryption_tables.opt rename to mysql-test/suite/encryption/t/innodb_encryption_tables.opt diff --git a/mysql-test/suite/innodb/t/innodb_encryption_tables.test b/mysql-test/suite/encryption/t/innodb_encryption_tables.test similarity index 100% rename from mysql-test/suite/innodb/t/innodb_encryption_tables.test rename to mysql-test/suite/encryption/t/innodb_encryption_tables.test diff --git a/mysql-test/suite/innodb/t/encryption_first_page.opt b/mysql-test/suite/encryption/t/innodb_first_page.opt similarity index 100% rename from mysql-test/suite/innodb/t/encryption_first_page.opt rename to mysql-test/suite/encryption/t/innodb_first_page.opt diff --git a/mysql-test/suite/innodb/t/encryption_first_page.test b/mysql-test/suite/encryption/t/innodb_first_page.test similarity index 100% rename from mysql-test/suite/innodb/t/encryption_first_page.test rename to mysql-test/suite/encryption/t/innodb_first_page.test diff --git a/mysql-test/suite/innodb/t/innodb_scrub.opt b/mysql-test/suite/encryption/t/innodb_scrub.opt similarity index 100% rename from mysql-test/suite/innodb/t/innodb_scrub.opt rename to mysql-test/suite/encryption/t/innodb_scrub.opt diff --git a/mysql-test/suite/innodb/t/innodb_scrub.test b/mysql-test/suite/encryption/t/innodb_scrub.test similarity index 100% rename from mysql-test/suite/innodb/t/innodb_scrub.test rename to mysql-test/suite/encryption/t/innodb_scrub.test diff --git a/mysql-test/suite/innodb/t/innodb_scrub_background.opt b/mysql-test/suite/encryption/t/innodb_scrub_background.opt similarity index 100% rename from mysql-test/suite/innodb/t/innodb_scrub_background.opt rename to mysql-test/suite/encryption/t/innodb_scrub_background.opt diff --git a/mysql-test/suite/innodb/t/innodb_scrub_background.test b/mysql-test/suite/encryption/t/innodb_scrub_background.test similarity index 100% rename from mysql-test/suite/innodb/t/innodb_scrub_background.test rename to mysql-test/suite/encryption/t/innodb_scrub_background.test diff --git a/mysql-test/suite/innodb/t/innodb_scrub_compressed.opt b/mysql-test/suite/encryption/t/innodb_scrub_compressed.opt similarity index 100% rename from mysql-test/suite/innodb/t/innodb_scrub_compressed.opt rename to mysql-test/suite/encryption/t/innodb_scrub_compressed.opt diff --git a/mysql-test/suite/innodb/t/innodb_scrub_compressed.test b/mysql-test/suite/encryption/t/innodb_scrub_compressed.test similarity index 100% rename from mysql-test/suite/innodb/t/innodb_scrub_compressed.test rename to mysql-test/suite/encryption/t/innodb_scrub_compressed.test diff --git a/mysql-test/suite/sys_vars/r/innodb_data_encryption_filekey_basic.result b/mysql-test/suite/sys_vars/r/innodb_data_encryption_filekey_basic.result deleted file mode 100644 index f7660620a2f..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_data_encryption_filekey_basic.result +++ /dev/null @@ -1,9 +0,0 @@ -SELECT @start_data_encryption_filekey; -@start_data_encryption_filekey -NULL -SELECT COUNT(@@GLOBAL.innodb_data_encryption_filekey); -COUNT(@@GLOBAL.innodb_data_encryption_filekey) -0 -1 Expected -SET @@GLOBAL.innodb_data_encryption_filekey='secret'; -ERROR HY000: Variable 'innodb_data_encryption_filekey' is a read only variable diff --git a/mysql-test/suite/sys_vars/r/innodb_data_encryption_providername_basic.result b/mysql-test/suite/sys_vars/r/innodb_data_encryption_providername_basic.result deleted file mode 100644 index 12b4407290b..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_data_encryption_providername_basic.result +++ /dev/null @@ -1,9 +0,0 @@ -SELECT @start_data_encryption_providername; -@start_data_encryption_providername -NULL -SELECT COUNT(@@GLOBAL.innodb_data_encryption_providername); -COUNT(@@GLOBAL.innodb_data_encryption_providername) -0 -1 Expected -SET @@GLOBAL.innodb_data_encryption_providername='key.txt'; -ERROR HY000: Variable 'innodb_data_encryption_providername' is a read only variable diff --git a/mysql-test/suite/sys_vars/r/innodb_data_encryption_providertype_basic.result b/mysql-test/suite/sys_vars/r/innodb_data_encryption_providertype_basic.result deleted file mode 100644 index 8a45857496e..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_data_encryption_providertype_basic.result +++ /dev/null @@ -1,11 +0,0 @@ -SELECT @start_data_encryption_providertype; -@start_data_encryption_providertype -NULL -SELECT COUNT(@@GLOBAL.innodb_data_encryption_providertype); -COUNT(@@GLOBAL.innodb_data_encryption_providertype) -1 -1 Expected -SET @@GLOBAL.innodb_data_encryption_providertype=1; -ERROR HY000: Variable 'innodb_data_encryption_providertype' is a read only variable -SET @@GLOBAL.innodb_data_encryption_providertype=k; -ERROR HY000: Variable 'innodb_data_encryption_providertype' is a read only variable diff --git a/mysql-test/suite/sys_vars/r/innodb_data_encryption_providerurl_basic.result b/mysql-test/suite/sys_vars/r/innodb_data_encryption_providerurl_basic.result deleted file mode 100644 index 2a0fa74b347..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_data_encryption_providerurl_basic.result +++ /dev/null @@ -1,9 +0,0 @@ -SELECT @start_data_encryption_providerurl; -@start_data_encryption_providerurl -NULL -SELECT COUNT(@@GLOBAL.innodb_data_encryption_providerurl); -COUNT(@@GLOBAL.innodb_data_encryption_providerurl) -0 -1 Expected -SET @@GLOBAL.innodb_data_encryption_providerurl='http://www.google.com'; -ERROR HY000: Variable 'innodb_data_encryption_providerurl' is a read only variable diff --git a/mysql-test/suite/sys_vars/t/innodb_data_encryption_filekey_basic.test b/mysql-test/suite/sys_vars/t/innodb_data_encryption_filekey_basic.test deleted file mode 100644 index a35be702c25..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_data_encryption_filekey_basic.test +++ /dev/null @@ -1,14 +0,0 @@ ---source include/have_innodb.inc ---source include/have_innodb_encryption.inc - -SELECT @start_data_encryption_filekey; - -SELECT COUNT(@@GLOBAL.innodb_data_encryption_filekey); ---echo 1 Expected - -# This variable is read only variable ---error 1238 -SET @@GLOBAL.innodb_data_encryption_filekey='secret'; - - - diff --git a/mysql-test/suite/sys_vars/t/innodb_data_encryption_providername_basic.test b/mysql-test/suite/sys_vars/t/innodb_data_encryption_providername_basic.test deleted file mode 100644 index 80e8282af8f..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_data_encryption_providername_basic.test +++ /dev/null @@ -1,11 +0,0 @@ ---source include/have_innodb.inc ---source include/have_innodb_encryption.inc - -SELECT @start_data_encryption_providername; - -SELECT COUNT(@@GLOBAL.innodb_data_encryption_providername); ---echo 1 Expected - -# This variable is read only variable ---error 1238 -SET @@GLOBAL.innodb_data_encryption_providername='key.txt'; diff --git a/mysql-test/suite/sys_vars/t/innodb_data_encryption_providertype_basic.test b/mysql-test/suite/sys_vars/t/innodb_data_encryption_providertype_basic.test deleted file mode 100644 index 7e841a27d27..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_data_encryption_providertype_basic.test +++ /dev/null @@ -1,16 +0,0 @@ ---source include/have_innodb.inc ---source include/have_innodb_encryption.inc - -SELECT @start_data_encryption_providertype; - -SELECT COUNT(@@GLOBAL.innodb_data_encryption_providertype); ---echo 1 Expected - -# This variable is read only variable ---error 1238 -SET @@GLOBAL.innodb_data_encryption_providertype=1; - -# This variable is read only variable ---error 1238 -SET @@GLOBAL.innodb_data_encryption_providertype=k; - diff --git a/mysql-test/suite/sys_vars/t/innodb_data_encryption_providerurl_basic.test b/mysql-test/suite/sys_vars/t/innodb_data_encryption_providerurl_basic.test deleted file mode 100644 index d742fe2aa06..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_data_encryption_providerurl_basic.test +++ /dev/null @@ -1,14 +0,0 @@ ---source include/have_innodb.inc ---source include/have_innodb_encryption.inc - -SELECT @start_data_encryption_providerurl; - -SELECT COUNT(@@GLOBAL.innodb_data_encryption_providerurl); ---echo 1 Expected - -# This variable is read only variable ---error 1238 -SET @@GLOBAL.innodb_data_encryption_providerurl='http://www.google.com'; - - -