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 /mysql-test/include/master-slave.inc | |
| 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
Diffstat (limited to 'mysql-test/include/master-slave.inc')
| -rw-r--r-- | mysql-test/include/master-slave.inc | 2 |
1 files changed, 1 insertions, 1 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,); |