From: Date: November 3 2008 9:55am
Subject: bzr commit into mysql-6.0-rpl branch (zhenxing.he:2721) Bug#39007
List-Archive: http://lists.mysql.com/commits/57669
X-Bug: 39007
Message-Id: <200811030855.mA38tk5M001777@mail.hezx.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///media/sda3/work/mysql/bzrwork/merge/6.0-rpl/

 2721 He Zhenxing	2008-11-03 [merge]
      Merge BUG#39007 to 6.0-rpl
modified:
  mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.cnf
  mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.cnf'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.cnf	2008-04-25 16:54:42 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.cnf	2008-10-31 14:11:44 +0000
@@ -3,17 +3,14 @@
 [mysqld.1.1]
 server-id= 1
 log-bin
-log-slave-updates
 
 [mysqld.2.1]
 server-id= 1
 log-bin
-log-slave-updates
 
 [mysqld.1.slave]
 server-id= 2
 log-bin
-log-slave-updates
 skip-slave-start
 
 [mysqld.2.slave]
@@ -25,7 +22,6 @@ master-user=		@mysqld.2.1.#user
 master-connect-retry=	1
 init-rpl-role=		slave
 log-bin
-log-slave-updates
 skip-slave-start
 ndb_connectstring=	@mysql_cluster.slave.ndb_connectstring
 

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test	2008-08-15 02:31:04 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test	2008-10-31 14:11:44 +0000
@@ -6,6 +6,7 @@
 #############################################################
 --source include/have_ndb.inc
 --source include/ndb_master-slave_2ch.inc
+--source include/have_binlog_format_mixed_or_row.inc
 --echo
 
 # Check server_id and set auto_increment_* variables