diff options
| author | Elena Stepanova <elenst@montyprogram.com> | 2016-12-05 12:42:54 +0200 |
|---|---|---|
| committer | Elena Stepanova <elenst@montyprogram.com> | 2016-12-05 12:42:54 +0200 |
| commit | f440b2a238b6fa6851b3379418902a1ef0ec9a91 (patch) | |
| tree | 8101d526c9c9ebd0f426c4ed1f958dd4d8ae722d | |
| parent | 7ebee7ade7912aa3222075915bdb7de8c353d3d7 (diff) | |
| download | mariadb-git-f440b2a238b6fa6851b3379418902a1ef0ec9a91.tar.gz | |
MDEV-9038 Binlog encryption tests
Post-review fixes #2
| -rw-r--r-- | mysql-test/suite/binlog_encryption/disabled.def | 5 | ||||
| -rw-r--r-- | mysql-test/suite/binlog_encryption/encryption_combo.result | 20 |
2 files changed, 5 insertions, 20 deletions
diff --git a/mysql-test/suite/binlog_encryption/disabled.def b/mysql-test/suite/binlog_encryption/disabled.def index 1f4336d9a24..cb36ea0414e 100644 --- a/mysql-test/suite/binlog_encryption/disabled.def +++ b/mysql-test/suite/binlog_encryption/disabled.def @@ -1,2 +1,3 @@ -encrypted_master_switch_to_unencrypted : MDEV-11288 (server crash) -binlog_incident : MDEV-11319 (mysqlbinlog crash or failure) +encrypted_master_switch_to_unencrypted : MDEV-11288 - server crash +binlog_incident : MDEV-11319 - mysqlbinlog crash or failure +encrypted_master_lost_key : MDEV-11323 - unspecified behavior for IO thread diff --git a/mysql-test/suite/binlog_encryption/encryption_combo.result b/mysql-test/suite/binlog_encryption/encryption_combo.result index 06d78621263..d921c73440d 100644 --- a/mysql-test/suite/binlog_encryption/encryption_combo.result +++ b/mysql-test/suite/binlog_encryption/encryption_combo.result @@ -19,15 +19,7 @@ FLUSH BINARY LOGS; SET binlog_format=ROW; INSERT INTO table1_no_encryption SELECT NULL,NOW(),b FROM table1_no_encryption; INSERT INTO table1_no_encryption SELECT NULL,NOW(),b FROM table1_no_encryption; -# -# The next step will cause a perl error if the search does not -# meet the expectations. -# Pattern to look for: table1_no_encryption -# Files to search: master-bin.0* -# Expected result: 1 -# (0 means the pattern should not be found, 1 means it should be found) -# -Found occurrences of 'table1_no_encryption' in master-bin.0* +FOUND /table1_no_encryption/ in master-bin.0* ##################################################### # Part 2: restart master, now with binlog encryption ##################################################### @@ -44,15 +36,7 @@ FLUSH BINARY LOGS; SET binlog_format=ROW; INSERT INTO table2_to_encrypt SELECT NULL,NOW(),b FROM table2_to_encrypt; INSERT INTO table2_to_encrypt SELECT NULL,NOW(),b FROM table2_to_encrypt; -# -# The next step will cause a perl error if the search does not -# meet the expectations. -# Pattern to look for: table2_to_encrypt -# Files to search: master-bin.0* -# Expected result: 0 -# (0 means the pattern should not be found, 1 means it should be found) -# -Did not find any occurrences of 'table2_to_encrypt' in master-bin.0* +NOT FOUND /table2_to_encrypt/ in master-bin.0* ##################################################### # Part 3: restart master again without encryption ##################################################### |