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/extra | |
| parent | 76546a099c24a06ad89238f61435051a4663b112 (diff) | |
| download | mariadb-git-74d52ded721d8d39bfb25d18a0b0b8ea8a7af884.tar.gz | |
fix binlog_encryption.binlog_incident test
Diffstat (limited to 'mysql-test/extra')
| -rw-r--r-- | mysql-test/extra/binlog_tests/binlog_incident-master.opt | 1 | ||||
| -rw-r--r-- | mysql-test/extra/rpl_tests/multisource.inc | 11 |
2 files changed, 2 insertions, 10 deletions
diff --git a/mysql-test/extra/binlog_tests/binlog_incident-master.opt b/mysql-test/extra/binlog_tests/binlog_incident-master.opt new file mode 100644 index 00000000000..57ce0081ae5 --- /dev/null +++ b/mysql-test/extra/binlog_tests/binlog_incident-master.opt @@ -0,0 +1 @@ +--loose-debug=+d,incident_database_resync_on_replace
\ No newline at end of file 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'); |