List:Commits« Previous MessageNext Message »
From:msvensson Date:January 26 2006 4:54pm
Subject:bk commit into 5.0 tree (msvensson:1.2033)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2033 06/01/26 17:54:34 msvensson@neptunus.(none) +65 -0
  Add new option "check-testcases" to mysql-test-run.pl
  Cleanup the sideeffects from most of the  testcases with sideeffects.

  mysql-test/include/check-testcase.test
    1.1 06/01/26 17:54:29 msvensson@neptunus.(none) +51 -0
    New BitKeeper file ``mysql-test/include/check-testcase.test''

  mysql-test/t/view_grant.test
    1.9 06/01/26 17:54:29 msvensson@neptunus.(none) +2 -0
    Drop the user "test@localhost"

  mysql-test/t/variables.test
    1.52 06/01/26 17:54:29 msvensson@neptunus.(none) +1 -1
    Set max_join_size to 10, which was the original value in variables-master.opt

  mysql-test/t/variables-master.opt
    1.7 06/01/26 17:54:29 msvensson@neptunus.(none) +1 -1
    Increase max_join_size to 100.

  mysql-test/include/check-testcase.test
    1.0 06/01/26 17:54:29 msvensson@neptunus.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/mysqltestrun_check_testcases/my50-mysqltestrun_check_testcases/mysql-test/include/check-testcase.test

  mysql-test/t/type_bit.test
    1.14 06/01/26 17:54:28 msvensson@neptunus.(none) +1 -0
    drop table t1 and t2 to cleanup

  mysql-test/t/trigger-compat.test
    1.3 06/01/26 17:54:28 msvensson@neptunus.(none) +13 -0
    Drop trigger wl2818_trg1 and wl2818_trg2 to cleanup
    Drop table t1, t2
    Drop users
    drop database mysqltest_db1

  mysql-test/t/subselect_innodb.test
    1.16 06/01/26 17:54:28 msvensson@neptunus.(none) +1 -0
    Drop procedure p1 to cleanup

  mysql-test/t/sp-security.test
    1.26 06/01/26 17:54:28 msvensson@neptunus.(none) +8 -2
    Delete  test users from mysql.user, mysql.db, mysql.procs_priv and mysql.tables_priv
    Drop table t1 to cleanup

  mysql-test/t/sp-prelocking.test
    1.3 06/01/26 17:54:28 msvensson@neptunus.(none) +2 -1
    Drop table t1, t2 t3 and t4 to cleanup
    Drop view v1

  mysql-test/t/rpl_slave_status.test
    1.7 06/01/26 17:54:28 msvensson@neptunus.(none) +4 -0
    Drop table t1 to cleanup

  mysql-test/t/rpl_skip_error.test
    1.7 06/01/26 17:54:28 msvensson@neptunus.(none) +3 -0
    Drop table t1 to cleanup

  mysql-test/t/rpl_replicate_do.test
    1.23 06/01/26 17:54:28 msvensson@neptunus.(none) +4 -0
    Drop table t1 to cleanup

  mysql-test/t/rpl_multi_update3.test
    1.6 06/01/26 17:54:28 msvensson@neptunus.(none) +3 -0
    Drop table t1 and t2 to cleanup

  mysql-test/t/rpl_misc_functions.test
    1.4 06/01/26 17:54:28 msvensson@neptunus.(none) +4 -0
    Drop table t1 to cleanup

  mysql-test/t/rpl_loaddata_rule_s.test
    1.10 06/01/26 17:54:28 msvensson@neptunus.(none) +3 -0
    Drop table t1 to cleanup

  mysql-test/t/rpl_loaddata_rule_m.test
    1.13 06/01/26 17:54:28 msvensson@neptunus.(none) +3 -0
    Drop table t1 to cleanup

  mysql-test/t/rpl_loaddata.test
    1.22 06/01/26 17:54:28 msvensson@neptunus.(none) +2 -1
    Drop table t1 to cleanup

  mysql-test/t/rpl_insert_id.test
    1.14 06/01/26 17:54:28 msvensson@neptunus.(none) +3 -0
    drop table t1 to cleanup

  mysql-test/t/rpl_ignore_revoke.test
    1.2 06/01/26 17:54:28 msvensson@neptunus.(none) +4 -0
    Delet user "user_foo" to cleanup

  mysql-test/t/rpl_flush_tables.test
    1.12 06/01/26 17:54:28 msvensson@neptunus.(none) +3 -0
    Droip table t3, t4 and t5 to cleanup

  mysql-test/t/rpl_failed_optimize.test
    1.3 06/01/26 17:54:28 msvensson@neptunus.(none) +3 -0
    Drop table t1 to cleanup

  mysql-test/t/rpl000017.test
    1.14 06/01/26 17:54:28 msvensson@neptunus.(none) +1 -0
    Delete user "replicate" to cleanup

  mysql-test/t/rpl000001.test
    1.43 06/01/26 17:54:28 msvensson@neptunus.(none) +1 -0
    Delete user "blafasel2" to cleanup

  mysql-test/t/read_only.test
    1.2 06/01/26 17:54:27 msvensson@neptunus.(none) +2 -0
    Reset the readonly flag

  mysql-test/t/query_cache.test
    1.52 06/01/26 17:54:27 msvensson@neptunus.(none) +1 -0
    Drop function "f1" to cleanup

  mysql-test/t/ps_1general.test
    1.26 06/01/26 17:54:27 msvensson@neptunus.(none) +1 -1
    Drop table t1 to cleanup

  mysql-test/t/join_outer.test
    1.34 06/01/26 17:54:27 msvensson@neptunus.(none) +1 -0
    Drop view v1 to cleanup

  mysql-test/t/innodb_cache.test
    1.12 06/01/26 17:54:27 msvensson@neptunus.(none) +4 -0
    Reset query_cache_size to original value

  mysql-test/t/grant2.test
    1.30 06/01/26 17:54:27 msvensson@neptunus.(none) +2 -0
    Drop users "mysqltest_2" and "mysqltest_A@'%'" to cleanup

  mysql-test/t/fulltext_var.test
    1.5 06/01/26 17:54:27 msvensson@neptunus.(none) +8 -0
    Restore the original ft_boolean_syntax

  mysql-test/t/ctype_recoding.test
    1.22 06/01/26 17:54:27 msvensson@neptunus.(none) +1 -1
    Drop table t1 to cleanup

  mysql-test/t/ctype_cp932.test
    1.9 06/01/26 17:54:27 msvensson@neptunus.(none) +1 -0
    Drop table t1 to cleanup

  mysql-test/t/create_select_tmp.test
    1.10 06/01/26 17:54:27 msvensson@neptunus.(none) +1 -0
    Drop table t1 to cleanup

  mysql-test/t/analyze.test
    1.8 06/01/26 17:54:27 msvensson@neptunus.(none) +1 -0
    Drop table t1 to cleanup

  mysql-test/r/view_grant.result
    1.9 06/01/26 17:54:27 msvensson@neptunus.(none) +1 -0
    Dop user "test@localhost" to cleanup

  mysql-test/r/variables.result
    1.77 06/01/26 17:54:27 msvensson@neptunus.(none) +1 -0
    Set GLOBAL max_join_size to 10 as it originally was in variables-master.opt

  mysql-test/r/type_bit.result
    1.15 06/01/26 17:54:27 msvensson@neptunus.(none) +1 -0
    Drop tables t1 and t2 to cleanup

  mysql-test/r/trigger-compat.result
    1.2 06/01/26 17:54:27 msvensson@neptunus.(none) +10 -0
    Drop trigger wl2818_trg1 and wl2818_trg2.
    Drop table t1, t2
    Drop database mysqltest_db1
    And the users "mysqltest_dfn@localhost" and "mysqltest_inv@localhost"

  mysql-test/r/subselect_innodb.result
    1.13 06/01/26 17:54:27 msvensson@neptunus.(none) +1 -0
    Drop procedure p1 to cleanup

  mysql-test/r/sp-security.result
    1.23 06/01/26 17:54:27 msvensson@neptunus.(none) +7 -0
    Delete users to cleanup
    Delete remaining traces in tables_priv and procs_priv

  mysql-test/r/sp-prelocking.result
    1.3 06/01/26 17:54:27 msvensson@neptunus.(none) +2 -1
    Drop view v1 and tables t1, t2, t3 and t4 to cleanup

  mysql-test/r/rpl_slave_status.result
    1.5 06/01/26 17:54:27 msvensson@neptunus.(none) +1 -0
    Drop tyable t1 to cleanup

  mysql-test/r/rpl_skip_error.result
    1.7 06/01/26 17:54:27 msvensson@neptunus.(none) +1 -0
    Drop tyable t1 to cleanup

  mysql-test/r/rpl_replicate_do.result
    1.31 06/01/26 17:54:26 msvensson@neptunus.(none) +1 -0
    Drop tyable t1 to cleanup

  mysql-test/r/rpl_multi_update3.result
    1.5 06/01/26 17:54:26 msvensson@neptunus.(none) +1 -0
    Drop tyable t1 and t2 to cleanup

  mysql-test/r/rpl_misc_functions.result
    1.3 06/01/26 17:54:26 msvensson@neptunus.(none) +2 -0
    Drop tyable t1 to cleanup

  mysql-test/r/rpl_loaddata_rule_s.result
    1.8 06/01/26 17:54:26 msvensson@neptunus.(none) +1 -0
    Drop tyable t1 to cleanup

  mysql-test/r/rpl_loaddata_rule_m.result
    1.14 06/01/26 17:54:26 msvensson@neptunus.(none) +2 -0
    Drop tyable t1 to cleanup

  mysql-test/r/rpl_loaddata.result
    1.29 06/01/26 17:54:26 msvensson@neptunus.(none) +1 -0
    Drop tyable t1 to cleanup

  mysql-test/r/rpl_insert_id.result
    1.13 06/01/26 17:54:26 msvensson@neptunus.(none) +1 -0
    Drop table t1 to cleanup

  mysql-test/r/rpl_ignore_revoke.result
    1.2 06/01/26 17:54:26 msvensson@neptunus.(none) +1 -0
    Delete user "user_foo"

  mysql-test/r/rpl_flush_tables.result
    1.13 06/01/26 17:54:26 msvensson@neptunus.(none) +1 -0
    Drop tables t3, t4, t5

  mysql-test/r/rpl_failed_optimize.result
    1.4 06/01/26 17:54:26 msvensson@neptunus.(none) +1 -0
    Drop table t1 to cleanup

  mysql-test/r/rpl000017.result
    1.7 06/01/26 17:54:26 msvensson@neptunus.(none) +1 -0
    Remove user "replicate"

  mysql-test/r/rpl000001.result
    1.31 06/01/26 17:54:26 msvensson@neptunus.(none) +1 -0
    Remove user "blafasel2"

  mysql-test/r/read_only.result
    1.3 06/01/26 17:54:26 msvensson@neptunus.(none) +1 -0
    Reset the "read_only" flag

  mysql-test/r/query_cache.result
    1.69 06/01/26 17:54:26 msvensson@neptunus.(none) +1 -0
    Drop function "f1"

  mysql-test/r/ps_1general.result
    1.52 06/01/26 17:54:26 msvensson@neptunus.(none) +1 -1
    Drop table t1 at end of test

  mysql-test/r/join_outer.result
    1.45 06/01/26 17:54:26 msvensson@neptunus.(none) +1 -0
    Drop view v1 to cleanup

  mysql-test/r/grant2.result
    1.24 06/01/26 17:54:26 msvensson@neptunus.(none) +2 -0
    Drop user mysqltest_2 and mysqltest_A@'%'

  mysql-test/r/ctype_recoding.result
    1.30 06/01/26 17:54:26 msvensson@neptunus.(none) +1 -0
    Drop table t1 at end of test

  mysql-test/r/ctype_cp932.result
    1.7 06/01/26 17:54:26 msvensson@neptunus.(none) +1 -0
    Drop table t1 at end of test

  mysql-test/r/create_select_tmp.result
    1.5 06/01/26 17:54:26 msvensson@neptunus.(none) +1 -0
    Drop table t1 at end of test

  mysql-test/r/analyze.result
    1.5 06/01/26 17:54:25 msvensson@neptunus.(none) +1 -0
    Drop table t1 at end of test

  mysql-test/mysql-test-run.pl
    1.61 06/01/26 17:54:25 msvensson@neptunus.(none) +63 -1
    Add option "check-testcases" to mysql-test-run.pl
    Will execute "include/check-testcase.test" once before each tescase and record the output into "var/tmp/check-testcase.result"
    After the teastcase it will run again and this time compare the output with previously recorded file.

  mysql-test/t/variables-master.opt
    1.6 06/01/24 12:55:40 msvensson@neptunus.(none) +0 -0
    Rename: BitKeeper/deleted/.del-variables-master.opt~8a6cb6459b54545 -> mysql-test/t/variables-master.opt

  BitKeeper/deleted/.del-variables-master.opt~8a6cb6459b54545
    1.5 06/01/24 11:02:58 msvensson@neptunus.(none) +0 -0
    Delete: mysql-test/t/variables-master.opt

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysqltestrun_check_testcases/my50-mysqltestrun_check_testcases

--- 1.1/mysql-test/r/rpl_ignore_revoke.result	2006-01-10 12:44:02 +01:00
+++ 1.2/mysql-test/r/rpl_ignore_revoke.result	2006-01-26 17:54:26 +01:00
@@ -26,3 +26,4 @@
 select_priv
 Y
 revoke select on *.* FROM 'user_foo';
+delete from mysql.user where user="user_foo";

--- 1.1/mysql-test/t/rpl_ignore_revoke.test	2006-01-10 12:44:02 +01:00
+++ 1.2/mysql-test/t/rpl_ignore_revoke.test	2006-01-26 17:54:28 +01:00
@@ -41,3 +41,7 @@
 --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;

--- 1.1/mysql-test/r/trigger-compat.result	2005-11-10 20:24:55 +01:00
+++ 1.2/mysql-test/r/trigger-compat.result	2006-01-26 17:54:27 +01:00
@@ -38,3 +38,13 @@
 INSERT INTO t2 VALUES(CURRENT_USER())	ROW	BEFORE	NULL	NULL	OLD	NEW	NULL		
 NULL	mysqltest_db1	wl2818_trg2	INSERT	NULL	mysqltest_db1	t1	0	NULL	
 INSERT INTO t2 VALUES(CURRENT_USER())	ROW	AFTER	NULL	NULL	OLD	NEW	NULL		mysqltest_dfn@localhost
+DROP TRIGGER wl2818_trg1;
+Warnings:
+Warning	1454	No definer attribute for trigger 'mysqltest_db1'.'wl2818_trg1'. The trigger will be activated under the authorization of the invoker, which may have insufficient privileges. Please recreate the trigger.
+DROP TRIGGER wl2818_trg2;
+use mysqltest_db1;
+DROP TABLE t1;
+DROP TABLE t2;
+DROP USER mysqltest_dfn@localhost;
+DROP USER mysqltest_inv@localhost;
+DROP DATABASE mysqltest_db1;

--- 1.2/mysql-test/t/trigger-compat.test	2005-12-08 21:38:30 +01:00
+++ 1.3/mysql-test/t/trigger-compat.test	2006-01-26 17:54:28 +01:00
@@ -81,3 +81,16 @@
 --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;
+

--- 1.29/mysql-test/r/ctype_recoding.result	2005-11-29 06:25:40 +01:00
+++ 1.30/mysql-test/r/ctype_recoding.result	2006-01-26 17:54:26 +01:00
@@ -247,3 +247,4 @@
+drop table t1;

--- 1.21/mysql-test/t/ctype_recoding.test	2005-11-21 14:23:41 +01:00
+++ 1.22/mysql-test/t/ctype_recoding.test	2006-01-26 17:54:27 +01:00
@@ -186,5 +186,5 @@
 # TODO
-
+drop table t1;
 # End of 4.1 tests

--- 1.12/mysql-test/r/subselect_innodb.result	2005-11-04 12:16:41 +01:00
+++ 1.13/mysql-test/r/subselect_innodb.result	2006-01-26 17:54:27 +01:00
@@ -243,4 +243,5 @@
 NULL
 x
 NULL
+drop procedure p1;
 drop tables t1,t2,t3;

--- 1.15/mysql-test/t/subselect_innodb.test	2005-11-04 12:16:41 +01:00
+++ 1.16/mysql-test/t/subselect_innodb.test	2006-01-26 17:54:28 +01:00
@@ -236,4 +236,5 @@
 call p1();
 call p1();
 call p1();
+drop procedure p1;
 drop tables t1,t2,t3;

--- 1.4/mysql-test/r/rpl_multi_update3.result	2005-10-10 15:09:43 +02:00
+++ 1.5/mysql-test/r/rpl_multi_update3.result	2006-01-26 17:54:26 +01:00
@@ -194,3 +194,4 @@
 1	1.0000	3
 2	1.0000	2
 3	2.0000	1
+drop table t1, t2;

--- 1.5/mysql-test/t/rpl_multi_update3.test	2005-10-10 15:09:44 +02:00
+++ 1.6/mysql-test/t/rpl_multi_update3.test	2006-01-26 17:54:28 +01:00
@@ -217,4 +217,7 @@
 select * from t1;
 select * from t2;
 
+connection master;
+drop table t1, t2;
+sync_slave_with_master;
 # End of 4.1 tests

--- 1.51/mysql-test/r/ps_1general.result	2005-11-10 17:21:41 +01:00
+++ 1.52/mysql-test/r/ps_1general.result	2006-01-26 17:54:26 +01:00
@@ -797,4 +797,4 @@
 execute stmt1 ;
 prepare stmt1 from ' select * from t5 ' ;
 execute stmt1 ;
-drop table t5, t9;
+drop table t1, t5, t9;

--- 1.25/mysql-test/t/ps_1general.test	2005-07-28 15:12:35 +02:00
+++ 1.26/mysql-test/t/ps_1general.test	2006-01-26 17:54:27 +01:00
@@ -831,7 +831,7 @@
 --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 #####
 #

--- 1.4/mysql-test/r/create_select_tmp.result	2005-09-15 16:18:52 +02:00
+++ 1.5/mysql-test/r/create_select_tmp.result	2006-01-26 17:54:26 +01:00
@@ -17,3 +17,4 @@
 ERROR 23000: Duplicate entry '1' for key 1
 select * from t2;
 ERROR 42S02: Table 'test.t2' doesn't exist
+drop table t1;

--- 1.2/mysql-test/r/read_only.result	2005-11-07 16:18:31 +01:00
+++ 1.3/mysql-test/r/read_only.result	2006-01-26 17:54:26 +01:00
@@ -41,3 +41,4 @@
 ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement
 drop table t1,t2;
 drop user test@localhost;
+set global read_only=0;

--- 1.12/mysql-test/r/rpl_flush_tables.result	2005-10-08 16:55:54 +02:00
+++ 1.13/mysql-test/r/rpl_flush_tables.result	2006-01-26 17:54:26 +01:00
@@ -44,3 +44,4 @@
 start slave;
 stop slave;
 ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
+drop table t3, t4, t5;

--- 1.13/mysql-test/r/rpl_loaddata_rule_m.result	2005-03-16 02:32:40 +01:00
+++ 1.14/mysql-test/r/rpl_loaddata_rule_m.result	2006-01-26 17:54:26 +01:00
@@ -17,3 +17,5 @@
 master-bin.000001	#	Begin_load_query	1	#	;file_id=1;block_len=12
 master-bin.000001	#	Execute_load_query	1	#	use `mysqltest`; load data infile '../../std_data/rpl_loaddata.dat' into table test.t1 ;file_id=1
 drop database mysqltest;
+use test;
+drop table t1;

--- 1.7/mysql-test/r/rpl_loaddata_rule_s.result	2005-03-16 02:32:40 +01:00
+++ 1.8/mysql-test/r/rpl_loaddata_rule_s.result	2006-01-26 17:54:26 +01:00
@@ -12,3 +12,4 @@
 2
 show binlog events from 98;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+drop table t1;

--- 1.2/mysql-test/r/rpl_misc_functions.result	2004-03-20 11:31:15 +01:00
+++ 1.3/mysql-test/r/rpl_misc_functions.result	2006-01-26 17:54:26 +01:00
@@ -19,3 +19,5 @@
 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);
 id	i	r1	r2	p	id	i	r1	r2	p
 stop slave;
+drop table t1;
+drop table t1;

--- 1.9/mysql-test/t/create_select_tmp.test	2005-09-15 21:17:37 +02:00
+++ 1.10/mysql-test/t/create_select_tmp.test	2006-01-26 17:54:27 +01:00
@@ -27,5 +27,6 @@
 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

--- 1.1/mysql-test/t/read_only.test	2005-10-17 10:52:22 +02:00
+++ 1.2/mysql-test/t/read_only.test	2006-01-26 17:54:27 +01:00
@@ -101,3 +101,5 @@
 connection default;
 drop table t1,t2;
 drop user test@localhost;
+
+set global read_only=0;

--- 1.11/mysql-test/t/rpl_flush_tables.test	2005-10-08 16:55:54 +02:00
+++ 1.12/mysql-test/t/rpl_flush_tables.test	2006-01-26 17:54:28 +01:00
@@ -49,5 +49,8 @@
 --error 1192
 stop slave;
 
+connection master;
+drop table t3, t4, t5;
+
 # End of 4.1 tests
 # Adding comment for force manual merge 5.0 -> wl1012. Delete me if needed.

--- 1.12/mysql-test/t/rpl_loaddata_rule_m.test	2005-09-15 21:17:37 +02:00
+++ 1.13/mysql-test/t/rpl_loaddata_rule_m.test	2006-01-26 17:54:28 +01:00
@@ -24,7 +24,10 @@
 # were returned).
 --replace_column 2 # 5 #
 show binlog events from 98;
+
 drop database mysqltest;
+use test;
+drop table t1;
 
 # End of 4.1 tests
 # Adding comment for force manual merge 5.0 -> wl1012: Delete me

--- 1.9/mysql-test/t/rpl_loaddata_rule_s.test	2005-09-15 21:17:37 +02:00
+++ 1.10/mysql-test/t/rpl_loaddata_rule_s.test	2006-01-26 17:54:28 +01:00
@@ -19,4 +19,7 @@
 select count(*) from t1; # check that LOAD was replicated
 show binlog events from 98; # should be nothing
 
+connection master;
+drop table t1;
+
 # End of 4.1 tests

--- 1.3/mysql-test/t/rpl_misc_functions.test	2005-07-28 02:21:48 +02:00
+++ 1.4/mysql-test/t/rpl_misc_functions.test	2006-01-26 17:54:28 +01:00
@@ -28,5 +28,9 @@
 # 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

--- 1.8/mysql-test/r/view_grant.result	2005-11-21 20:10:59 +01:00
+++ 1.9/mysql-test/r/view_grant.result	2006-01-26 17:54:27 +01:00
@@ -7,6 +7,7 @@
 show grants for test@localhost;
 Grants for test@localhost
 GRANT USAGE ON *.* TO 'test'@'localhost'
+drop user test@localhost;
 create database mysqltest;
 create table mysqltest.t1 (a int, b int);
 create table mysqltest.t2 (a int, b int);

--- 1.8/mysql-test/t/view_grant.test	2005-11-21 20:10:59 +01:00
+++ 1.9/mysql-test/t/view_grant.test	2006-01-26 17:54:29 +01:00
@@ -6,6 +6,8 @@
 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
 #

--- 1.60/mysql-test/mysql-test-run.pl	2006-01-09 18:16:51 +01:00
+++ 1.61/mysql-test/mysql-test-run.pl	2006-01-26 17:54:25 +01:00
@@ -239,6 +239,7 @@
 our $opt_old_master;
 
 our $opt_record;
+our $opt_check_testcases;
 
 our $opt_result_ext;
 
@@ -545,6 +546,7 @@
 
              # Test case authoring
              'record'                   => \$opt_record,
+             'check-testcases'          => \$opt_check_testcases,
 
              # ???
              'mysqld=s'                 => \@opt_extra_mysqld_opt,
@@ -2497,6 +2499,54 @@
   $instance_manager->{'pid'} = undef;
 }
 
+#
+# Run include/check-testcase.test
+# Before a testcase, run in record mode, save result file to var
+# After testcase, run and compare with the recorded file, they should be equal!
+#
+sub run_check_testcase ($) {
+
+  my $mode=     shift;
+
+  my $args;
+  mtr_init_args(\$args);
+
+  mtr_add_arg($args, "--no-defaults");
+  mtr_add_arg($args, "--silent");
+  mtr_add_arg($args, "-v");
+  mtr_add_arg($args, "--skip-safemalloc");
+  mtr_add_arg($args, "--tmpdir=%s", $opt_tmpdir);
+
+  mtr_add_arg($args, "--socket=%s", $master->[0]->{'path_mysock'});
+  mtr_add_arg($args, "--port=%d", $master->[0]->{'path_myport'});
+  mtr_add_arg($args, "--database=test");
+  mtr_add_arg($args, "--user=%s", $opt_user);
+  mtr_add_arg($args, "--password=");
+
+  mtr_add_arg($args, "-R");
+  mtr_add_arg($args, "$opt_vardir/tmp/check-testcase.result");
+
+  if ( $mode eq "before" )
+  {
+    mtr_add_arg($args, "--record");
+  }
+
+  my $res = mtr_run_test($exe_mysqltest,$args,
+	        "include/check-testcase.test", "", "", "");
+
+  if ( $res == 1  and $mode = "after")
+  {
+    mtr_run("diff",["-u",
+		    "$opt_vardir/tmp/check-testcase.result",
+		    "$opt_vardir/tmp/check-testcase.reject"],
+	    "", "", "", "");
+  }
+  elsif ( $res )
+  {
+    mtr_error("Could not execute 'check-testcase' $mode testcase");
+  }
+}
+
 sub run_mysqltest ($) {
   my $tinfo=       shift;
 
@@ -2726,7 +2776,18 @@
     mtr_add_arg($args, "--record");
   }
 
-  return mtr_run_test($exe,$args,$tinfo->{'path'},"",$path_timefile,"");
+  if ( $opt_check_testcases )
+  {
+    run_check_testcase("before");
+  }
+
+  my $res = mtr_run_test($exe,$args,$tinfo->{'path'},"",$path_timefile,"");
+
+  if ( $opt_check_testcases )
+  {
+    run_check_testcase("after");
+  }
+  return $res;
 }
 
 
@@ -2808,6 +2869,7 @@
 Options for test case authoring
 
   record TESTNAME       (Re)genereate the result file for TESTNAME
+  check-testcases       Check testcases for sideeffects
 
 Options that pass on options
 

--- 1.3/mysql-test/r/rpl_failed_optimize.result	2005-06-02 00:33:20 +02:00
+++ 1.4/mysql-test/r/rpl_failed_optimize.result	2006-01-26 17:54:26 +01:00
@@ -18,3 +18,4 @@
 test.non_existing	optimize	error	Table 'test.non_existing' doesn't exist
 Warnings:
 Error	1146	Table 'test.non_existing' doesn't exist
+drop table t1;

--- 1.2/mysql-test/t/rpl_failed_optimize.test	2005-07-28 02:21:47 +02:00
+++ 1.3/mysql-test/t/rpl_failed_optimize.test	2006-01-26 17:54:28 +01:00
@@ -17,4 +17,7 @@
 OPTIMIZE TABLE non_existing;  
 sync_slave_with_master;
 
+connection master;
+drop table t1;
+sync_slave_with_master;
 # End of 4.1 tests

--- 1.44/mysql-test/r/join_outer.result	2005-09-07 15:35:38 +02:00
+++ 1.45/mysql-test/r/join_outer.result	2006-01-26 17:54:26 +01:00
@@ -992,6 +992,7 @@
 EMPNUM	NAME	GRP
 0	KERI	10
 9	BARRY	NULL
+DROP VIEW v1;
 DROP TABLE t1,t2;
 CREATE TABLE t1 (c11 int);
 CREATE TABLE t2 (c21 int);

--- 1.76/mysql-test/r/variables.result	2005-11-23 00:11:05 +01:00
+++ 1.77/mysql-test/r/variables.result	2006-01-26 17:54:27 +01:00
@@ -71,6 +71,7 @@
 1	Bozo	USA
 4	Mr. Floppy	GB
 drop table t1;
+set GLOBAL max_join_size=10;
 set max_join_size=100;
 show variables like 'max_join_size';
 Variable_name	Value

--- 1.33/mysql-test/t/join_outer.test	2005-09-06 21:49:45 +02:00
+++ 1.34/mysql-test/t/join_outer.test	2006-01-26 17:54:27 +01:00
@@ -700,6 +700,7 @@
 SELECT * FROM v1;
 SELECT * FROM v1 WHERE EMPNUM < 10;
 
+DROP VIEW v1;
 DROP TABLE t1,t2;
 
 #

--- 1.51/mysql-test/t/variables.test	2005-11-23 00:11:06 +01:00
+++ 1.52/mysql-test/t/variables.test	2006-01-26 17:54:29 +01:00
@@ -48,7 +48,7 @@
 #
 # 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

--- 1.68/mysql-test/r/query_cache.result	2005-12-02 19:45:24 +01:00
+++ 1.69/mysql-test/r/query_cache.result	2006-01-26 17:54:26 +01:00
@@ -1074,6 +1074,7 @@
 1	2
 2	2
 drop procedure p1//
+drop function f1//
 drop table t1//
 flush query cache;
 reset query cache;

--- 1.11/mysql-test/t/innodb_cache.test	2005-09-15 16:17:14 +02:00
+++ 1.12/mysql-test/t/innodb_cache.test	2006-01-26 17:54:27 +01:00
@@ -63,6 +63,7 @@
 #
 # 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 @@
 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

--- 1.51/mysql-test/t/query_cache.test	2005-12-02 19:45:24 +01:00
+++ 1.52/mysql-test/t/query_cache.test	2006-01-26 17:54:27 +01:00
@@ -783,6 +783,7 @@
 end//
 call p1()//
 drop procedure p1//
+drop function f1//
 
 drop table t1//
 delimiter ;//

--- 1.12/mysql-test/r/rpl_insert_id.result	2005-02-24 17:33:29 +01:00
+++ 1.13/mysql-test/r/rpl_insert_id.result	2006-01-26 17:54:26 +01:00
@@ -73,3 +73,4 @@
 SET FOREIGN_KEY_CHECKS=0;
 INSERT INTO t1 VALUES (1),(1);
 ERROR 23000: Duplicate entry '1' for key 1
+drop table t1;

--- 1.28/mysql-test/r/rpl_loaddata.result	2005-03-25 14:51:02 +01:00
+++ 1.29/mysql-test/r/rpl_loaddata.result	2006-01-26 17:54:26 +01:00
@@ -79,3 +79,4 @@
 ERROR 23000: Duplicate entry '2003-03-22' for key 1
 drop table t2;
 drop table t2;
+drop table t1;

--- 1.13/mysql-test/t/rpl_insert_id.test	2005-09-15 21:17:37 +02:00
+++ 1.14/mysql-test/t/rpl_insert_id.test	2006-01-26 17:54:28 +01:00
@@ -74,4 +74,7 @@
 INSERT INTO t1 VALUES (1),(1);
 sync_slave_with_master;
 
+connection master;
+drop table t1;
+sync_slave_with_master;
 # End of 4.1 tests

--- 1.21/mysql-test/t/rpl_loaddata.test	2005-09-15 21:17:37 +02:00
+++ 1.22/mysql-test/t/rpl_loaddata.test	2006-01-26 17:54:28 +01:00
@@ -149,5 +149,6 @@
 drop table t2;
 connection master;
 drop table t2;
-
+drop table t1;
+sync_with_master;
 # End of 4.1 tests

--- 1.4/mysql-test/t/variables-master.opt	2005-09-15 16:17:22 +02:00
+++ 1.7/mysql-test/t/variables-master.opt	2006-01-26 17:54:29 +01:00
@@ -1 +1 @@
---max_join_size=10
+--max_join_size=100

--- 1.4/mysql-test/r/analyze.result	2005-12-01 18:29:39 +01:00
+++ 1.5/mysql-test/r/analyze.result	2006-01-26 17:54:25 +01:00
@@ -46,3 +46,4 @@
 execute stmt1;
 Field_name	Min_value	Max_value	Min_length	Max_length	Empties_or_zeros	Nulls	Avg_value_or_avg_length	Std	Optimal_fieldtype
 deallocate prepare stmt1;
+drop table t1;

--- 1.7/mysql-test/t/analyze.test	2005-12-01 18:29:39 +01:00
+++ 1.8/mysql-test/t/analyze.test	2006-01-26 17:54:27 +01:00
@@ -61,5 +61,6 @@
 execute stmt1;
 execute stmt1;
 deallocate prepare stmt1;
+drop table t1;
 
 # End of 4.1 tests
--- New file ---
+++ mysql-test/include/check-testcase.test	06/01/26 17:54:29
#
# This test is executed twice for each test case if mysql-test-run is passed
# the flag --check-testcase.
# Before every testcase it's run with mysqltest in record mode and will
# thus produce an output file
# that can be compared to output from after the tescase.
# In that way it's possible to check that a testcase does not have
# any unwanted side affects.
#

#
# Dump all global variables
#
show global variables;

#
# Dump all databases
#
show databases;

#
# Dump the "test" database, all it's tables and their data
#
--exec $MYSQL_DUMP --skip-comments test

#
# Dump the "mysql" database and it's tables
# Select data separately to add "order by"
#
--exec $MYSQL_DUMP --skip-comments --no-data mysql
use mysql;
select * from columns_priv;
select * from db order by host, db, user;
select * from func;
select * from help_category;
select * from help_keyword;
select * from help_relation;
select * from help_relation;
select * from host;
select * from proc;
select * from procs_priv;
select * from tables_priv;
select * from time_zone;
select * from time_zone_leap_second;
select * from time_zone_name;
select * from time_zone_transition;
select * from time_zone_transition_type;
select * from user;





--- 1.22/mysql-test/r/sp-security.result	2005-10-17 17:08:51 +02:00
+++ 1.23/mysql-test/r/sp-security.result	2006-01-26 17:54:27 +01:00
@@ -134,7 +134,11 @@
 select type,db,name from mysql.proc;
 type	db	name
 delete from mysql.user where user='user1' or user='user2';
+delete from mysql.user where user='' and host='%';
 delete from mysql.procs_priv where user='user1' or user='user2';
+delete from mysql.procs_priv where user='' and host='%';
+delete from mysql.db where user='user2';
+flush privileges;
 grant usage on *.* to usera@localhost;
 grant usage on *.* to userb@localhost;
 grant usage on *.* to userc@localhost;
@@ -195,6 +199,9 @@
 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;
 drop function if exists bug_9503;
 create database mysqltest//
 use mysqltest//

--- 1.25/mysql-test/t/sp-security.test	2005-10-28 11:00:48 +02:00
+++ 1.26/mysql-test/t/sp-security.test	2006-01-26 17:54:28 +01:00
@@ -196,7 +196,6 @@
 call q();
 select * from t2;
 
-
 #
 # BUG#6030: Stored procedure has no appropriate DROP privilege
 # (or ALTER for that matter)
@@ -233,9 +232,13 @@
 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 @@
 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

--- 1.14/mysql-test/r/type_bit.result	2005-09-22 02:23:04 +02:00
+++ 1.15/mysql-test/r/type_bit.result	2006-01-26 17:54:27 +01:00
@@ -563,3 +563,4 @@
 0	0	0
 1	4	4
 2	2	2
+drop table t1, t2;

--- 1.13/mysql-test/t/type_bit.test	2005-09-22 02:23:04 +02:00
+++ 1.14/mysql-test/t/type_bit.test	2006-01-26 17:54:28 +01:00
@@ -226,3 +226,4 @@
 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;

--- 1.4/mysql-test/r/rpl_slave_status.result	2005-09-12 10:50:34 +02:00
+++ 1.5/mysql-test/r/rpl_slave_status.result	2006-01-26 17:54:27 +01:00
@@ -52,3 +52,4 @@
 Master_SSL_Cipher	
 Master_SSL_Key	
 Seconds_Behind_Master	NULL
+drop table t1;

--- 1.6/mysql-test/t/rpl_slave_status.test	2005-09-12 14:11:27 +02:00
+++ 1.7/mysql-test/t/rpl_slave_status.test	2006-01-26 17:54:28 +01:00
@@ -29,4 +29,8 @@
 --vertical_results
 show slave status;
 
+connection master;
+drop table t1;
+sync_with_master;
+
 # end of 4.1 tests

--- 1.30/mysql-test/r/rpl_replicate_do.result	2005-09-02 11:00:53 +02:00
+++ 1.31/mysql-test/r/rpl_replicate_do.result	2006-01-26 17:54:26 +01:00
@@ -40,3 +40,4 @@
 select * from t1;
 ts
 2005-08-12 00:00:00
+drop table t1;

--- 1.30/mysql-test/r/rpl000001.result	2005-12-14 18:42:00 +01:00
+++ 1.31/mysql-test/r/rpl000001.result	2006-01-26 17:54:26 +01:00
@@ -79,3 +79,4 @@
 select_priv	user
 Y	blafasel2
 drop table t1;
+delete from mysql.user where user="blafasel2";

--- 1.6/mysql-test/r/rpl000017.result	2002-10-25 01:46:13 +02:00
+++ 1.7/mysql-test/r/rpl000017.result	2006-01-26 17:54:26 +01:00
@@ -9,3 +9,4 @@
 n
 24
 drop table t1;
+delete from mysql.user where user="replicate";

--- 1.6/mysql-test/r/rpl_skip_error.result	2004-03-20 11:31:15 +01:00
+++ 1.7/mysql-test/r/rpl_skip_error.result	2006-01-26 17:54:27 +01:00
@@ -13,3 +13,4 @@
 1
 2
 3
+drop table t1;

--- 1.42/mysql-test/t/rpl000001.test	2005-12-14 18:42:01 +01:00
+++ 1.43/mysql-test/t/rpl000001.test	2006-01-26 17:54:28 +01:00
@@ -123,6 +123,7 @@
 select select_priv,user from mysql.user where user = _binary'blafasel2';
 connection master1;
 drop table t1;
+delete from mysql.user where user="blafasel2";
 save_master_pos;
 connection slave;
 sync_with_master;

--- 1.22/mysql-test/t/rpl_replicate_do.test	2005-09-02 10:53:25 +02:00
+++ 1.23/mysql-test/t/rpl_replicate_do.test	2006-01-26 17:54:28 +01:00
@@ -54,4 +54,8 @@
 set one_shot time_zone='met';
 select * from t1;
 
+connection master;
+drop table t1;
+sync_slave_with_master;
+
 # End of 4.1 tests

--- 1.13/mysql-test/t/rpl000017.test	2005-07-28 15:12:35 +02:00
+++ 1.14/mysql-test/t/rpl000017.test	2006-01-26 17:54:28 +01:00
@@ -16,6 +16,7 @@
 select * from t1;
 connection master;
 drop table t1;
+delete from mysql.user where user="replicate";
 sync_slave_with_master;
 
 # End of 4.1 tests

--- 1.6/mysql-test/t/rpl_skip_error.test	2005-09-15 16:17:20 +02:00
+++ 1.7/mysql-test/t/rpl_skip_error.test	2006-01-26 17:54:28 +01:00
@@ -13,4 +13,7 @@
 sync_with_master;
 select * from t1;
 
+connection master;
+drop table t1;
+sync_with_master;
 # End of 4.1 tests

--- 1.23/mysql-test/r/grant2.result	2005-12-28 14:43:44 +01:00
+++ 1.24/mysql-test/r/grant2.result	2006-01-26 17:54:26 +01:00
@@ -238,6 +238,7 @@
 create user 'mysqltest_2' identified by 'Mysqltest-2';
 drop user 'mysqltest_2' identified by 'Mysqltest-2';
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'identified by 'Mysqltest-2'' at line 1
+drop user 'mysqltest_2';
 create user '%@b'@'b';
 show grants for '%@b'@'b';
 Grants for %@b@b
@@ -279,6 +280,7 @@
 create user mysqltest_A@'%';
 rename user mysqltest_B@'%' to mysqltest_C@'%';
 drop user mysqltest_C@'%';
+drop user mysqltest_A@'%';
 drop user mysqltest_3@localhost;
 set @@sql_mode='';
 create database mysqltest_1;

--- 1.29/mysql-test/t/grant2.test	2005-12-28 14:43:44 +01:00
+++ 1.30/mysql-test/t/grant2.test	2006-01-26 17:54:27 +01:00
@@ -286,6 +286,7 @@
 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 @@
 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;

--- 1.4/mysql-test/t/fulltext_var.test	2005-07-28 02:21:41 +02:00
+++ 1.5/mysql-test/t/fulltext_var.test	2006-01-26 17:54:27 +01:00
@@ -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);
@@ -24,5 +27,10 @@
 -- error 1231
 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

--- 1.2/mysql-test/r/sp-prelocking.result	2005-08-03 05:37:27 +02:00
+++ 1.3/mysql-test/r/sp-prelocking.result	2006-01-26 17:54:27 +01:00
@@ -208,7 +208,8 @@
 f3()
 1
 call sp1() //
-drop table t1,t2,t3;
+drop view v1;
+drop table t1,t2,t3,t4;
 drop function f1;
 drop function f2;
 drop function f3;

--- 1.2/mysql-test/t/sp-prelocking.test	2005-08-03 05:37:27 +02:00
+++ 1.3/mysql-test/t/sp-prelocking.test	2006-01-26 17:54:28 +01:00
@@ -234,7 +234,8 @@
 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;

--- 1.6/mysql-test/r/ctype_cp932.result	2005-10-11 09:08:41 +02:00
+++ 1.7/mysql-test/r/ctype_cp932.result	2006-01-26 17:54:26 +01:00
@@ -11366,3 +11366,4 @@
 a
 a
 a
+drop table t1;

--- 1.8/mysql-test/t/ctype_cp932.test	2005-10-11 09:08:35 +02:00
+++ 1.9/mysql-test/t/ctype_cp932.test	2006-01-26 17:54:27 +01:00
@@ -434,3 +434,4 @@
 select * from t1;
 insert into t1 values ('abc');
 select * from t1;
+drop table t1;
Thread
bk commit into 5.0 tree (msvensson:1.2033)msvensson26 Jan