List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:April 27 2011 8:26am
Subject:bzr commit into mysql-5.5-cluster branch (magnus.blaudd:3321)
View as plain text  
#At file:///data0/magnus/mysql/5.5-cluster/ based on revid:magnus.blaudd@strippedq

 3321 Magnus Blåudd	2011-04-27 [merge]
      Merge 7.0 -> 5.5-cluster

    renamed:
      mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result => mysql-test/suite/rpl_ndb/r/rpl_ndb_extra_col_slave.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result => mysql-test/suite/rpl_ndb/r/rpl_ndb_extra_col_master.result
      mysql-test/suite/rpl_ndb/t/rpl_ndb_extraCol.test => mysql-test/suite/rpl_ndb/t/rpl_ndb_extra_col_slave.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_extraColMaster.test => mysql-test/suite/rpl_ndb/t/rpl_ndb_extra_col_master.test
    modified:
      mysql-test/suite/rpl_ndb/t/rpl_ndb_extra_col_slave.test
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result' => 'mysql-test/suite/rpl_ndb/r/rpl_ndb_extra_col_master.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result' => 'mysql-test/suite/rpl_ndb/r/rpl_ndb_extra_col_slave.result'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_extraColMaster.test' => 'mysql-test/suite/rpl_ndb/t/rpl_ndb_extra_col_master.test'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_extraCol.test' => 'mysql-test/suite/rpl_ndb/t/rpl_ndb_extra_col_slave.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_extraCol.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_extra_col_slave.test	2011-04-27 08:14:37 +0000
@@ -1,13 +1,6 @@
-###########################################
-# Author: Jeb
-# Date: 2006-09-08
-# Purpose: Wapper for rpl_extraSlave_Col.test
-#          Using NDB
-########################################### 
--- source include/have_binlog_format_mixed_or_row.inc
+-- source include/have_binlog_format_row.inc
 -- source include/have_ndb.inc
 -- source suite/rpl_ndb/ndb_master-slave.inc
-let $engine_type = 'NDB';
 
 #
 # This is a disgrace...but slave randomly spits out these warnings
@@ -18,7 +11,7 @@ call mtr.add_suppression("Slave: Can't f
 call mtr.add_suppression("Slave: Got error 120 during COMMIT Error_code: 1180");
 -- enable_query_log
 
+let $engine_type = 'NDB';
 -- source extra/rpl_tests/rpl_extra_col_slave.test
 
-
 --source include/rpl_end.inc

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.5-cluster branch (magnus.blaudd:3321) Magnus Blåudd27 Apr