move encryption tests to a dedicate suite

remove few tests for variables that never existed (merge error)

85 files changed, 28 insertions, 118 deletions

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
index a87d3256ee0..a87d3256ee0 100644
--- a/mysql-test/include/have_example_key_management_plugin.inc
+++ b/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
index ce7f1ddef7e..ce7f1ddef7e 100644
--- a/mysql-test/include/have_example_key_management_plugin.opt
+++ b/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
index 8f0634a9076..8f0634a9076 100644
--- a/mysql-test/suite/plugins/t/filekeys_plugin.inc
+++ b/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
index 45d629e52e6..45d629e52e6 100644
--- a/mysql-test/suite/innodb/r/innodb_encryption_debug.result
+++ b/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
index 8e129899275..8e129899275 100644
--- a/mysql-test/suite/innodb/r/innodb_encryption_force.result
+++ b/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
index add6f312fda..add6f312fda 100644
--- a/mysql-test/suite/plugins/r/filekeys_encfile.result
+++ b/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
index 6261bd459b8..6261bd459b8 100644
--- a/mysql-test/suite/plugins/r/filekeys_encfile_bad.result
+++ b/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
index 98e2266f3f2..98e2266f3f2 100644
--- a/mysql-test/suite/plugins/r/filekeys_encfile_badfile.result
+++ b/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
index add6f312fda..add6f312fda 100644
--- a/mysql-test/suite/plugins/r/filekeys_encfile_file.result
+++ b/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
index 6261bd459b8..6261bd459b8 100644
--- a/mysql-test/suite/plugins/r/filekeys_encfile_no.result
+++ b/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
index 558ea1ce88c..558ea1ce88c 100644
--- a/mysql-test/suite/plugins/r/filekeys_nofile.result
+++ b/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
index a5606152d80..a5606152d80 100644
--- a/mysql-test/suite/plugins/r/filekeys_syntax.result
+++ b/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
index 1b9c092a713..1b9c092a713 100644
--- a/mysql-test/suite/plugins/r/filekeys_unencfile.result
+++ b/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
index 6aa98a2fc68..6aa98a2fc68 100644
--- a/mysql-test/suite/innodb/r/innodb-page_encryption-32k.result
+++ b/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
index 2a52d1a07b3..2a52d1a07b3 100644
--- a/mysql-test/suite/innodb/r/innodb-page_encryption.result
+++ b/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
index 02a13b3c13c..02a13b3c13c 100644
--- a/mysql-test/suite/innodb/r/innodb-page_encryption_compression.result
+++ b/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
index 5a3a46e3620..5a3a46e3620 100644
--- a/mysql-test/suite/innodb/r/innodb-page_encryption_log_encryption.result
+++ b/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
index c46cfebd7d2..c46cfebd7d2 100644
--- a/mysql-test/suite/innodb/r/innodb_encryption-page-compression.result
+++ b/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
index 283c78e33d3..283c78e33d3 100644
--- a/mysql-test/suite/innodb/r/innodb_encryption.result
+++ b/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
index ee5be0bfdd3..ee5be0bfdd3 100644
--- a/mysql-test/suite/innodb/r/innodb_encryption_tables.result
+++ b/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
index c2bbdb5695b..c2bbdb5695b 100644
--- a/mysql-test/suite/innodb/r/encryption_first_page.result
+++ b/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
index 95f0aed3226..95f0aed3226 100644
--- a/mysql-test/suite/innodb/r/innodb_scrub.result
+++ b/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
index cd7416efedd..cd7416efedd 100644
--- a/mysql-test/suite/innodb/r/innodb_scrub_background.result
+++ b/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
index 0b5e9f11a05..0b5e9f11a05 100644
--- a/mysql-test/suite/innodb/r/innodb_scrub_compressed.result
+++ b/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
index 722d4676594..722d4676594 100644
--- a/mysql-test/suite/innodb/t/innodb_encryption_debug.opt
+++ b/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
index f733d6ec91c..f733d6ec91c 100644
--- a/mysql-test/suite/innodb/t/innodb_encryption_debug.test
+++ b/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
index c9e532878e1..c9e532878e1 100644
--- a/mysql-test/suite/innodb/t/innodb_encryption_force.opt
+++ b/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
index 71ca23ff3cc..71ca23ff3cc 100644
--- a/mysql-test/suite/innodb/t/innodb_encryption_force.test
+++ b/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
index a8adb2f939c..a8adb2f939c 100644
--- a/mysql-test/suite/plugins/t/filekeys-data.enc
+++ b/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
index 536aca34dba..536aca34dba 100644
--- a/mysql-test/suite/plugins/t/filekeys-data.key
+++ b/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
index 7c0858af20a..7c0858af20a 100644
--- a/mysql-test/suite/plugins/t/filekeys_badtest.inc
+++ b/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
index 651cc0f4cbe..651cc0f4cbe 100644
--- a/mysql-test/suite/plugins/t/filekeys_encfile.opt
+++ b/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
index a0611a38ec4..a0611a38ec4 100644
--- a/mysql-test/suite/plugins/t/filekeys_encfile.test
+++ b/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
index 6ece8c6b08d..6ece8c6b08d 100644
--- a/mysql-test/suite/plugins/t/filekeys_encfile_bad.opt
+++ b/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
index 51ab14c5608..51ab14c5608 100644
--- a/mysql-test/suite/plugins/t/filekeys_encfile_bad.test
+++ b/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
index 374a41395b8..374a41395b8 100644
--- a/mysql-test/suite/plugins/t/filekeys_encfile_badfile.opt
+++ b/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
index e0b07ac62b1..e0b07ac62b1 100644
--- a/mysql-test/suite/plugins/t/filekeys_encfile_badfile.test
+++ b/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
index df2d3d526d7..df2d3d526d7 100644
--- a/mysql-test/suite/plugins/t/filekeys_encfile_file.opt
+++ b/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
index a0611a38ec4..a0611a38ec4 100644
--- a/mysql-test/suite/plugins/t/filekeys_encfile_file.test
+++ b/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
index 68264e5c261..68264e5c261 100644
--- a/mysql-test/suite/plugins/t/filekeys_encfile_no.opt
+++ b/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
index 51ab14c5608..51ab14c5608 100644
--- a/mysql-test/suite/plugins/t/filekeys_encfile_no.test
+++ b/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
index 146a570412c..146a570412c 100644
--- a/mysql-test/suite/plugins/t/filekeys_goodtest.inc
+++ b/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
index c4505ebec81..c4505ebec81 100644
--- a/mysql-test/suite/plugins/t/filekeys_nofile.test
+++ b/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
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
index b42e6266e66..b42e6266e66 100644
--- a/mysql-test/suite/plugins/t/filekeys_plugin.opt
+++ b/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
index 4be6601bbac..4be6601bbac 100644
--- a/mysql-test/suite/plugins/t/filekeys_syntax.opt
+++ b/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
index e68e18bee1a..e68e18bee1a 100644
--- a/mysql-test/suite/plugins/t/filekeys_syntax.test
+++ b/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
index b7e207c07d4..b7e207c07d4 100644
--- a/mysql-test/suite/plugins/t/filekeys_unencfile.opt
+++ b/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
index 2567c29f5ec..2567c29f5ec 100644
--- a/mysql-test/suite/plugins/t/filekeys_unencfile.test
+++ b/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
index a9021f6de15..a9021f6de15 100644
--- a/mysql-test/suite/innodb/t/innodb-page_encryption-32k.opt
+++ b/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
index 325f0a86521..325f0a86521 100644
--- a/mysql-test/suite/innodb/t/innodb-page_encryption-32k.test
+++ b/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
index 2f9192a5dec..2f9192a5dec 100644
--- a/mysql-test/suite/innodb/t/innodb-page_encryption.test
+++ b/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
index 00304e5268a..00304e5268a 100644
--- a/mysql-test/suite/innodb/t/innodb-page_encryption_compression.test
+++ b/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
index f14c376c3b9..f14c376c3b9 100644
--- a/mysql-test/suite/innodb/t/innodb-page_encryption_log_encryption.opt
+++ b/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
index fec5f062a71..fec5f062a71 100644
--- a/mysql-test/suite/innodb/t/innodb-page_encryption_log_encryption.test
+++ b/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
index 0b7319dcef5..0b7319dcef5 100644
--- a/mysql-test/suite/innodb/t/innodb_encryption-page-compression.opt
+++ b/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
index 34962167ef1..34962167ef1 100644
--- a/mysql-test/suite/innodb/t/innodb_encryption-page-compression.test
+++ b/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
index b2c709f04b2..b2c709f04b2 100644
--- a/mysql-test/suite/innodb/t/innodb_encryption.opt
+++ b/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
index 50aca2a7260..50aca2a7260 100644
--- a/mysql-test/suite/innodb/t/innodb_encryption.test
+++ b/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
index 0b7319dcef5..0b7319dcef5 100644
--- a/mysql-test/suite/innodb/t/innodb_encryption_tables.opt
+++ b/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
index 6d378270ad9..6d378270ad9 100644
--- a/mysql-test/suite/innodb/t/innodb_encryption_tables.test
+++ b/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
index 1a9099a649d..1a9099a649d 100644
--- a/mysql-test/suite/innodb/t/encryption_first_page.opt
+++ b/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
index 917a1e990a6..917a1e990a6 100644
--- a/mysql-test/suite/innodb/t/encryption_first_page.test
+++ b/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
index 1bcc580b218..1bcc580b218 100644
--- a/mysql-test/suite/innodb/t/innodb_scrub.opt
+++ b/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
index 32170567b4c..32170567b4c 100644
--- a/mysql-test/suite/innodb/t/innodb_scrub.test
+++ b/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
index fb9925cde0f..fb9925cde0f 100644
--- a/mysql-test/suite/innodb/t/innodb_scrub_background.opt
+++ b/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
index b5b7e3288d0..b5b7e3288d0 100644
--- a/mysql-test/suite/innodb/t/innodb_scrub_background.test
+++ b/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
index 69f0ade0278..69f0ade0278 100644
--- a/mysql-test/suite/innodb/t/innodb_scrub_compressed.opt
+++ b/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
index d41edac7494..d41edac7494 100644
--- a/mysql-test/suite/innodb/t/innodb_scrub_compressed.test
+++ b/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';
-
-
-