diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-08-31 09:35:39 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-08-31 09:35:39 +0300 |
| commit | 2f20be946f637c45a60df95de2136297c6a2d17f (patch) | |
| tree | 6c9e6236e2110a4806153c1610c99ba0cbfd1ee9 /mysql-test/suite/encryption/r/innodb_encryption.result | |
| parent | 4386ee8ccc2efa7ba91061b5bd5a37bcf35f91d2 (diff) | |
| parent | 28b2896a434670d7b03c4a5e3fba8b4f3872a297 (diff) | |
| download | mariadb-git-2f20be946f637c45a60df95de2136297c6a2d17f.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'mysql-test/suite/encryption/r/innodb_encryption.result')
| -rw-r--r-- | mysql-test/suite/encryption/r/innodb_encryption.result | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/mysql-test/suite/encryption/r/innodb_encryption.result b/mysql-test/suite/encryption/r/innodb_encryption.result index c49cf3813c9..72f2632ba26 100644 --- a/mysql-test/suite/encryption/r/innodb_encryption.result +++ b/mysql-test/suite/encryption/r/innodb_encryption.result @@ -1,5 +1,3 @@ -call mtr.add_suppression("InnoDB: New log files created"); -call mtr.add_suppression("InnoDB: Creating foreign key constraint system tables."); SET @start_global_value = @@global.innodb_encryption_threads; SHOW VARIABLES LIKE 'innodb_encrypt%'; Variable_name Value @@ -14,6 +12,8 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_ NAME SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0; NAME +mysql/innodb_table_stats +mysql/innodb_index_stats innodb_system # Success! # Now turn off encryption and wait for threads to decrypt everything @@ -21,6 +21,8 @@ SET GLOBAL innodb_encrypt_tables = off; # Wait max 10 min for key encryption threads to encrypt all spaces SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION = 0; NAME +mysql/innodb_table_stats +mysql/innodb_index_stats innodb_system SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0; NAME @@ -33,6 +35,8 @@ SET GLOBAL innodb_encrypt_tables = on; # Wait 15s to check that nothing gets encrypted SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION = 0; NAME +mysql/innodb_table_stats +mysql/innodb_index_stats innodb_system SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0; NAME @@ -44,6 +48,8 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_ NAME SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0; NAME +mysql/innodb_table_stats +mysql/innodb_index_stats innodb_system # Success! # Restart mysqld --innodb_encrypt_tables=0 --innodb_encryption_threads=0 @@ -56,6 +62,8 @@ innodb_encryption_rotation_iops 100 innodb_encryption_threads 0 SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0; NAME +mysql/innodb_table_stats +mysql/innodb_index_stats innodb_system SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION = 0; NAME |