diff options
| -rw-r--r-- | mysql-test/include/master-slave.inc | 2 | ||||
| -rw-r--r-- | mysql-test/lib/mtr_cases.pl | 2 | ||||
| -rw-r--r-- | mysql-test/r/have_log_bin.require | 2 | ||||
| -rw-r--r-- | mysql-test/t/binlog_killed.test | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/mysql-test/include/master-slave.inc b/mysql-test/include/master-slave.inc index 6b5a508a949..0c27a1d8225 100644 --- a/mysql-test/include/master-slave.inc +++ b/mysql-test/include/master-slave.inc @@ -1,5 +1,5 @@ # Replication tests need binlog -source include/have_binlog.inc; +source include/have_log_bin.inc; connect (master,127.0.0.1,root,,test,$MASTER_MYPORT,); connect (master1,127.0.0.1,root,,test,$MASTER_MYPORT,); diff --git a/mysql-test/lib/mtr_cases.pl b/mysql-test/lib/mtr_cases.pl index 6650a7b9b90..6313733de4e 100644 --- a/mysql-test/lib/mtr_cases.pl +++ b/mysql-test/lib/mtr_cases.pl @@ -624,7 +624,7 @@ our @tags= ["include/have_binlog_format_row.inc", "binlog_format", "row"], ["include/have_binlog_format_statement.inc", "binlog_format", "stmt"], ["include/have_binlog_format_mixed.inc", "binlog_format", "mixed"], - ["include/have_binlog.inc", "need_binlog", 1], + ["include/have_log_bin.inc", "need_binlog", 1], ["include/big_test.inc", "big_test", 1], ["include/have_debug.inc", "need_debug", 1], ["include/have_ndb.inc", "ndb_test", 1], diff --git a/mysql-test/r/have_log_bin.require b/mysql-test/r/have_log_bin.require index cacdf8df0ce..d4fd77e4f8d 100644 --- a/mysql-test/r/have_log_bin.require +++ b/mysql-test/r/have_log_bin.require @@ -1,2 +1,2 @@ Variable_name Value -have_log_bin ON +log_bin ON diff --git a/mysql-test/t/binlog_killed.test b/mysql-test/t/binlog_killed.test index 1c4f1272691..034895f17cb 100644 --- a/mysql-test/t/binlog_killed.test +++ b/mysql-test/t/binlog_killed.test @@ -1,5 +1,6 @@ -- source include/have_innodb.inc --source include/not_embedded.inc +--source include/have_log_bin.inc ### ### bug#22725 : incorrect killed error in binlogged query |