List:Commits« Previous MessageNext Message »
From:jonas oreland Date:April 8 2011 7:03am
Subject:bzr commit into mysql-5.1-telco-6.3 branch (jonas:3417)
View as plain text  
#At file:///home/jonas/src/telco-6.3/ based on revid:jonas@stripped

 3417 jonas oreland	2011-04-08
      ndb - fix rpl_ndb_skip_gap_event

    modified:
      mysql-test/suite/rpl_ndb/r/rpl_ndb_skip_gap_event.result
      mysql-test/suite/rpl_ndb/t/rpl_ndb_skip_gap_event.test
=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_skip_gap_event.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_skip_gap_event.result	2011-03-15 00:43:19 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_skip_gap_event.result	2011-04-08 07:03:27 +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]
 create table t1(pk int not null primary key, i int) engine = ndb;
 select count(*) from t1;
 count(*)
@@ -15,14 +11,14 @@ master-bin.000002	#	Incident	1	<end_pos>
 start slave;
 Sync Slave with master
 Show that Slave has not stopped (has skipped GAP)
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Last_Errno	0
-Last_Error	
+Slave_IO_Running = 'Yes'
+Slave_SQL_Running = 'Yes'
+Last_Errno = '0'
+Last_Error = ''
 Show that replication can continue
 insert into t1 values (1001, 1001);
 select count(*) from t1;
 count(*)
 1001
-drop table if exists t1;
 drop table t1;
+include/stop_slave.inc

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_skip_gap_event.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_skip_gap_event.test	2011-03-15 00:43:19 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_skip_gap_event.test	2011-04-08 07:03:27 +0000
@@ -25,6 +25,8 @@ select count(*) from t1;
 --connection master
 
 --echo Restarting mysqld
+ # Hack to allow using restart_mysqld.inc from rpl test
+let $allow_rpl_inited=1;
 let $mysqld_name=mysqld.1.1;
 --source include/restart_mysqld.inc
 #show binlog events in 'master-bin.000002';
@@ -61,9 +63,12 @@ insert into t1 values (1001, 1001);
 
 select count(*) from t1;
 
-drop table if exists t1;
-
 --connection master
 drop table t1;
 
+--sync_slave_with_master
 
+# NOTE: rpl_end.inc doesnt seem to work after having used restart_mysqld.inc
+# or something like that...probably needs investigation
+--connection slave
+--source include/stop_slave.inc


Attachment: [text/bzr-bundle] bzr/jonas@mysql.com-20110408070327-eru5r3bdketkmdtr.bundle
Thread
bzr commit into mysql-5.1-telco-6.3 branch (jonas:3417) jonas oreland8 Apr