database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-16 20:23:18 +03:00
Code Activity

make innodb_encryption_debug test more robust

Browse Source
This commit is contained in:
Sergei Golubchik
2015-04-08 22:07:37 +02:00
parent f130da7b00
commit 3a2ec3fca6
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mysql-test/suite/innodb/r/innodb_encryption_debug.result
View File

@@ -5,15 +5,15 @@ 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,min_key_version,current_key_version from information_schema.innodb_tablespaces_encryption; select space,name,current_key_version from information_schema.innodb_tablespaces_encryption order by space;
space name min_key_version current_key_version space name current_key_version
1 mysql/innodb_table_stats 0 1 0 NULL 1
2 mysql/innodb_index_stats 0 1 1 mysql/innodb_table_stats 1
0 NULL 0 1 2 mysql/innodb_index_stats 1
set global debug_key_management_version=10; set global debug_key_management_version=10;
select space,name,min_key_version,current_key_version from information_schema.innodb_tablespaces_encryption; select space,name,current_key_version from information_schema.innodb_tablespaces_encryption order by space;
space name min_key_version current_key_version space name current_key_version
1 mysql/innodb_table_stats 0 10 0 NULL 10
2 mysql/innodb_index_stats 0 10 1 mysql/innodb_table_stats 10
0 NULL 0 10 2 mysql/innodb_index_stats 10
set global debug_key_management_version=1; set global debug_key_management_version=1;

12
mysql-test/suite/innodb/t/innodb_encryption_debug.test
View File

@@ -6,8 +6,16 @@ if (`select count(*) = 0 from information_schema.plugins
} }
show variables like 'innodb_encrypt%'; show variables like 'innodb_encrypt%';
select space,name,min_key_version,current_key_version from information_schema.innodb_tablespaces_encryption;
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;
set global debug_key_management_version=10; set global debug_key_management_version=10;
select space,name,min_key_version,current_key_version from information_schema.innodb_tablespaces_encryption;
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;
set global debug_key_management_version=1; set global debug_key_management_version=1;