mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
Post-merge fixes.
mysql-test/r/innodb.result: Result change. mysql-test/suite/rpl/r/rpl_binlog_grant.result: Result change. mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result: Result change. mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result: Result change. mysql-test/suite/rpl/t/disabled.def: Enabling some tests. mysql-test/suite/rpl/t/rpl_binlog_grant.test: Adding missing master-slave.inc, causing previous tests to pollute the binary log. mysql-test/suite/rpl_ndb/t/disabled.def: Enabling some tests.
This commit is contained in:
@ -1,3 +1,4 @@
|
||||
source include/master-slave.inc;
|
||||
-- source include/have_innodb.inc
|
||||
-- source include/not_embedded.inc
|
||||
-- source include/have_binlog_format_mixed_or_statement.inc
|
||||
|
Reference in New Issue
Block a user