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.2010 06/01/27 10:49:07 msvensson@neptunus.(none) +21 -0
Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my50-mysqltestrun_check_testcases
into neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration
mysql-test/r/trigger-compat.result
1.3 06/01/27 10:49:04 msvensson@neptunus.(none) +2 -2
Merge
mysql-test/t/trigger-compat.test
1.4 06/01/27 10:47:56 msvensson@neptunus.(none) +0 -0
Auto merged
mysql-test/t/sp-security.test
1.27 06/01/27 10:47:56 msvensson@neptunus.(none) +0 -0
Auto merged
mysql-test/t/rpl_replicate_do.test
1.24 06/01/27 10:47:56 msvensson@neptunus.(none) +0 -0
Auto merged
mysql-test/t/rpl_misc_functions.test
1.5 06/01/27 10:47:56 msvensson@neptunus.(none) +0 -0
Auto merged
mysql-test/t/rpl_loaddata_rule_s.test
1.11 06/01/27 10:47:56 msvensson@neptunus.(none) +0 -0
Auto merged
mysql-test/t/rpl_loaddata_rule_m.test
1.14 06/01/27 10:47:56 msvensson@neptunus.(none) +0 -0
Auto merged
mysql-test/t/rpl_loaddata.test
1.23 06/01/27 10:47:56 msvensson@neptunus.(none) +0 -0
Auto merged
mysql-test/t/rpl000001.test
1.44 06/01/27 10:47:56 msvensson@neptunus.(none) +0 -0
Auto merged
mysql-test/t/query_cache.test
1.53 06/01/27 10:47:56 msvensson@neptunus.(none) +0 -1
Auto merged
mysql-test/r/view_grant.result
1.10 06/01/27 10:47:56 msvensson@neptunus.(none) +0 -0
Auto merged
mysql-test/r/variables.result
1.78 06/01/27 10:47:56 msvensson@neptunus.(none) +0 -0
Auto merged
mysql-test/r/sp-security.result
1.24 06/01/27 10:47:56 msvensson@neptunus.(none) +0 -0
Auto merged
mysql-test/r/rpl_replicate_do.result
1.32 06/01/27 10:47:56 msvensson@neptunus.(none) +0 -0
Auto merged
mysql-test/r/rpl_misc_functions.result
1.4 06/01/27 10:47:56 msvensson@neptunus.(none) +0 -0
Auto merged
mysql-test/r/rpl_loaddata_rule_s.result
1.9 06/01/27 10:47:56 msvensson@neptunus.(none) +0 -0
Auto merged
mysql-test/r/rpl_loaddata_rule_m.result
1.15 06/01/27 10:47:56 msvensson@neptunus.(none) +0 -0
Auto merged
mysql-test/r/rpl_loaddata.result
1.30 06/01/27 10:47:56 msvensson@neptunus.(none) +0 -0
Auto merged
mysql-test/r/rpl000001.result
1.32 06/01/27 10:47:56 msvensson@neptunus.(none) +0 -0
Auto merged
mysql-test/r/query_cache.result
1.70 06/01/27 10:47:56 msvensson@neptunus.(none) +0 -1
Auto merged
mysql-test/mysql-test-run.pl
1.63 06/01/27 10:47:56 msvensson@neptunus.(none) +0 -0
Auto merged
# 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/mysqltest_var/my50-mysqltest_var-integration/RESYNC
--- 1.2/mysql-test/r/trigger-compat.result 2006-01-12 01:02:48 +01:00
+++ 1.3/mysql-test/r/trigger-compat.result 2006-01-27 10:49:04 +01:00
@@ -36,3 +36,13 @@
TRIGGER_CATALOG TRIGGER_SCHEMA TRIGGER_NAME EVENT_MANIPULATION EVENT_OBJECT_CATALOG EVENT_OBJECT_SCHEMA EVENT_OBJECT_TABLE ACTION_ORDER ACTION_CONDITION ACTION_STATEMENT ACTION_ORIENTATION ACTION_TIMING ACTION_REFERENCE_OLD_TABLE ACTION_REFERENCE_NEW_TABLE ACTION_REFERENCE_OLD_ROW ACTION_REFERENCE_NEW_ROW CREATED SQL_MODE DEFINER
NULL mysqltest_db1 wl2818_trg1 INSERT NULL mysqltest_db1 t1 0 NULL 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.3/mysql-test/t/trigger-compat.test 2006-01-24 08:43:30 +01:00
+++ 1.4/mysql-test/t/trigger-compat.test 2006-01-27 10:47:56 +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.14/mysql-test/r/rpl_loaddata_rule_m.result 2006-01-24 08:30:46 +01:00
+++ 1.15/mysql-test/r/rpl_loaddata_rule_m.result 2006-01-27 10:47:56 +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_ln/rpl_loaddata.dat' into table test.t1 ;file_id=1
drop database mysqltest;
+use test;
+drop table t1;
--- 1.8/mysql-test/r/rpl_loaddata_rule_s.result 2006-01-24 08:30:46 +01:00
+++ 1.9/mysql-test/r/rpl_loaddata_rule_s.result 2006-01-27 10:47:56 +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.3/mysql-test/r/rpl_misc_functions.result 2006-01-24 08:30:46 +01:00
+++ 1.4/mysql-test/r/rpl_misc_functions.result 2006-01-27 10:47:56 +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.13/mysql-test/t/rpl_loaddata_rule_m.test 2006-01-24 08:30:48 +01:00
+++ 1.14/mysql-test/t/rpl_loaddata_rule_m.test 2006-01-27 10:47:56 +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.10/mysql-test/t/rpl_loaddata_rule_s.test 2006-01-24 08:30:48 +01:00
+++ 1.11/mysql-test/t/rpl_loaddata_rule_s.test 2006-01-27 10:47:56 +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.4/mysql-test/t/rpl_misc_functions.test 2006-01-24 08:30:49 +01:00
+++ 1.5/mysql-test/t/rpl_misc_functions.test 2006-01-27 10:47:56 +01:00
@@ -29,5 +29,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.9/mysql-test/r/view_grant.result 2006-01-17 19:10:41 +01:00
+++ 1.10/mysql-test/r/view_grant.result 2006-01-27 10:47:56 +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.62/mysql-test/mysql-test-run.pl 2006-01-24 08:43:30 +01:00
+++ 1.63/mysql-test/mysql-test-run.pl 2006-01-27 10:47:56 +01:00
@@ -239,6 +239,7 @@
our $opt_old_master;
our $opt_record;
+our $opt_check_testcases;
our $opt_result_ext;
@@ -542,6 +543,7 @@
# Test case authoring
'record' => \$opt_record,
+ 'check-testcases' => \$opt_check_testcases,
# ???
'mysqld=s' => \@opt_extra_mysqld_opt,
@@ -2541,6 +2543,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;
@@ -2770,7 +2820,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;
}
@@ -2852,6 +2913,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.77/mysql-test/r/variables.result 2006-01-17 19:10:41 +01:00
+++ 1.78/mysql-test/r/variables.result 2006-01-27 10:47:56 +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.29/mysql-test/r/rpl_loaddata.result 2006-01-24 08:30:46 +01:00
+++ 1.30/mysql-test/r/rpl_loaddata.result 2006-01-27 10:47:56 +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.22/mysql-test/t/rpl_loaddata.test 2006-01-24 08:30:48 +01:00
+++ 1.23/mysql-test/t/rpl_loaddata.test 2006-01-27 10:47:56 +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.23/mysql-test/r/sp-security.result 2005-12-15 15:23:09 +01:00
+++ 1.24/mysql-test/r/sp-security.result 2006-01-27 10:47:56 +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.26/mysql-test/t/sp-security.test 2005-12-15 15:23:09 +01:00
+++ 1.27/mysql-test/t/sp-security.test 2006-01-27 10:47:56 +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.31/mysql-test/r/rpl_replicate_do.result 2006-01-24 08:30:47 +01:00
+++ 1.32/mysql-test/r/rpl_replicate_do.result 2006-01-27 10:47:56 +01:00
@@ -40,3 +40,4 @@
select * from t1;
ts
2005-08-12 00:00:00
+drop table t1;
--- 1.31/mysql-test/r/rpl000001.result 2006-01-24 08:36:39 +01:00
+++ 1.32/mysql-test/r/rpl000001.result 2006-01-27 10:47:56 +01:00
@@ -79,3 +79,4 @@
select_priv user
Y blafasel2
drop table t1;
+delete from mysql.user where user="blafasel2";
--- 1.43/mysql-test/t/rpl000001.test 2006-01-24 08:36:39 +01:00
+++ 1.44/mysql-test/t/rpl000001.test 2006-01-27 10:47:56 +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.23/mysql-test/t/rpl_replicate_do.test 2006-01-24 08:30:49 +01:00
+++ 1.24/mysql-test/t/rpl_replicate_do.test 2006-01-27 10:47:56 +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
| Thread |
|---|
| • bk commit into 5.0 tree (msvensson:1.2010) | msvensson | 27 Jan |
