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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
c56b896c
Commit
c56b896c
authored
Mar 28, 2017
by
Jan Lindström
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix test failure on debug_key_management test.
parent
ba298b1f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
12 deletions
+9
-12
mysql-test/suite/encryption/r/debug_key_management.result
mysql-test/suite/encryption/r/debug_key_management.result
+6
-10
mysql-test/suite/encryption/t/debug_key_management.test
mysql-test/suite/encryption/t/debug_key_management.test
+3
-2
No files found.
mysql-test/suite/encryption/r/debug_key_management.result
View file @
c56b896c
...
...
@@ -6,16 +6,12 @@ innodb_encrypt_tables ON
innodb_encryption_rotate_key_age 2
innodb_encryption_rotation_iops 100
innodb_encryption_threads 4
select space,name,current_key_version from information_schema.innodb_tablespaces_encryption order by space;
space name current_key_version
0 ./ibdata1 1
1 mysql/innodb_table_stats 1
2 mysql/innodb_index_stats 1
select count(*) from information_schema.innodb_tablespaces_encryption where current_key_version <> 1;
count(*)
0
set global debug_key_management_version=10;
select space,name,current_key_version from information_schema.innodb_tablespaces_encryption order by space;
space name current_key_version
0 ./ibdata1 10
1 mysql/innodb_table_stats 10
2 mysql/innodb_index_stats 10
select count(*) from information_schema.innodb_tablespaces_encryption where current_key_version <> 10;
count(*)
0
set global innodb_encrypt_tables=OFF;
set global debug_key_management_version=1;
mysql-test/suite/encryption/t/debug_key_management.test
View file @
c56b896c
...
...
@@ -11,14 +11,15 @@ show variables like 'innodb_encrypt%';
let
$wait_condition
=
select
count
(
*
)
=
3
from
information_schema
.
innodb_tablespaces_encryption
where
current_key_version
=
1
;
--
source
include
/
wait_condition
.
inc
select
space
,
name
,
current_key_version
from
information_schema
.
innodb_tablespaces_encryption
order
by
space
;
select
count
(
*
)
from
information_schema
.
innodb_tablespaces_encryption
where
current_key_version
<>
1
;
set
global
debug_key_management_version
=
10
;
let
$wait_condition
=
select
count
(
*
)
=
3
from
information_schema
.
innodb_tablespaces_encryption
where
current_key_version
=
10
;
--
source
include
/
wait_condition
.
inc
select
space
,
name
,
current_key_version
from
information_schema
.
innodb_tablespaces_encryption
order
by
space
;
select
count
(
*
)
from
information_schema
.
innodb_tablespaces_encryption
where
current_key_version
<>
10
;
# Note that we expect that key_version is increasing so disable encryption before reset
set
global
innodb_encrypt_tables
=
OFF
;
set
global
debug_key_management_version
=
1
;
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