diff options
Diffstat (limited to 'mysql-test/suite/encryption/r')
| -rw-r--r-- | mysql-test/suite/encryption/r/encrypt_and_grep.result | 5 | ||||
| -rw-r--r-- | mysql-test/suite/encryption/r/innodb-spatial-index.result | 1 | ||||
| -rw-r--r-- | mysql-test/suite/encryption/r/innodb_encryption.result | 5 |
3 files changed, 1 insertions, 10 deletions
diff --git a/mysql-test/suite/encryption/r/encrypt_and_grep.result b/mysql-test/suite/encryption/r/encrypt_and_grep.result index 99f59965181..cbc05dc7cc6 100644 --- a/mysql-test/suite/encryption/r/encrypt_and_grep.result +++ b/mysql-test/suite/encryption/r/encrypt_and_grep.result @@ -16,7 +16,6 @@ NAME mysql/innodb_table_stats mysql/innodb_index_stats mysql/transaction_registry -mysql/vtmd_template test/t1 test/t2 innodb_system @@ -36,13 +35,12 @@ NAME mysql/innodb_table_stats mysql/innodb_index_stats mysql/transaction_registry -mysql/vtmd_template test/t2 test/t3 +innodb_system SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0; NAME test/t1 -innodb_system # t1 yes on expecting NOT FOUND NOT FOUND /foobarsecret/ in t1.ibd # t2 ... default expecting FOUND @@ -62,7 +60,6 @@ NAME mysql/innodb_table_stats mysql/innodb_index_stats mysql/transaction_registry -mysql/vtmd_template test/t1 test/t2 innodb_system diff --git a/mysql-test/suite/encryption/r/innodb-spatial-index.result b/mysql-test/suite/encryption/r/innodb-spatial-index.result index 0cbef98a7dd..e8e133c61a1 100644 --- a/mysql-test/suite/encryption/r/innodb-spatial-index.result +++ b/mysql-test/suite/encryption/r/innodb-spatial-index.result @@ -39,7 +39,6 @@ NAME mysql/innodb_table_stats mysql/innodb_index_stats mysql/transaction_registry -mysql/vtmd_template test/t1 test/t2 innodb_system diff --git a/mysql-test/suite/encryption/r/innodb_encryption.result b/mysql-test/suite/encryption/r/innodb_encryption.result index 01ac828b218..ee3774bcee0 100644 --- a/mysql-test/suite/encryption/r/innodb_encryption.result +++ b/mysql-test/suite/encryption/r/innodb_encryption.result @@ -15,7 +15,6 @@ NAME mysql/innodb_table_stats mysql/innodb_index_stats mysql/transaction_registry -mysql/vtmd_template innodb_system # Success! # Now turn off encryption and wait for threads to decrypt everything @@ -26,7 +25,6 @@ NAME mysql/innodb_table_stats mysql/innodb_index_stats mysql/transaction_registry -mysql/vtmd_template innodb_system SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0; NAME @@ -42,7 +40,6 @@ NAME mysql/innodb_table_stats mysql/innodb_index_stats mysql/transaction_registry -mysql/vtmd_template innodb_system SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0; NAME @@ -57,7 +54,6 @@ NAME mysql/innodb_table_stats mysql/innodb_index_stats mysql/transaction_registry -mysql/vtmd_template innodb_system # Success! # Restart mysqld --innodb_encrypt_tables=0 --innodb_encryption_threads=0 @@ -73,7 +69,6 @@ NAME mysql/innodb_table_stats mysql/innodb_index_stats mysql/transaction_registry -mysql/vtmd_template innodb_system SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION = 0; NAME |