bzr commit into mysql-5.1-telco-7.0-reflect branch (jonas:3952)

[Jonas Oreland]

#At file:///home/jonas/src/mysql-5.1-telco-7.0-reflect/ based on revid:frazer@stripped

 3952 Jonas Oreland	2010-12-15
      ndb - update testfiles in 7.0-reflect

    modified:
      .bzr-mysql/default.conf
      mysql-test/suite/rpl_ndb/t/rpl_ndb_break_3_chain.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_epoch.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_init_rep_status.test
=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf	2010-10-12 14:53:28 +0000
+++ b/.bzr-mysql/default.conf	2010-12-15 11:47:51 +0000
@@ -1,4 +1,4 @@
 [MYSQL]
 post_commit_to = commits@stripped
 post_push_to = commits@stripped
-tree_name = mysql-5.1-telco-7.0
+tree_name = mysql-5.1-telco-7.0-reflect

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_break_3_chain.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_break_3_chain.test	2010-11-05 19:12:10 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_break_3_chain.test	2010-12-15 11:47:51 +0000
@@ -1,5 +1,6 @@
 --source include/have_ndb.inc
---source include/ndb_master-slave.inc
+--source include/have_binlog_format_mixed_or_row.inc
+--source suite/rpl_ndb/ndb_master-slave.inc
 
 connect (cluster1, 127.0.0.1,root,,test,$CLUSTER1_MYPORT);
 connect (cluster2, 127.0.0.1,root,,test,$CLUSTER2_MYPORT);

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_epoch.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_epoch.test	2010-11-05 19:12:10 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_epoch.test	2010-12-15 11:47:51 +0000
@@ -5,7 +5,7 @@
 #
 --source include/have_ndb.inc
 --source include/have_binlog_format_mixed_or_row.inc
---source include/ndb_master-slave.inc
+--source suite/rpl_ndb/ndb_master-slave.inc
 
 --echo Setup circular replication
 

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_init_rep_status.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_init_rep_status.test	2010-11-05 19:12:10 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_init_rep_status.test	2010-12-15 11:47:51 +0000
@@ -1,5 +1,6 @@
 --source include/have_ndb.inc
---source include/ndb_master-slave.inc
+--source include/have_binlog_format_mixed_or_row.inc
+--source suite/rpl_ndb/ndb_master-slave.inc
 
 # Test Slave initialisation of Ndb_slave_max_replicated_epoch status var
 


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