bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4246)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/7.0/ based on revid:magnus.blaudd@stripped

 4246 Magnus Blåudd	2011-03-16
      ndb
       - remove usage of ndb_conflict_info_init.inc from top level
         replication setup file(only the rpl_ndb_conflict* tests need to
         include that file)

    modified:
      mysql-test/suite/rpl_ndb/ndb_master-slave.inc
=== modified file 'mysql-test/suite/rpl_ndb/ndb_master-slave.inc'
--- a/mysql-test/suite/rpl_ndb/ndb_master-slave.inc	2010-10-22 15:16:26 +0000
+++ b/mysql-test/suite/rpl_ndb/ndb_master-slave.inc	2011-03-16 10:52:36 +0000
@@ -7,7 +7,6 @@ connect (master1,127.0.0.1,root,,test,$M
 connect (slave,127.0.0.1,root,,test,$SLAVE_MYPORT,);
 -- connection slave
 -- source suite/rpl_ndb/have_one_ndb.inc
--- source include/ndb_conflict_info_init.inc
 
 connect (slave1,127.0.0.1,root,,test,$SLAVE_MYPORT,);
 
@@ -15,4 +14,3 @@ connect (slave1,127.0.0.1,root,,test,$SL
 
 # Set the default connection to 'master'
 connection master;
-source include/ndb_conflict_info_init.inc;

Attachment: [text/bzr-bundle] bzr/[e-mail]