diff options
| author | Alfranio Correia <alfranio.correia@sun.com> | 2010-03-31 14:30:24 +0100 |
|---|---|---|
| committer | Alfranio Correia <alfranio.correia@sun.com> | 2010-03-31 14:30:24 +0100 |
| commit | 4d71a007bacc473924e537ac1e49e58cf1ed6b14 (patch) | |
| tree | 76af6a16f7a21178e722d6b90b26529ef26255b4 /mysql-test/extra | |
| parent | 1ddd2ac2db1290f88840c8c5e6bfdb2359539d3f (diff) | |
| parent | 7827688f231be69a86a317e110fd1b3ba559af43 (diff) | |
| download | mariadb-git-4d71a007bacc473924e537ac1e49e58cf1ed6b14.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 } |