mtr: *.opt files, always enable innodb-encrypt-log

because one is supposed always to use it with innodb-encrypt-tables

mysql-test/suite/innodb/r/innodb_encryption.result

@@ -1,7 +1,7 @@
 SET @start_global_value = @@global.innodb_encryption_threads;
 SHOW VARIABLES LIKE 'innodb_encrypt%';
 Variable_name	Value
-innodb_encrypt_log	OFF
+innodb_encrypt_log	ON
 innodb_encrypt_tables	ON
 innodb_encryption_rotate_key_age	15
 innodb_encryption_rotation_iops	100
@@ -44,7 +44,7 @@ SET GLOBAL innodb_encryption_threads=@start_global_value;
 # Restart mysqld --innodb_encrypt_tables=0 --innodb_encryption_threads=0
 SHOW VARIABLES LIKE 'innodb_encrypt%';
 Variable_name	Value
-innodb_encrypt_log	OFF
+innodb_encrypt_log	ON
 innodb_encrypt_tables	OFF
 innodb_encryption_rotate_key_age	15
 innodb_encryption_rotation_iops	100

mysql-test/suite/innodb/r/innodb_encryption_debug.result

@@ -1,6 +1,6 @@
 show variables like 'innodb_encrypt%';
 Variable_name	Value
-innodb_encrypt_log	OFF
+innodb_encrypt_log	ON
 innodb_encrypt_tables	ON
 innodb_encryption_rotate_key_age	2
 innodb_encryption_rotation_iops	100

mysql-test/suite/innodb/t/innodb_encryption-page-compression.opt

@@ -1,6 +1,7 @@
 --aria-encrypt-tables=ON
 --encrypt-tmp-disk-tables=ON
 --innodb-encrypt-tables=ON
+--innodb-encrypt-log=ON
 --innodb-encryption-rotate-key-age=15
 --innodb-encryption-threads=4
 --innodb-tablespaces-encryption

mysql-test/suite/innodb/t/innodb_encryption.opt

@@ -1,6 +1,7 @@
 --aria-encrypt-tables=ON
 --encrypt-tmp-disk-tables=ON
 --innodb-encrypt-tables=ON
+--innodb-encrypt-log=ON
 --innodb-encryption-rotate-key-age=15
 --innodb-encryption-threads=4
 --innodb-tablespaces-encryption

mysql-test/suite/innodb/t/innodb_encryption_debug.opt

@@ -1,4 +1,5 @@
 --innodb-encrypt-tables=ON
+--innodb-encrypt-log=ON
 --innodb-encryption-rotate-key-age=2
 --innodb-encryption-threads=4
 --innodb-tablespaces-encryption

mysql-test/suite/innodb/t/innodb_encryption_tables.opt

@@ -1,6 +1,7 @@
 --aria-encrypt-tables=ON
 --encrypt-tmp-disk-tables=ON
 --innodb-encrypt-tables=ON
+--innodb-encrypt-log=ON
 --innodb-encryption-rotate-key-age=15
 --innodb-encryption-threads=4
 --innodb-tablespaces-encryption

mysql-test/suite/innodb/t/innodb_scrub.opt

@@ -2,12 +2,11 @@
 --encrypt-tmp-disk-tables=ON
 --innodb-background-scrub-data-compressed=OFF
 --innodb-background-scrub-data-uncompressed=OFF
---innodb-encrypt-tables=0
 --innodb-encrypt-tables=ON
+--innodb-encrypt-log=ON
 --innodb-encryption-rotate-key-age=15
---innodb-encryption-threads=0
 --innodb-encryption-threads=4
 --innodb-file-format=Barracuda
 --innodb-file-per-table=1
 --innodb-immediate-scrub-data-uncompressed=ON
---loose-innodb-scrub-force-testing=ON
+--loose-innodb-debug-force-scrubbing=ON

mysql-test/suite/innodb/t/innodb_scrub_background.opt

@@ -1,14 +1,13 @@
 --innodb-file-per-table=1
 --innodb-file-format=Barracuda
---innodb-encrypt-tables=0
---innodb-encryption-threads=0
 --innodb-immediate-scrub-data-uncompressed=OFF
 --innodb-background-scrub-data-uncompressed=ON
 --innodb-background-scrub-data-compressed=ON
---loose-innodb-scrub-force-testing=ON
+--loose-innodb-debug-force-scrubbing=ON
 --encrypt-tmp-disk-tables=ON
 --aria-encrypt-tables=ON
 --innodb-encryption-threads=4
 --innodb-encryption-rotate-key-age=15
 --innodb-encrypt-tables=ON
+--innodb-encrypt-log=ON
 --innodb-tablespaces-scrubbing

mysql-test/suite/innodb/t/innodb_scrub_compressed.opt

@@ -1,15 +1,13 @@
 --innodb-file-per-table=1
 --innodb-file-format=Barracuda
---innodb-encrypt-tables=off
 --innodb-immediate-scrub-data-uncompressed=ON
 --innodb-background-scrub-data-uncompressed=ON
 --innodb-background-scrub-data-compressed=ON
---loose-innodb-scrub-force-testing=ON
---innodb-encryption-threads=0
+--loose-innodb-debug-force-scrubbing=ON
 --encrypt-tmp-disk-tables=ON
 --aria-encrypt-tables=ON
 --innodb-encryption-threads=4
 --innodb-encryption-rotate-key-age=15
 --innodb-encrypt-tables=ON
+--innodb-encrypt-log=ON
 --innodb-tablespaces-scrubbing
-