database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fixed innodb_scrub_background test.

Browse Source
This commit is contained in:
Jan Lindström
2015-05-27 11:00:46 +03:00
parent 1734bea8b3
commit 58d7e35f59
5 changed files with 8 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/suite/encryption/r/innodb_scrub_background.result
View File

@ -55,13 +55,6 @@ SET GLOBAL innodb_encryption_threads=5;
# Success! # Success!
# stop scrubbing threads # stop scrubbing threads
SET GLOBAL innodb_encryption_threads=0; 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 # restart mysqld so that all pages are flushed
# read all rows from table # read all rows from table
select * from t1; select * from t1;

9
mysql-test/suite/encryption/t/innodb_scrub.opt
View File

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

8
mysql-test/suite/encryption/t/innodb_scrub_background.opt
View File

@ -4,10 +4,6 @@
--innodb-background-scrub-data-uncompressed=ON --innodb-background-scrub-data-uncompressed=ON
--innodb-background-scrub-data-compressed=ON --innodb-background-scrub-data-compressed=ON
--loose-innodb-debug-force-scrubbing=ON --loose-innodb-debug-force-scrubbing=ON
--encrypt-tmp-disk-tables=ON --innodb-encryption-threads=0
--aria-encrypt-tables=ON --innodb-encrypt-tables=OFF
--innodb-encryption-threads=4
--innodb-encryption-rotate-key-age=15
--innodb-encrypt-tables=ON
--innodb-encrypt-log=ON
--innodb-tablespaces-scrubbing --innodb-tablespaces-scrubbing

8
mysql-test/suite/encryption/t/innodb_scrub_background.test
View File

@ -129,17 +129,11 @@ if (!$success)
SHOW STATUS LIKE 'innodb_%scrub%'; SHOW STATUS LIKE 'innodb_%scrub%';
-- die Timeout waiting for background threads -- die Timeout waiting for background threads
} }
-- echo # Success! -- echo # Success!
-- echo # stop scrubbing threads -- echo # stop scrubbing threads
SET GLOBAL innodb_encryption_threads=0; 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 -- echo # restart mysqld so that all pages are flushed
-- source include/restart_mysqld.inc -- source include/restart_mysqld.inc
-- echo # read all rows from table -- echo # read all rows from table

8
mysql-test/suite/encryption/t/innodb_scrub_compressed.opt
View File

@ -4,10 +4,6 @@
--innodb-background-scrub-data-uncompressed=ON --innodb-background-scrub-data-uncompressed=ON
--innodb-background-scrub-data-compressed=ON --innodb-background-scrub-data-compressed=ON
--loose-innodb-debug-force-scrubbing=ON --loose-innodb-debug-force-scrubbing=ON
--encrypt-tmp-disk-tables=ON --innodb-encrypt-tables=OFF
--aria-encrypt-tables=ON --innodb-encrypt-log=OFF
--innodb-encryption-threads=4
--innodb-encryption-rotate-key-age=15
--innodb-encrypt-tables=ON
--innodb-encrypt-log=ON
--innodb-tablespaces-scrubbing --innodb-tablespaces-scrubbing