From c56b896c17f7f4992ef871c51673b059a70795d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= Date: Tue, 28 Mar 2017 12:28:09 +0300 Subject: [PATCH] Fix test failure on debug_key_management test. --- .../encryption/r/debug_key_management.result | 16 ++++++---------- .../suite/encryption/t/debug_key_management.test | 5 +++-- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/mysql-test/suite/encryption/r/debug_key_management.result b/mysql-test/suite/encryption/r/debug_key_management.result index 70840fdeeac..02e05b4d221 100644 --- a/mysql-test/suite/encryption/r/debug_key_management.result +++ b/mysql-test/suite/encryption/r/debug_key_management.result @@ -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; diff --git a/mysql-test/suite/encryption/t/debug_key_management.test b/mysql-test/suite/encryption/t/debug_key_management.test index b4dc8c41916..5001ac6a516 100644 --- a/mysql-test/suite/encryption/t/debug_key_management.test +++ b/mysql-test/suite/encryption/t/debug_key_management.test @@ -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;