bzr commit into mysql-6.0-rpl branch (aelkin:2793) Bug#41732

[Andrei Elkin]

#At file:///home/andrei/MySQL/BZR/FIXES/6.0-rpl-bug41732-rpl_ndb_circular_2ch/ based on revid:luis.soares@stripped

 2793 Andrei Elkin	2009-01-26
      Bug #41732 rpl_ndb_circular_2ch needs an updated configuration file
      
      1. 6.0 uses the obsolate master-*** server options;
      2. the test is not deterministic in that although master vs slave consistency is
      fine,two runs of the test can have different results. The reason of the
      non-determinism is the combination of 
      a chosen way to demo results and the ndb_autoincrement_prefetch_sz feature.
            
      Fixed: with changing consistency checks through diff_tables (changeset for 5.1; and
             removing the obsolate paramenters from a configuration file in the 6.0 version
             (the current changeset).
modified:
  mysql-test/suite/rpl_ndb/t/disabled.def
  mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.cnf

per-file messages:
  mysql-test/suite/rpl_ndb/t/disabled.def
    re-enabling rpl_ndb_circular_2ch
  mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.cnf
    removing the obsolate server command line parameters.
=== modified file 'mysql-test/suite/rpl_ndb/t/disabled.def'
--- a/mysql-test/suite/rpl_ndb/t/disabled.def	2008-12-24 11:43:19 +0000
+++ b/mysql-test/suite/rpl_ndb/t/disabled.def	2009-01-26 18:04:41 +0000
@@ -12,4 +12,4 @@
 
 rpl_ndb_innodb2ndb       : Bug#34725 2008-02-26 hakank Currently failing.
 rpl_ndb_extraCol	: Bug#41369 2008-12-10 alik
-rpl_ndb_circular_2ch     : Bug#41732 rpl_ndb_circular_2ch needs an updated configuration file
+

=== 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-10-31 14:11:44 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.cnf	2009-01-26 18:04:41 +0000
@@ -15,11 +15,6 @@ skip-slave-start
 
 [mysqld.2.slave]
 server-id= 2
-master-host=		127.0.0.1
-master-port=		@mysqld.2.1.port
-master-password=	@mysqld.2.1.#password
-master-user=		@mysqld.2.1.#user
-master-connect-retry=	1
 init-rpl-role=		slave
 log-bin
 skip-slave-start