Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
58d7e35f
Commit
58d7e35f
authored
9 years ago
by
Jan Lindström
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed innodb_scrub_background test.
parent
1734bea8
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
32 deletions
+8
-32
mysql-test/suite/encryption/r/innodb_scrub_background.result
mysql-test/suite/encryption/r/innodb_scrub_background.result
+0
-7
mysql-test/suite/encryption/t/innodb_scrub.opt
mysql-test/suite/encryption/t/innodb_scrub.opt
+3
-6
mysql-test/suite/encryption/t/innodb_scrub_background.opt
mysql-test/suite/encryption/t/innodb_scrub_background.opt
+2
-6
mysql-test/suite/encryption/t/innodb_scrub_background.test
mysql-test/suite/encryption/t/innodb_scrub_background.test
+1
-7
mysql-test/suite/encryption/t/innodb_scrub_compressed.opt
mysql-test/suite/encryption/t/innodb_scrub_compressed.opt
+2
-6
No files found.
mysql-test/suite/encryption/r/innodb_scrub_background.result
View file @
58d7e35f
...
...
@@ -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;
...
...
This diff is collapsed.
Click to expand it.
mysql-test/suite/encryption/t/innodb_scrub.opt
View file @
58d7e35f
--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
This diff is collapsed.
Click to expand it.
mysql-test/suite/encryption/t/innodb_scrub_background.opt
View file @
58d7e35f
...
...
@@ -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
This diff is collapsed.
Click to expand it.
mysql-test/suite/encryption/t/innodb_scrub_background.test
View file @
58d7e35f
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
mysql-test/suite/encryption/t/innodb_scrub_compressed.opt
View file @
58d7e35f
...
...
@@ -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
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment