diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-12-05 22:29:25 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-12-06 09:45:51 +0100 |
| commit | 74d52ded721d8d39bfb25d18a0b0b8ea8a7af884 (patch) | |
| tree | cee0947fd0d101283a366291abf595c1296c73e7 /mysql-test/suite/binlog_encryption | |
| parent | 76546a099c24a06ad89238f61435051a4663b112 (diff) | |
| download | mariadb-git-74d52ded721d8d39bfb25d18a0b0b8ea8a7af884.tar.gz | |
fix binlog_encryption.binlog_incident test
Diffstat (limited to 'mysql-test/suite/binlog_encryption')
3 files changed, 1 insertions, 3 deletions
diff --git a/mysql-test/suite/binlog_encryption/binlog_incident.result b/mysql-test/suite/binlog_encryption/binlog_incident.result index 6118f066f4a..7a555743723 100644 --- a/mysql-test/suite/binlog_encryption/binlog_incident.result +++ b/mysql-test/suite/binlog_encryption/binlog_incident.result @@ -10,4 +10,4 @@ REPLACE INTO t1 VALUES (4); DROP TABLE t1; FLUSH LOGS; Contain RELOAD DATABASE -0 +1 diff --git a/mysql-test/suite/binlog_encryption/binlog_row_annotate.result b/mysql-test/suite/binlog_encryption/binlog_row_annotate.result index d32b80b1249..41721441a72 100644 --- a/mysql-test/suite/binlog_encryption/binlog_row_annotate.result +++ b/mysql-test/suite/binlog_encryption/binlog_row_annotate.result @@ -8,7 +8,6 @@ ##################################################################################### show binlog events in 'master-bin.000001' from <start_pos>; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 # Start_encryption 1 # master-bin.000001 # Gtid_list 1 # [] master-bin.000001 # Binlog_checkpoint 1 # master-bin.000001 master-bin.000001 # Gtid 1 # GTID 0-1-1 diff --git a/mysql-test/suite/binlog_encryption/disabled.def b/mysql-test/suite/binlog_encryption/disabled.def index 27743e3e8ff..b7a26a8343f 100644 --- a/mysql-test/suite/binlog_encryption/disabled.def +++ b/mysql-test/suite/binlog_encryption/disabled.def @@ -1,3 +1,2 @@ -binlog_incident : MDEV-11319 - mysqlbinlog crash or failure encrypted_master_lost_key : MDEV-11323 - unspecified behavior for IO thread rpl_checksum_cache : MDEV-11486 - sporadic failure in IO thread |