Commit db652337 authored by He Zhenxing's avatar He Zhenxing

BUG#39007 rpl_ndb.rpl_ndb_circular_2ch crashed in pushbuild

According to documenation:
http://dev.mysql.com/doc/refman/5.1/en/mysql-cluster-replication-issues.html

When setting up circular replication for clusters with different
SQL nodes in each cluster used as replication master and slave,
SQL nodes must not start with --log-slave-updates option. 

This patch fixed the test case by remove log-slave-updates 
configuration from test case configuration file.

mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.cnf:
  remove option --log-slave-updates
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test:
  ndbcluster only supports mixed or row binlog format
parent 3be6d967
...@@ -3,17 +3,14 @@ ...@@ -3,17 +3,14 @@
[mysqld.1.1] [mysqld.1.1]
server-id= 1 server-id= 1
log-bin log-bin
log-slave-updates
[mysqld.2.1] [mysqld.2.1]
server-id= 1 server-id= 1
log-bin log-bin
log-slave-updates
[mysqld.1.slave] [mysqld.1.slave]
server-id= 2 server-id= 2
log-bin log-bin
log-slave-updates
skip-slave-start skip-slave-start
[mysqld.2.slave] [mysqld.2.slave]
...@@ -25,7 +22,6 @@ master-user= @mysqld.2.1.#user ...@@ -25,7 +22,6 @@ master-user= @mysqld.2.1.#user
master-connect-retry= 1 master-connect-retry= 1
init-rpl-role= slave init-rpl-role= slave
log-bin log-bin
log-slave-updates
skip-slave-start skip-slave-start
ndb_connectstring= @mysql_cluster.slave.ndb_connectstring ndb_connectstring= @mysql_cluster.slave.ndb_connectstring
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
############################################################# #############################################################
--source include/have_ndb.inc --source include/have_ndb.inc
--source include/ndb_master-slave_2ch.inc --source include/ndb_master-slave_2ch.inc
--source include/have_binlog_format_mixed_or_row.inc
--echo --echo
# Check server_id and set auto_increment_* variables # Check server_id and set auto_increment_* variables
......
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