4447 Frazer Clement 2011-07-11
Remove unnecessary test config
modified:
mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch.cnf
4446 jonas oreland 2011-07-08 [merge]
ndb - merge 70 to 71
modified:
sql/ha_ndbcluster.cc
sql/ha_ndbcluster_binlog.cc
=== 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: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-5.1-telco-7.0 branch (frazer.clement:4446 to 4447) | Frazer Clement | 11 Jul |
