diff options
| author | unknown <msvensson@pilot.(none)> | 2007-06-07 20:27:19 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.(none)> | 2007-06-07 20:27:19 +0200 |
| commit | a76788e3f9fd16607745f86d106a5d39be4492dd (patch) | |
| tree | 632008e8fb3c6dfa81cbb3e948499d185ff6497d | |
| parent | 53c94b71a0103be84cbd6aca0757a163fdbbae83 (diff) | |
| parent | 4935813cd05527fc53460142a97f07bdb6f7395e (diff) | |
| download | mariadb-git-a76788e3f9fd16607745f86d106a5d39be4492dd.tar.gz | |
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
mysql-test/include/master-slave.inc:
Auto merged
mysql-test/lib/mtr_cases.pl:
Merge 5.0->5.1
mysql-test/t/binlog_killed.test:
Merge 5.0->5.1
| -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 |
3 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/include/master-slave.inc b/mysql-test/include/master-slave.inc index 8be8c8028e0..e0eb87f02f7 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 a663e98821f..f12f3fe90e8 100644 --- a/mysql-test/lib/mtr_cases.pl +++ b/mysql-test/lib/mtr_cases.pl @@ -622,7 +622,7 @@ our @tags= ( ["include/have_innodb.inc", "innodb_test", 1], ["include/have_binlog_format_row.inc", "binlog_format", "row"], - ["include/have_binlog.inc", "need_binlog", 1], + ["include/have_log_bin.inc", "need_binlog", 1], ["include/have_binlog_format_statement.inc", "binlog_format", "statement"], ["include/have_binlog_format_mixed.inc", "binlog_format", "mixed"], ["include/big_test.inc", "big_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 |