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

Fix test failure on debug_key_management test.

Browse Source
This commit is contained in:
Jan Lindström
2017-03-28 12:28:09 +03:00
parent ba298b1f02
commit c56b896c17
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mysql-test/suite/encryption/r/debug_key_management.result
View File

@ -6,16 +6,12 @@ innodb_encrypt_tables ON
innodb_encryption_rotate_key_age 2 innodb_encryption_rotate_key_age 2
innodb_encryption_rotation_iops 100 innodb_encryption_rotation_iops 100
innodb_encryption_threads 4 innodb_encryption_threads 4
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;
space name current_key_version count(*)
0 ./ibdata1 1 0
1 mysql/innodb_table_stats 1
2 mysql/innodb_index_stats 1
set global debug_key_management_version=10; set global debug_key_management_version=10;
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;
space name current_key_version count(*)
0 ./ibdata1 10 0
1 mysql/innodb_table_stats 10
2 mysql/innodb_index_stats 10
set global innodb_encrypt_tables=OFF; set global innodb_encrypt_tables=OFF;
set global debug_key_management_version=1; set global debug_key_management_version=1;

5
mysql-test/suite/encryption/t/debug_key_management.test
View File

@ -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; let $wait_condition= select count(*) = 3 from information_schema.innodb_tablespaces_encryption where current_key_version=1;
--source include/wait_condition.inc --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; set global debug_key_management_version=10;
let $wait_condition= select count(*) = 3 from information_schema.innodb_tablespaces_encryption where current_key_version=10; let $wait_condition= select count(*) = 3 from information_schema.innodb_tablespaces_encryption where current_key_version=10;
--source include/wait_condition.inc --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 # Note that we expect that key_version is increasing so disable encryption before reset
set global innodb_encrypt_tables=OFF; set global innodb_encrypt_tables=OFF;
set global debug_key_management_version=1; set global debug_key_management_version=1;