fix binlog_encryption.binlog_incident test

This commit is contained in:
Sergei Golubchik 2016-12-05 22:29:25 +01:00
parent 76546a099c
commit 74d52ded72
6 changed files with 4 additions and 15 deletions

View file

@ -4,20 +4,11 @@
# Please check all dependent tests after modifying it # Please check all dependent tests after modifying it
# #
# Usage: # Usage:
# --let $binlog_extra_length= X # optional, default 0
# --source extra/rpl_tests/multisource.inc # --source extra/rpl_tests/multisource.inc
# #
# By default, the script expects the length of the 2nd binary log to be # 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) # $binlog_start_pos + length(Gtid_list event) + 2 x length(Binlog_checkpoint event)
# Some tests can have specific configuration which would change it, # 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 # Test basic replication functionality
@ -244,7 +235,7 @@ flush logs;
--connection master1 --connection master1
purge binary logs to 'master-bin.000002'; purge binary logs to 'master-bin.000002';
# Additional events: 39 (Gtid_list) + 2 x 40 (Binlog_checkpoint) = 119 # 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 --replace_result $filesize filesize
show binary logs; show binary logs;
insert into t1 (f1) values ('four'); insert into t1 (f1) values ('four');

View file

@ -21,8 +21,8 @@
# #
############################################################################## ##############################################################################
let $binlog_start_pos=249;
--disable_query_log --disable_query_log
SET @binlog_start_pos=249; set @binlog_start_pos=249 + @@encrypt_binlog * 36;
--enable_query_log --enable_query_log
let $binlog_start_pos=`select @binlog_start_pos`;

View file

@ -10,4 +10,4 @@ REPLACE INTO t1 VALUES (4);
DROP TABLE t1; DROP TABLE t1;
FLUSH LOGS; FLUSH LOGS;
Contain RELOAD DATABASE Contain RELOAD DATABASE
0 1

View file

@ -8,7 +8,6 @@
##################################################################################### #####################################################################################
show binlog events in 'master-bin.000001' from <start_pos>; show binlog events in 'master-bin.000001' from <start_pos>;
Log_name Pos Event_type Server_id End_log_pos Info 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 # Gtid_list 1 # []
master-bin.000001 # Binlog_checkpoint 1 # master-bin.000001 master-bin.000001 # Binlog_checkpoint 1 # master-bin.000001
master-bin.000001 # Gtid 1 # GTID 0-1-1 master-bin.000001 # Gtid 1 # GTID 0-1-1

View file

@ -1,3 +1,2 @@
binlog_incident : MDEV-11319 - mysqlbinlog crash or failure
encrypted_master_lost_key : MDEV-11323 - unspecified behavior for IO thread encrypted_master_lost_key : MDEV-11323 - unspecified behavior for IO thread
rpl_checksum_cache : MDEV-11486 - sporadic failure in IO thread rpl_checksum_cache : MDEV-11486 - sporadic failure in IO thread