database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

auto-merge mysql-trunk-bugfixing (local) --> mysql-trunk-bugfixing

Browse Source
This commit is contained in:
Alfranio Correia
2010-04-19 12:05:07 +01:00
parent 61aae51180 e0328736bf
commit 2b89bd9f5e
25 changed files with 37291 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/extra/rpl_tests/rpl_mixing_engines.test
View File

@@ -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
}