diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-10-08 12:05:27 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-10-08 12:05:27 +0300 |
| commit | 3b643667cfcf5a1fbaefb03c43c897f6906f7c77 (patch) | |
| tree | 629dfd94b70bde72beea8b1adadb223b72547eef /mysql-test/t | |
| parent | a8d0df3ac791f44d0d23934fd508871a1f11c3da (diff) | |
| parent | ebc1c91fbe932b7e6beb18dfe67c075ea5ef5cbe (diff) | |
| download | mariadb-git-3b643667cfcf5a1fbaefb03c43c897f6906f7c77.tar.gz | |
merge with 4.0 to get fix for mysqlbinlog
client/mysqlbinlog.cc:
Auto merged
mysql-test/t/rpl_trunc_binlog.test:
Auto merged
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/rpl_trunc_binlog.test | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/t/rpl_trunc_binlog.test b/mysql-test/t/rpl_trunc_binlog.test index 1f224423c97..81ef941f9f2 100644 --- a/mysql-test/t/rpl_trunc_binlog.test +++ b/mysql-test/t/rpl_trunc_binlog.test @@ -6,6 +6,10 @@ source include/master-slave.inc; connection slave; +# If we are not supporting transactions in the slave, the unfinished transaction +# won't cause any error, so we need to skip the test. In the 4.0 testsuite, the +# slave always runs without InnoDB, so we check for BDB. +source include/have_bdb.inc; stop slave; connection master; flush logs; |