mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
BUG#50410: rpl_ndb tests should run with binlog_format=row
Problem: The rpl_ndb did not set binlog_format explicitly. Since the default is binlog_format=statement, it means that the suite ran with that. ndb does not support binlog_format=statement, and many tests were skipped because they sourced include/have_binlog_format_row_or_mixed.inc Fix: set binlog_format=row explicitly in the configuration file for the rpl_ndb suite.
This commit is contained in:
parent
6549653fea
commit
b0b0000d40
4 changed files with 10 additions and 3 deletions
|
@ -147,8 +147,8 @@ test-bt:
|
|||
-if [ -e bin/ndbd -o -e storage/ndb/src/kernel/ndbd ] ; then \
|
||||
cd mysql-test ; \
|
||||
MTR_BUILD_THREAD=auto \
|
||||
@PERL@ ./mysql-test-run.pl --comment=ndb+rpl_ndb+ps --force --timer \
|
||||
--ps-protocol --mysqld=--binlog-format=row --suite=ndb,rpl_ndb ; \
|
||||
@PERL@ ./mysql-test-run.pl --comment=ndb+ps --force --timer \
|
||||
--ps-protocol --mysqld=--binlog-format=row --suite=ndb ; \
|
||||
MTR_BUILD_THREAD=auto \
|
||||
@PERL@ ./mysql-test-run.pl --comment=ndb --force --timer \
|
||||
--with-ndbcluster-only ; \
|
||||
|
|
|
@ -18,6 +18,8 @@ mysqld=
|
|||
ndbcluster
|
||||
# Turn on bin logging
|
||||
log-bin= master-bin
|
||||
# Cluster only supports row format
|
||||
binlog-format= row
|
||||
|
||||
[mysqld.1.1]
|
||||
|
||||
|
@ -41,6 +43,8 @@ master-connect-retry= 1
|
|||
|
||||
log-bin= slave-bin
|
||||
relay-log= slave-relay-bin
|
||||
# Cluster only supports row format
|
||||
binlog-format= row
|
||||
|
||||
init-rpl-role= slave
|
||||
log-slave-updates
|
||||
|
|
|
@ -4,6 +4,7 @@ reset master;
|
|||
reset slave;
|
||||
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
|
||||
start slave;
|
||||
SET binlog_format = STATEMENT;
|
||||
|
||||
*** Test 1 ***
|
||||
|
||||
|
|
|
@ -27,9 +27,11 @@
|
|||
--disable_query_log
|
||||
--source include/have_ndb.inc
|
||||
--source include/have_innodb.inc
|
||||
--source include/have_binlog_format_statement.inc
|
||||
--source include/ndb_master-slave.inc
|
||||
--enable_query_log
|
||||
|
||||
# statement format is supported because master uses innodb
|
||||
SET binlog_format = STATEMENT;
|
||||
let $off_set = 6;
|
||||
let $rpl_format = 'SBR';
|
||||
--source extra/rpl_tests/rpl_ndb_apply_status.test
|
||||
|
|
Loading…
Reference in a new issue