List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:March 29 2011 8:07am
Subject:bzr commit into mysql-5.5-cluster branch (magnus.blaudd:3270)
View as plain text  
#At file:///home/msvensson/mysql/5.5-cluster/ based on revid:magnus.blaudd@strippedrox

 3270 Magnus Blåudd	2011-03-29
      ndb
       - update .result file for rpl_skip_incident which is a backported test from trunk
       - add call to include/rpl_end.inc at end of test

    modified:
      mysql-test/suite/rpl/r/rpl_skip_incident.result
      mysql-test/suite/rpl/t/rpl_skip_incident.test
=== modified file 'mysql-test/suite/rpl/r/rpl_skip_incident.result'
--- a/mysql-test/suite/rpl/r/rpl_skip_incident.result	2011-03-14 21:34:06 +0000
+++ b/mysql-test/suite/rpl/r/rpl_skip_incident.result	2011-03-29 08:07:24 +0000
@@ -1,9 +1,5 @@
-stop slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-reset master;
-reset slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-start slave;
+include/master-slave.inc
+[connection master]
 **** On Master ****
 CREATE TABLE t1 (a INT);
 INSERT INTO t1 VALUES (1),(2),(3);
@@ -19,10 +15,11 @@ a
 2
 3
 4
-Checking that both slave threads are running.
+include/check_slave_is_running.inc
 Should have two binary logs here
 show binary logs;
 Log_name	File_size
 master-bin.000001	#
 master-bin.000002	#
 DROP TABLE t1;
+include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl/t/rpl_skip_incident.test'
--- a/mysql-test/suite/rpl/t/rpl_skip_incident.test	2011-03-14 21:34:06 +0000
+++ b/mysql-test/suite/rpl/t/rpl_skip_incident.test	2011-03-29 08:07:24 +0000
@@ -26,3 +26,5 @@ connection master;
 show binary logs;
 DROP TABLE t1;
 --sync_slave_with_master
+
+source include/rpl_end.inc;

Attachment: [text/bzr-bundle] bzr/magnus.blaudd@oracle.com-20110329080724-ki4qf19qsr9b8768.bundle
Thread
bzr commit into mysql-5.5-cluster branch (magnus.blaudd:3270) Magnus Blåudd29 Mar