bzr commit into mysql-5.1 branch (aelkin:2689) Bug#39007

[Andrei Elkin]

#At file:///home/andrei/MySQL/BZR/MERGE/2689/5.1-rpl-2688/

 2689 Andrei Elkin	2008-11-05
      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.
modified:
  mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.cnf
  mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test

per-file messages:
  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
=== 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-11-05 09:34:32 +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-11-05 09:34:32 +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