Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my51-mysqltestrun_check_testcases

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/rpl_loaddata_m.result:
  Auto merged
mysql-test/r/sp-security.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/read_only.test:
  Auto merged
mysql-test/t/sp-security.test:
  Auto merged
mysql-test/t/trigger-compat.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
mysql-test/r/trigger-compat.result:
  Merge 5.0 -> 5.1

24 files changed, 71 insertions, 7 deletions

diff --git a/mysql-test/t/analyze.test b/mysql-test/t/analyze.test
index 656ff752c9b..a8fd0a4283e 100644
--- a/mysql-test/t/analyze.test
+++ b/mysql-test/t/analyze.test
@@ -61,5 +61,6 @@ prepare stmt1 from "SELECT * FROM t1 PROCEDURE ANALYSE()";
 execute stmt1;
 execute stmt1;
 deallocate prepare stmt1;
+drop table t1;
 
 # End of 4.1 tests
diff --git a/mysql-test/t/create_select_tmp.test b/mysql-test/t/create_select_tmp.test
index dad83942806..144bccc5871 100644
--- a/mysql-test/t/create_select_tmp.test
+++ b/mysql-test/t/create_select_tmp.test
@@ -30,5 +30,6 @@ select * from t2;
 CREATE TEMPORARY TABLE t2 ( PRIMARY KEY (a) ) ENGINE=MYISAM SELECT a FROM t1;
 --error 1146
 select * from t2;
+drop table t1;
 
 # End of 4.1 tests
diff --git a/mysql-test/t/ctype_recoding.test b/mysql-test/t/ctype_recoding.test
index 5648cea7fd3..2d6b55600b1 100644
--- a/mysql-test/t/ctype_recoding.test
+++ b/mysql-test/t/ctype_recoding.test
@@ -186,5 +186,5 @@ select rpad(c1,3,'ö'), rpad('ö',3,c1) from t1;
 # TODO
 #select case c1 when 'ß' then 'ß' when 'ö' then 'ö' else 'c' end from t1;
 #select export_set(5,c1,'ö'), export_set(5,'ö',c1) from t1;
-
+drop table t1;
 # End of 4.1 tests
diff --git a/mysql-test/t/fulltext_var.test b/mysql-test/t/fulltext_var.test
index 6b0b8aa463b..a048dab7f40 100644
--- a/mysql-test/t/fulltext_var.test
+++ b/mysql-test/t/fulltext_var.test
@@ -5,6 +5,9 @@
 drop table if exists t1;
 --enable_warnings
 
+# Save ft_boolean_syntax variable
+let $saved_ft_boolean_syntax=`select @@global.ft_boolean_syntax`;
+
 show variables like "ft\_%";
 
 create table t1 (b text not null);
@@ -25,4 +28,9 @@ set global ft_boolean_syntax='@ -><()~*:""@|';
 set global ft_boolean_syntax='+ -><()~*:""@!|';
 drop table t1;
 
+# Restore ft_boolean_syntax variable
+--disable_query_log
+eval set global ft_boolean_syntax='$saved_ft_boolean_syntax';
+--enable_query_log
+
 # End of 4.1 tests
diff --git a/mysql-test/t/grant2.test b/mysql-test/t/grant2.test
index c19bb1482d6..430a3a5dd4a 100644
--- a/mysql-test/t/grant2.test
+++ b/mysql-test/t/grant2.test
@@ -286,6 +286,7 @@ drop user 'mysqltest_1b', 'mysqltest_2b', 'mysqltest_3b';
 create user 'mysqltest_2' identified by 'Mysqltest-2';
 --error 1064
 drop user 'mysqltest_2' identified by 'Mysqltest-2';
+drop user 'mysqltest_2';
 #
 # Strange user names
 create user '%@b'@'b';
@@ -325,6 +326,7 @@ insert into mysql.user set host='%', user='mysqltest_B';
 create user mysqltest_A@'%';
 rename user mysqltest_B@'%' to mysqltest_C@'%';
 drop user mysqltest_C@'%';
+drop user mysqltest_A@'%';
 disconnect user4;
 connection default;
 drop user mysqltest_3@localhost;
diff --git a/mysql-test/t/innodb_cache.test b/mysql-test/t/innodb_cache.test
index a811d660bd7..8ed2853e4f7 100644
--- a/mysql-test/t/innodb_cache.test
+++ b/mysql-test/t/innodb_cache.test
@@ -63,6 +63,7 @@ drop table t1;
 #
 # one statement roll back inside transation
 #
+let $save_query_cache_size=`select @@global.query_cache_size`;
 set GLOBAL query_cache_size=1355776;
 CREATE TABLE t1 ( id int(10) NOT NULL auto_increment, a varchar(25) default NULL, PRIMARY KEY  (id), UNIQUE KEY a (a)) ENGINE=innodb;
 CREATE TABLE t2 ( id int(10) NOT NULL auto_increment, b varchar(25) default NULL, PRIMARY KEY  (id), UNIQUE KEY b (b)) ENGINE=innodb;
@@ -79,5 +80,8 @@ insert into t3 VALUES ( NULL, 1, 1, 2 );
 commit;
 select t1.* from t1, t2, t3 where t3.state & 1 = 0 and t3.t1_id = t1.id and t3.t2_id = t2.id and t1.id = 1 order by t1.a asc;
 drop table t3,t2,t1;
+--disable_query_log
+eval set GLOBAL query_cache_size=$save_query_cache_size;
+--enable_query_log
 
 # End of 4.1 tests
diff --git a/mysql-test/t/join_outer.test b/mysql-test/t/join_outer.test
index 367b98f2485..03ad56ed2b6 100644
--- a/mysql-test/t/join_outer.test
+++ b/mysql-test/t/join_outer.test
@@ -700,6 +700,7 @@ SELECT COALESCE(t2.EMPNUM,t1.EMPNUM) AS EMPNUM, NAME, GRP
 SELECT * FROM v1;
 SELECT * FROM v1 WHERE EMPNUM < 10;
 
+DROP VIEW v1;
 DROP TABLE t1,t2;
 
 #
diff --git a/mysql-test/t/ps_1general.test b/mysql-test/t/ps_1general.test
index fa844f02ace..6b168711de8 100644
--- a/mysql-test/t/ps_1general.test
+++ b/mysql-test/t/ps_1general.test
@@ -834,7 +834,7 @@ execute stmt1 ;
 --disable_metadata
 --horizontal_results
 
-drop table t5, t9;
+drop table t1, t5, t9;
 
 ##### RULES OF THUMB TO PRESERVE THE SYSTEMATICS OF THE PS TEST CASES #####
 #
diff --git a/mysql-test/t/query_cache.test b/mysql-test/t/query_cache.test
index a99d802e5a5..15559d75d6c 100644
--- a/mysql-test/t/query_cache.test
+++ b/mysql-test/t/query_cache.test
@@ -787,6 +787,7 @@ begin
 end//
 call p1()//
 drop procedure p1//
+drop function f1//
 
 drop table t1//
 delimiter ;//
diff --git a/mysql-test/t/read_only.test b/mysql-test/t/read_only.test
index 1e92e438122..175a5bba6fa 100644
--- a/mysql-test/t/read_only.test
+++ b/mysql-test/t/read_only.test
@@ -104,3 +104,5 @@ insert into t1 values(1);
 connection default;
 drop table t1,t2;
 drop user test@localhost;
+
+set global read_only=0;
diff --git a/mysql-test/t/rpl000017.test b/mysql-test/t/rpl000017.test
index 792801dd3d2..2ba321cd8c3 100644
--- a/mysql-test/t/rpl000017.test
+++ b/mysql-test/t/rpl000017.test
@@ -16,6 +16,7 @@ sync_slave_with_master;
 select * from t1;
 connection master;
 drop table t1;
+delete from mysql.user where user="replicate";
 sync_slave_with_master;
 
 # End of 4.1 tests
diff --git a/mysql-test/t/rpl_ignore_revoke.test b/mysql-test/t/rpl_ignore_revoke.test
index e5b5bafb3c5..cdeb40df069 100644
--- a/mysql-test/t/rpl_ignore_revoke.test
+++ b/mysql-test/t/rpl_ignore_revoke.test
@@ -41,3 +41,7 @@ connection slave;
 --disable_abort_on_error
 revoke select on *.* FROM 'user_foo';
 --enable_abort_on_error
+
+connection master;
+delete from mysql.user where user="user_foo";
+sync_slave_with_master;
diff --git a/mysql-test/t/rpl_misc_functions.test b/mysql-test/t/rpl_misc_functions.test
index f20d0aa83e4..ca9c6419cb6 100644
--- a/mysql-test/t/rpl_misc_functions.test
+++ b/mysql-test/t/rpl_misc_functions.test
@@ -28,5 +28,9 @@ load data local infile './var/master-data/test/rpl_misc_functions.outfile' into
 # compare them with the replica; the SELECT below should return no row
 select * from t1, t2 where (t1.id=t2.id) and not(t1.i=t2.i and t1.r1=t2.r1 and t1.r2=t2.r2 and t1.p=t2.p);
 stop slave;
+drop table t1;
+
+connection master;
+drop table t1;
 
 # End of 4.1 tests
diff --git a/mysql-test/t/rpl_replicate_do.test b/mysql-test/t/rpl_replicate_do.test
index 5a2cb50d53a..1aa57f6afe6 100644
--- a/mysql-test/t/rpl_replicate_do.test
+++ b/mysql-test/t/rpl_replicate_do.test
@@ -53,4 +53,8 @@ connection slave;
 set one_shot time_zone='met';
 select * from t1;
 
+connection master;
+drop table t1;
+sync_slave_with_master;
+
 # End of 4.1 tests
diff --git a/mysql-test/t/rpl_skip_error.test b/mysql-test/t/rpl_skip_error.test
index e0e569a65b7..f6fc73f58f2 100644
--- a/mysql-test/t/rpl_skip_error.test
+++ b/mysql-test/t/rpl_skip_error.test
@@ -13,4 +13,7 @@ connection slave;
 sync_with_master;
 select * from t1;
 
+connection master;
+drop table t1;
+sync_with_master;
 # End of 4.1 tests
diff --git a/mysql-test/t/rpl_slave_status.test b/mysql-test/t/rpl_slave_status.test
index 67d3816f443..985cebabe7e 100644
--- a/mysql-test/t/rpl_slave_status.test
+++ b/mysql-test/t/rpl_slave_status.test
@@ -29,4 +29,8 @@ start slave;
 --vertical_results
 show slave status;
 
+connection master;
+drop table t1;
+sync_with_master;
+
 # end of 4.1 tests
diff --git a/mysql-test/t/sp-prelocking.test b/mysql-test/t/sp-prelocking.test
index bae144f51ac..cd48025188b 100644
--- a/mysql-test/t/sp-prelocking.test
+++ b/mysql-test/t/sp-prelocking.test
@@ -234,7 +234,8 @@ select f3() //
 call sp1() //
 
 delimiter ;//
-drop table t1,t2,t3;
+drop view v1;
+drop table t1,t2,t3,t4;
 drop function f1;
 drop function f2;
 drop function f3;
diff --git a/mysql-test/t/sp-security.test b/mysql-test/t/sp-security.test
index 0b24881a056..223bc09b9fc 100644
--- a/mysql-test/t/sp-security.test
+++ b/mysql-test/t/sp-security.test
@@ -196,7 +196,6 @@ use db2;
 call q();
 select * from t2;
 
-
 #
 # BUG#6030: Stored procedure has no appropriate DROP privilege
 # (or ALTER for that matter)
@@ -233,9 +232,13 @@ drop database db2;
 select type,db,name from mysql.proc;
 # Get rid of the users
 delete from mysql.user where user='user1' or user='user2';
+delete from mysql.user where user='' and host='%';
 # And any routine privileges
 delete from mysql.procs_priv where user='user1' or user='user2';
-
+# Delete the grants to user ''@'%' that was created above
+delete from mysql.procs_priv where user='' and host='%';
+delete from mysql.db where user='user2';
+flush privileges;
 #
 # Test the new security acls
 #
@@ -304,6 +307,9 @@ use test;
 drop database sptest;
 delete from mysql.user where user='usera' or user='userb' or user='userc';
 delete from mysql.procs_priv where user='usera' or user='userb' or user='userc';
+delete from mysql.tables_priv where user='usera';
+flush privileges;
+drop table t1;
 
 #
 # BUG#9503: reseting correct parameters of thread after error in SP function
diff --git a/mysql-test/t/subselect_innodb.test b/mysql-test/t/subselect_innodb.test
index 4bfc4d17588..573fe0c1810 100644
--- a/mysql-test/t/subselect_innodb.test
+++ b/mysql-test/t/subselect_innodb.test
@@ -236,4 +236,5 @@ delimiter ;//
 call p1();
 call p1();
 call p1();
+drop procedure p1;
 drop tables t1,t2,t3;
diff --git a/mysql-test/t/trigger-compat.test b/mysql-test/t/trigger-compat.test
index 5b2483cc3ea..62ddd3b8930 100644
--- a/mysql-test/t/trigger-compat.test
+++ b/mysql-test/t/trigger-compat.test
@@ -80,3 +80,16 @@ SELECT trigger_name, definer FROM INFORMATION_SCHEMA.TRIGGERS ORDER BY trigger_n
 --echo
 
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS ORDER BY trigger_name;
+
+# Clean up
+DROP TRIGGER wl2818_trg1;
+DROP TRIGGER wl2818_trg2;
+disconnect wl2818_definer_con;
+connection default;
+use mysqltest_db1;
+DROP TABLE t1;
+DROP TABLE t2;
+DROP USER mysqltest_dfn@localhost;
+DROP USER mysqltest_inv@localhost;
+DROP DATABASE mysqltest_db1;
+
diff --git a/mysql-test/t/type_bit.test b/mysql-test/t/type_bit.test
index 0c45dea21bb..1f05a9574d6 100644
--- a/mysql-test/t/type_bit.test
+++ b/mysql-test/t/type_bit.test
@@ -226,3 +226,4 @@ select a1, a2, b1+0, b2+0 from t1 join t2 on b1 = b2;
 select sum(a1), b1+0, b2+0 from t1 join t2 on b1 = b2 group by b1 order by 1;
 select 1 from t1 join t2 on b1 = b2 group by b1 order by 1;
 select b1+0,sum(b1), sum(b2) from t1 join t2 on b1 = b2 group by b1 order by 1;
+drop table t1, t2;
diff --git a/mysql-test/t/variables-master.opt b/mysql-test/t/variables-master.opt
index a0577107f74..abd826bc7fa 100644
--- a/mysql-test/t/variables-master.opt
+++ b/mysql-test/t/variables-master.opt
@@ -1 +1 @@
---max_join_size=10
+--max_join_size=100
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test
index 76761f9177d..fec47e6aaf0 100644
--- a/mysql-test/t/variables.test
+++ b/mysql-test/t/variables.test
@@ -48,7 +48,7 @@ drop table t1;
 #
 # Test system variables
 #
-
+set GLOBAL max_join_size=10;
 set max_join_size=100;
 show variables like 'max_join_size';
 --replace_result 18446744073709551615 HA_POS_ERROR 4294967295 HA_POS_ERROR
diff --git a/mysql-test/t/view_grant.test b/mysql-test/t/view_grant.test
index 26a4a7e1ec5..1327436d6c3 100644
--- a/mysql-test/t/view_grant.test
+++ b/mysql-test/t/view_grant.test
@@ -12,6 +12,8 @@ grant create view on test.* to test@localhost;
 show grants for test@localhost;
 revoke create view on test.* from test@localhost;
 show grants for test@localhost;
+# The grant above creates a new user test@localhost, delete it
+drop user test@localhost;
 
 # grant create view test
 #