Skip to content

Commit 9164a24

Browse files
author
Jan Lindström
committed
Test debug_key_management fails sporadically in buildbot.
Problem is that we expect key_version to be increasing so before we reset debug_key_management plugin key_version disable encryption.
1 parent 0fe5eb5 commit 9164a24

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

mysql-test/suite/encryption/r/debug_key_management.result

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
set global innodb_encrypt_tables=ON;
12
show variables like 'innodb_encrypt%';
23
Variable_name Value
34
innodb_encrypt_log ON
@@ -16,4 +17,5 @@ space name current_key_version
1617
0 NULL 10
1718
1 mysql/innodb_table_stats 10
1819
2 mysql/innodb_index_stats 10
20+
set global innodb_encrypt_tables=OFF;
1921
set global debug_key_management_version=1;

mysql-test/suite/encryption/t/debug_key_management.opt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
--innodb-encrypt-tables=ON
21
--innodb-encrypt-log=ON
32
--innodb-encryption-rotate-key-age=2
43
--innodb-encryption-threads=4

mysql-test/suite/encryption/t/debug_key_management.test

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ if (`select count(*) = 0 from information_schema.plugins
55
--skip Needs debug_key_management
66
}
77

8+
set global innodb_encrypt_tables=ON;
89
show variables like 'innodb_encrypt%';
910

1011
let $wait_condition= select count(*) = 3 from information_schema.innodb_tablespaces_encryption where current_key_version=1;
@@ -17,5 +18,7 @@ let $wait_condition= select count(*) = 3 from information_schema.innodb_tablespa
1718
--source include/wait_condition.inc
1819

1920
select space,name,current_key_version from information_schema.innodb_tablespaces_encryption order by space;
21+
# Note that we expect that key_version is increasing so disable encryption before reset
22+
set global innodb_encrypt_tables=OFF;
2023
set global debug_key_management_version=1;
2124

0 commit comments

Comments
 (0)