diff options
| author | Alfranio Correia <alfranio.correia@sun.com> | 2010-04-19 12:05:07 +0100 |
|---|---|---|
| committer | Alfranio Correia <alfranio.correia@sun.com> | 2010-04-19 12:05:07 +0100 |
| commit | 2b89bd9f5e1b61af9683d0fc11a6171ac7748c35 (patch) | |
| tree | 385883e7705d799975869c1605764b28d9acd067 /mysql-test/extra | |
| parent | 61aae51180645fbd0129c913501e0566ece9883a (diff) | |
| parent | e0328736bfc3bcb69699551d80afa931016b6c6b (diff) | |
| download | mariadb-git-2b89bd9f5e1b61af9683d0fc11a6171ac7748c35.tar.gz | |
auto-merge mysql-trunk-bugfixing (local) --> mysql-trunk-bugfixing
Diffstat (limited to 'mysql-test/extra')
| -rw-r--r-- | mysql-test/extra/rpl_tests/rpl_mixing_engines.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/extra/rpl_tests/rpl_mixing_engines.test b/mysql-test/extra/rpl_tests/rpl_mixing_engines.test index 5df1eaf37cc..904104ff96d 100644 --- a/mysql-test/extra/rpl_tests/rpl_mixing_engines.test +++ b/mysql-test/extra/rpl_tests/rpl_mixing_engines.test @@ -1767,7 +1767,7 @@ sync_slave_with_master; --exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/test-nmt-master.sql --exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/test-nmt-slave.sql -if (`select @@session.binlog_format != 'STATEMENT'`) +if (`select @@session.binlog_direct_non_transactional_updates = 0 || @@session.binlog_format != 'STATEMENT'`) { --diff_files $MYSQLTEST_VARDIR/tmp/test-nmt-master.sql $MYSQLTEST_VARDIR/tmp/test-nmt-slave.sql } |