Post-merge fixes to update result files.

mysql-test/suite/rpl/r/rpl_row_log.result

@@ -7,7 +7,7 @@ start slave;
 stop slave;
 reset master;
 reset slave;
-reset master;
+start slave;
 create table t1(n int not null auto_increment primary key)ENGINE=MyISAM;
 insert into t1 values (NULL);
 drop table t1;
@@ -113,7 +113,6 @@ Aberdeen
 Abernathy
 aberrant
 aberration
-start slave;
 
 let $result_pattern= '%127.0.0.1%root%master-bin.000002%slave-relay-bin.000005%Yes%Yes%0%0%None%' ;
 

mysql-test/suite/rpl/r/rpl_row_log_innodb.result

@@ -7,7 +7,7 @@ start slave;
 stop slave;
 reset master;
 reset slave;
-reset master;
+start slave;
 create table t1(n int not null auto_increment primary key)ENGINE=InnoDB;
 insert into t1 values (NULL);
 drop table t1;
@@ -113,7 +113,6 @@ Aberdeen
 Abernathy
 aberrant
 aberration
-start slave;
 
 let $result_pattern= '%127.0.0.1%root%master-bin.000002%slave-relay-bin.000005%Yes%Yes%0%0%None%' ;