diff options
| -rw-r--r-- | mysql-test/lib/mtr_report.pl | 3 | ||||
| -rw-r--r-- | mysql-test/suite/binlog/t/binlog_old_versions.test | 1 | ||||
| -rw-r--r-- | sql/rpl_rli.cc | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/mysql-test/lib/mtr_report.pl b/mysql-test/lib/mtr_report.pl index 37863ce4187..929320b7653 100644 --- a/mysql-test/lib/mtr_report.pl +++ b/mysql-test/lib/mtr_report.pl @@ -377,7 +377,8 @@ sub mtr_report_stats ($) { # rpl_skip_error and binlog_killed_simulate produce an error which is skipped (slave does not stop) (($testname eq 'rpl.rpl_skip_error' or - $testname eq 'binlog.binlog_killed_simulate') and + $testname eq 'binlog.binlog_killed_simulate' or + $testname eq 'binlog.binlog_killed') and (/Failed to write to mysql\.general_log/ )) or diff --git a/mysql-test/suite/binlog/t/binlog_old_versions.test b/mysql-test/suite/binlog/t/binlog_old_versions.test index 0f29030baad..2d56ebd588d 100644 --- a/mysql-test/suite/binlog/t/binlog_old_versions.test +++ b/mysql-test/suite/binlog/t/binlog_old_versions.test @@ -22,6 +22,7 @@ # Related bugs: BUG#27779, BUG#31581, BUG#31582, BUG#31583, BUG#32407 +source include/not_embedded.inc; --disable_warnings DROP TABLE IF EXISTS t1, t2, t3; diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc index 0411b01b0cd..3e9a484126a 100644 --- a/sql/rpl_rli.cc +++ b/sql/rpl_rli.cc @@ -33,6 +33,7 @@ Relay_log_info::Relay_log_info() :Slave_reporting_capability("SQL"), no_storage(FALSE), replicate_same_server_id(::replicate_same_server_id), info_fd(-1), cur_log_fd(-1), save_temporary_tables(0), + group_relay_log_pos(0), cur_log_old_open_count(0), group_master_log_pos(0), log_space_total(0), ignore_log_space_limit(0), last_master_timestamp(0), slave_skip_counter(0), abort_pos_wait(0), slave_run_id(0), sql_thd(0), |