Commit be75d8ad authored by Sven Sandberg's avatar Sven Sandberg

BUG#39934 - post-push fixes.

The rpl_ndb/combinations file was introduced as part of the fix.
The file contained an error: ndb suites shall not run with
binlog_format=mixed. Removed that combination.

mysql-test/suite/rpl_ndb/combinations:
  removed binlog_format=statement combination since ndb does not
  support statement format.
mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables.test:
  Added have_binlog_format_mixed_or_row.inc.
parent d7787383
[row]
binlog-format=row
[stmt]
binlog-format=statement
[mix]
binlog-format=mixed
......@@ -45,6 +45,7 @@
--source include/have_ndb.inc
--source include/have_innodb.inc
--source include/ndb_master-slave.inc
--source include/have_binlog_format_mixed_or_row.inc
--echo ---- setup master ----
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment