Cleanup testcases

 - Add  missing drop(s)
 - Reset changed variables

NOTE! These kind of problems are easily found with --check-testcases options to mysql-test-run.pl 

mysql-test/extra/rpl_tests/rpl_insert_id_pk.test

@@ -83,5 +83,6 @@ SET FOREIGN_KEY_CHECKS=0;
 --error 1022, 1062
 INSERT INTO t1 VALUES (1),(1);
 sync_slave_with_master;
-
+connection master;
+drop table t1;
 # End of 4.1 tests

mysql-test/extra/rpl_tests/rpl_loaddata.test

@@ -152,5 +152,5 @@ wait_for_slave_to_stop;
 drop table t2;
 connection master;
 drop table t2;
-
+drop table t1;
 # End of 4.1 tests

mysql-test/extra/rpl_tests/rpl_log.test

@@ -126,7 +126,7 @@ show slave status;
 show binlog events in 'slave-bin.000005' from 4;
 
 # The table drops caused Cluster Replication wrapper to fail as event ID would never be the same.# Moving drops here.
-
+connection master;
 DROP TABLE t1;
 DROP TABLE t2;
 DROP TABLE t3;

mysql-test/extra/rpl_tests/rpl_multi_update3.test

@@ -217,4 +217,6 @@ select "-- SLAVE AFTER JOIN --" as "";
 select * from t1;
 select * from t2;
 
+connection master;
+DROP TABLE t1, t2;
 # End of 4.1 tests

mysql-test/extra/rpl_tests/rpl_row_sp006.test

@@ -76,6 +76,7 @@ DROP PROCEDURE IF EXISTS mysqltest1.p1;
 DROP PROCEDURE IF EXISTS mysqltest1.p2;
 DROP TABLE IF EXISTS mysqltest1.t1;
 DROP TABLE IF EXISTS mysqltest1.t2;
+DROP DATABASE mysqltest1;
 
 # Lets compare. Note: If they match test will pass, if they do not match
 # the test will show that the diff statement failed and not reject file

mysql-test/include/check-testcase.test

@@ -21,13 +21,13 @@ show databases;
 #
 # Dump the "test" database, all it's tables and their data
 #
---exec $MYSQL_DUMP --skip-comments test
+--exec $MYSQL_DUMP --skip-comments --skip-lock-tables test
 
 #
 # Dump the "mysql" database and it's tables
 # Select data separately to add "order by"
 #
---exec $MYSQL_DUMP --skip-comments --no-data mysql
+--exec $MYSQL_DUMP --skip-comments --skip-lock-tables --no-data mysql
 use mysql;
 select * from columns_priv;
 select * from db order by host, db, user;

mysql-test/r/ndb_cache_multi.result

@@ -70,3 +70,5 @@ show status like "Qcache_hits";
 Variable_name	Value
 Qcache_hits	0
 drop table t1, t2;
+set GLOBAL query_cache_size=0;
+set GLOBAL query_cache_size=0;

mysql-test/r/partition.result

@@ -717,6 +717,7 @@ CALL test.p1(13);
 Warnings:
 Warning	1196	Some non-transactional changed tables couldn't be rolled back
 drop table t1;
+drop procedure test.p1;
 CREATE TABLE t1 (a int not null)
 partition by key(a)
 (partition p0 COMMENT='first partition');

mysql-test/r/rpl_drop_db.result

@@ -33,3 +33,5 @@ n
 1234
 DROP DATABASE mysqltest1;
 stop slave;
+use test;
+drop table t1;

mysql-test/r/rpl_multi_update3.result

@@ -194,3 +194,4 @@ idpro	price	nbprice
 1	1.0000	3
 2	1.0000	2
 3	2.0000	1
+DROP TABLE t1, t2;

mysql-test/r/rpl_ndb_multi_update3.result

@@ -194,3 +194,4 @@ idpro	price	nbprice
 1	1.0000	3
 2	1.0000	2
 3	2.0000	1
+DROP TABLE t1, t2;

mysql-test/r/rpl_ndb_sp006.result

@@ -43,3 +43,4 @@ DROP PROCEDURE IF EXISTS mysqltest1.p1;
 DROP PROCEDURE IF EXISTS mysqltest1.p2;
 DROP TABLE IF EXISTS mysqltest1.t1;
 DROP TABLE IF EXISTS mysqltest1.t2;
+DROP DATABASE mysqltest1;

mysql-test/r/rpl_stm_no_op.result

@@ -49,4 +49,4 @@ select * from t1;
 a	b
 select * from t2;
 a	b
-drop table t1;
+drop table t1, t2;

mysql-test/r/rpl_variables.result

@@ -15,3 +15,4 @@ slave_load_tmpdir	SLAVE_LOAD_TMPDIR
 show variables like 'slave_skip_errors';
 Variable_name	Value
 slave_skip_errors	3,100,137,643,1752
+set global slave_net_timeout=default;

mysql-test/t/ndb_cache_multi.test

@@ -63,3 +63,10 @@ show status like "Qcache_hits";
 drop table t1, t2;
 
 
+# Turn off query cache on server1
+connection server1;
+set GLOBAL query_cache_size=0;
+
+# Turn off query cache on server2
+connection server2;
+set GLOBAL query_cache_size=0;

mysql-test/t/partition.test

@@ -846,6 +846,7 @@ delimiter ;|
 CALL test.p1(12);
 CALL test.p1(13);
 drop table t1;
+drop procedure test.p1;
 
 #
 # Bug 13520: Problem with delimiters in COMMENT DATA DIRECTORY ..

mysql-test/t/rpl_drop_db.test

@@ -56,3 +56,7 @@ connection slave;
 stop slave;
 #system rm -rf $MYSQLTEST_VARDIR/master-data/mysqltest1;
 
+connection master;
+use test;
+drop table t1;
+

mysql-test/t/rpl_stm_no_op.test

@@ -89,5 +89,5 @@ select * from t2;
 
 # cleanup
 connection master;
-drop table t1;
+drop table t1, t2;
 sync_slave_with_master;

mysql-test/t/rpl_variables.test

@@ -12,3 +12,6 @@ show variables like 'slave_load_tmpdir';
 # We just set some arbitrary values in variables-master.opt so we can test
 # that a list of values works correctly
 show variables like 'slave_skip_errors';
+
+# Cleanup
+set global slave_net_timeout=default;