Merge bk-internal:/home/bk/mysql-5.1-rpl

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl


mysql-test/lib/mtr_cases.pm:
  Auto merged
mysql-test/suite/rpl_ndb/t/disabled.def:
  Auto merged

mysql-test/include/circular_rpl_for_4_hosts_init.inc

@@ -18,7 +18,7 @@
 --source include/master-slave.inc
 
 #
-# Set up circular ring by schema A->B->C-D->A 
+# Set up circular ring by schema A->B->C->D->A 
 #
 
 --connection slave

mysql-test/lib/mtr_cases.pm

@@ -753,6 +753,16 @@ sub collect_one_test_case {
   # Add slave opts, list of extra option only for slave
   # ----------------------------------------------------------------------
   process_opts_file($tinfo, "$testdir/$tname-slave.opt", 'slave_opt');
+  
+  
+  #-----------------------------------------------------------------------
+  # Check for test specific config file
+  #-----------------------------------------------------------------------
+  my $test_cnf_file= "$testdir/$tname.cnf";
+  if ( -f $test_cnf_file) {
+    # Specifies the configuration file to use for this test
+    $tinfo->{'template_path'}= $test_cnf_file;
+  }
 
   # ----------------------------------------------------------------------
   # Check for test specific config file

mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result

-*** Set up circular ring by schema A->B->C-D->A *** 
+*** Set up circular ring by schema A->B->C->D->A *** 
 stop slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 reset master;

mysql-test/suite/rpl/t/rpl_circular_for_4_hosts-master.opt

---slave-num=3 --log-slave-updates --innodb

mysql-test/suite/rpl/t/rpl_circular_for_4_hosts-slave.opt

---log-slave-updates --innodb

mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.cnf

+!include ../my.cnf
+
+[mysqld.1]
+log-slave-updates
+innodb
+
+[mysqld.2]
+log-slave-updates
+innodb
+
+[mysqld.3]
+log-slave-updates
+innodb
+
+[mysqld.4]
+log-slave-updates
+innodb
+
+[ENV]
+SLAVE_MYPORT1=		@mysqld.3.port
+SLAVE_MYSOCK1=		@mysqld.3.socket
+
+SLAVE_MYPORT2=		@mysqld.4.port
+SLAVE_MYSOCK2=		@mysqld.4.socket
+
+
+

mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result

@@ -97,5 +97,6 @@ COUNT(*)	SUM(a)	b
 100	64100	master1
 100	64000	slave
 
-DELETE FROM t1;
+DROP TABLE t1;
+DROP TABLE IF EXISTS t1;
 

mysql-test/suite/rpl_ndb/t/disabled.def

@@ -12,6 +12,6 @@
 
 rpl_ndb_circular         : Bug#33849 COMMIT event missing in cluster circular replication.
 rpl_ndb_circular_simplex : Bug#33849 COMMIT event missing in cluster circular replication.
-
+rpl_ndb_circular_2ch	 : Bug#33849 COMMIT event missing in cluster circular replication.
 # the below testcase have been reworked to avoid the bug, test contains comment, keep bug open
 rpl_ndb_circular_2ch : Needs updated config

mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch-master.opt

---slave-num=2 --server-id=1 --log-bin -log-slave-updates

mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch-slave.opt

---server-id=2 --log-bin --log-slave-updates --skip-slave-start

mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.cnf

+!include ../my.cnf
+
+[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]
+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
+log-slave-updates
+skip-slave-start
+ndb_connectstring=	@mysql_cluster.slave.ndb_connectstring
+
+[ENV]
+
+SLAVE_MYPORT1=		@mysqld.2.slave.port
+SLAVE_MYSOCK1=		@mysqld.2.slave.socket

mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test

@@ -170,10 +170,11 @@ SELECT COUNT(*), SUM(a), b FROM t1 WHERE c = 3 GROUP BY b ORDER BY b;
 
 # Clean up
 --connection master
-DELETE FROM t1;
+DROP TABLE t1;
 --connection slave
-let $wait_condition= SELECT COUNT(*)=0 FROM t1;
---source include/wait_condition.inc
+--disable_warings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
 --echo
 
 # End of test 5.1