List:Commits« Previous MessageNext Message »
From:Frazer Clement Date:July 11 2011 11:00am
Subject:bzr commit into mysql-5.1-telco-7.1 branch (frazer.clement:4251)
View as plain text  
#At file:///home/frazer/bzr/mysql-5.1-telco-7.1/ based on revid:jonas.oreland@stripped

 4251 Frazer Clement	2011-07-11 [merge]
      Merge 7.0->7.1

    modified:
      mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch.cnf
=== modified file 'mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch.cnf'
--- a/mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch.cnf	2011-07-07 14:48:06 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch.cnf	2011-07-11 10:40:00 +0000
@@ -25,14 +25,7 @@ skip-slave-start
 [mysqld.2.slave]
 server-id= 4
 log-bin = sec-master-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
 skip-slave-start
-ndb_connectstring=	@mysql_cluster.slave.ndb_connectstring
 
 [ENV]
 

No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).
Thread
bzr commit into mysql-5.1-telco-7.1 branch (frazer.clement:4251) Frazer Clement11 Jul