perform explicit cleanup

add missing opt file

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

@@ -115,7 +115,7 @@ Create Table	CREATE TABLE `byrange_tbl` (
   `fkid` mediumint(9) DEFAULT NULL,
   `filler` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=9 DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (id) SUBPARTITION BY HASH (id) SUBPARTITIONS 2 (PARTITION pa1 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION pa2 VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION pa3 VALUES LESS THAN (30) ENGINE = MyISAM, PARTITION pa4 VALUES LESS THAN (40) ENGINE = MyISAM, PARTITION pa5 VALUES LESS THAN (50) ENGINE = MyISAM, PARTITION pa6 VALUES LESS THAN (60) ENGINE = MyISAM, PARTITION pa7 VALUES LESS THAN (70) ENGINE = MyISAM, PARTITION pa8 VALUES LESS THAN (80) ENGINE = MyISAM, PARTITION pa9 VALUES LESS THAN (90) ENGINE = MyISAM, PARTITION pa10 VALUES LESS THAN (100) ENGINE = MyISAM, PARTITION pa11 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (id) SUBPARTITION BY HASH (id) SUBPARTITIONS 2 (PARTITION pa1 VALUES LESS THAN (10) ENGINE = InnoDB, PARTITION pa2 VALUES LESS THAN (20) ENGINE = InnoDB, PARTITION pa3 VALUES LESS THAN (30) ENGINE = InnoDB, PARTITION pa4 VALUES LESS THAN (40) ENGINE = InnoDB, PARTITION pa5 VALUES LESS THAN (50) ENGINE = InnoDB, PARTITION pa6 VALUES LESS THAN (60) ENGINE = InnoDB, PARTITION pa7 VALUES LESS THAN (70) ENGINE = InnoDB, PARTITION pa8 VALUES LESS THAN (80) ENGINE = InnoDB, PARTITION pa9 VALUES LESS THAN (90) ENGINE = InnoDB, PARTITION pa10 VALUES LESS THAN (100) ENGINE = InnoDB, PARTITION pa11 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) */
 show slave status;
 Slave_IO_State	Waiting for master to send event
 Master_Host	127.0.0.1
@@ -161,3 +161,9 @@ SELECT count(*) "Slave bykey" FROM test.bykey_tbl;
 Slave bykey	811
 SELECT count(*) "Slave byrange" FROM test.byrange_tbl;
 Slave byrange	996
+DROP PROCEDURE test.proc_norm;
+DROP PROCEDURE test.proc_bykey;
+DROP PROCEDURE test.proc_byrange;
+DROP TABLE test.regular_tbl;
+DROP TABLE test.bykey_tbl;
+DROP TABLE test.byrange_tbl;

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

@@ -33,3 +33,5 @@ SET del_count = del_count - 2;
 END WHILE;
 END|
 CALL test.proc_norm();
+DROP PROCEDURE test.proc_norm;
+DROP TABLE test.regular_tbl;

mysql-test/suite/rpl/t/rpl_innodb_bug28430-slave.opt

+--innodb --innodb_autoinc_lock_mode=0

mysql-test/suite/rpl/t/rpl_innodb_bug28430.test

@@ -145,7 +145,12 @@ SELECT count(*) "Slave norm" FROM test.regular_tbl;
 SELECT count(*) "Slave bykey" FROM test.bykey_tbl;
 SELECT count(*) "Slave byrange" FROM test.byrange_tbl;
 
---source include/master-slave-end.inc
 connection master;
-DROP DATABASE IF EXISTS test;
-CREATE DATABASE test;
+DROP PROCEDURE test.proc_norm;
+DROP PROCEDURE test.proc_bykey;
+DROP PROCEDURE test.proc_byrange;
+DROP TABLE test.regular_tbl;
+DROP TABLE test.bykey_tbl;
+DROP TABLE test.byrange_tbl;
+
+--source include/master-slave-end.inc

mysql-test/suite/rpl/t/rpl_innodb_bug30888.test

@@ -59,7 +59,11 @@ delimiter ;|
 
 CALL test.proc_norm();
 
-#--source include/master-slave-end.inc
 --sync_slave_with_master
-connection slave;
+
+connection master;
+DROP PROCEDURE test.proc_norm;
+DROP TABLE test.regular_tbl;
+
+--source include/master-slave-end.inc