diff options
| -rw-r--r-- | mysql-test/extra/binlog_tests/binlog_incident-master.opt (renamed from mysql-test/suite/binlog/t/binlog_incident-master.opt) | 0 | ||||
| -rw-r--r-- | mysql-test/extra/rpl_tests/multisource.inc | 11 | ||||
| -rw-r--r-- | mysql-test/include/binlog_start_pos.inc | 4 | ||||
| -rw-r--r-- | mysql-test/suite/binlog_encryption/binlog_incident.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/binlog_encryption/binlog_row_annotate.result | 1 | ||||
| -rw-r--r-- | mysql-test/suite/binlog_encryption/disabled.def | 1 |
6 files changed, 4 insertions, 15 deletions
diff --git a/mysql-test/suite/binlog/t/binlog_incident-master.opt b/mysql-test/extra/binlog_tests/binlog_incident-master.opt index 57ce0081ae5..57ce0081ae5 100644 --- a/mysql-test/suite/binlog/t/binlog_incident-master.opt +++ b/mysql-test/extra/binlog_tests/binlog_incident-master.opt diff --git a/mysql-test/extra/rpl_tests/multisource.inc b/mysql-test/extra/rpl_tests/multisource.inc index 83a7e6ad259..2842aff4ef1 100644 --- a/mysql-test/extra/rpl_tests/multisource.inc +++ b/mysql-test/extra/rpl_tests/multisource.inc @@ -4,20 +4,11 @@ # Please check all dependent tests after modifying it # # Usage: -# --let $binlog_extra_length= X # optional, default 0 # --source extra/rpl_tests/multisource.inc # # By default, the script expects the length of the 2nd binary log to be # $binlog_start_pos + length(Gtid_list event) + 2 x length(Binlog_checkpoint event) # Some tests can have specific configuration which would change it, -# e.g. for encrypted binlogs there will be additional event -# Start_encryption of the length of 36. -# binlog_extra_length should compensate for the difference. - -if (!$binlog_extra_length) -{ - --let $binlog_extra_length= 0 -} # # Test basic replication functionality @@ -244,7 +235,7 @@ flush logs; --connection master1 purge binary logs to 'master-bin.000002'; # Additional events: 39 (Gtid_list) + 2 x 40 (Binlog_checkpoint) = 119 -let filesize=`select $binlog_start_pos+119+$binlog_extra_length`; +let filesize=`select $binlog_start_pos+119`; --replace_result $filesize filesize show binary logs; insert into t1 (f1) values ('four'); diff --git a/mysql-test/include/binlog_start_pos.inc b/mysql-test/include/binlog_start_pos.inc index a187e18b3a4..1fe2dd8d171 100644 --- a/mysql-test/include/binlog_start_pos.inc +++ b/mysql-test/include/binlog_start_pos.inc @@ -21,8 +21,8 @@ # ############################################################################## -let $binlog_start_pos=249; --disable_query_log -SET @binlog_start_pos=249; +set @binlog_start_pos=249 + @@encrypt_binlog * 36; --enable_query_log +let $binlog_start_pos=`select @binlog_start_pos`; 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 |