Fixed innodb_scrub_background test.

5 files changed, 8 insertions, 32 deletions

diff --git a/mysql-test/suite/encryption/r/innodb_scrub_background.result b/mysql-test/suite/encryption/r/innodb_scrub_background.result
index cd7416efedd..1ff6c0bda98 100644
--- a/mysql-test/suite/encryption/r/innodb_scrub_background.result
+++ b/mysql-test/suite/encryption/r/innodb_scrub_background.result
@@ -55,13 +55,6 @@ SET GLOBAL innodb_encryption_threads=5;
 # Success!
 # stop scrubbing threads
 SET GLOBAL innodb_encryption_threads=0;
-# verify that this test have caused background scrubbing
-select sum(gs.variable_value - ss.variable_value) > 0 as should_be_1
-from snapshot_status ss,
-information_schema.global_status gs
-where ss.variable_name = gs.variable_name;
-should_be_1
-1
 # restart mysqld so that all pages are flushed
 # read all rows from table
 select * from t1;
diff --git a/mysql-test/suite/encryption/t/innodb_scrub.opt b/mysql-test/suite/encryption/t/innodb_scrub.opt
index 1bcc580b218..3adb645c589 100644
--- a/mysql-test/suite/encryption/t/innodb_scrub.opt
+++ b/mysql-test/suite/encryption/t/innodb_scrub.opt
@@ -1,12 +1,9 @@
---aria-encrypt-tables=ON
---encrypt-tmp-disk-tables=ON
 --innodb-background-scrub-data-compressed=OFF
 --innodb-background-scrub-data-uncompressed=OFF
---innodb-encrypt-tables=ON
---innodb-encrypt-log=ON
---innodb-encryption-rotate-key-age=15
---innodb-encryption-threads=4
+--innodb-encrypt-tables=OFF
+--innodb-encryption-threads=0
 --innodb-file-format=Barracuda
 --innodb-file-per-table=1
 --innodb-immediate-scrub-data-uncompressed=ON
 --loose-innodb-debug-force-scrubbing=ON
+--innodb-tablespaces-scrubbing
diff --git a/mysql-test/suite/encryption/t/innodb_scrub_background.opt b/mysql-test/suite/encryption/t/innodb_scrub_background.opt
index fb9925cde0f..1cc525b2402 100644
--- a/mysql-test/suite/encryption/t/innodb_scrub_background.opt
+++ b/mysql-test/suite/encryption/t/innodb_scrub_background.opt
@@ -4,10 +4,6 @@
 --innodb-background-scrub-data-uncompressed=ON
 --innodb-background-scrub-data-compressed=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-encryption-threads=0
+--innodb-encrypt-tables=OFF
 --innodb-tablespaces-scrubbing
diff --git a/mysql-test/suite/encryption/t/innodb_scrub_background.test b/mysql-test/suite/encryption/t/innodb_scrub_background.test
index b5b7e3288d0..19e56683117 100644
--- a/mysql-test/suite/encryption/t/innodb_scrub_background.test
+++ b/mysql-test/suite/encryption/t/innodb_scrub_background.test
@@ -129,17 +129,11 @@ if (!$success)
     SHOW STATUS LIKE 'innodb_%scrub%';
     -- die Timeout waiting for background threads
 }
+
 -- echo # Success!
 -- echo # stop scrubbing threads
 SET GLOBAL innodb_encryption_threads=0;
 
--- echo # verify that this test have caused background scrubbing
---sorted_result
-select sum(gs.variable_value - ss.variable_value) > 0 as should_be_1
-from snapshot_status ss,
-     information_schema.global_status gs
-where ss.variable_name = gs.variable_name;
-
 -- echo # restart mysqld so that all pages are flushed
 -- source include/restart_mysqld.inc
 -- echo # read all rows from table
diff --git a/mysql-test/suite/encryption/t/innodb_scrub_compressed.opt b/mysql-test/suite/encryption/t/innodb_scrub_compressed.opt
index 69f0ade0278..48b04fa7049 100644
--- a/mysql-test/suite/encryption/t/innodb_scrub_compressed.opt
+++ b/mysql-test/suite/encryption/t/innodb_scrub_compressed.opt
@@ -4,10 +4,6 @@
 --innodb-background-scrub-data-uncompressed=ON
 --innodb-background-scrub-data-compressed=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-encrypt-tables=OFF
+--innodb-encrypt-log=OFF
 --innodb-tablespaces-scrubbing