From 1a06250902f4456455d18357b3b4dbbebf324432 Mon Sep 17 00:00:00 2001 From: Mats Kindahl Date: Tue, 7 Oct 2008 10:25:12 +0200 Subject: [PATCH 1/2] Post-merge fixes. mysql-test/extra/rpl_tests/rpl_log.test: Removing extreneous start slave. Added missing drop of table t1. mysql-test/suite/rpl/t/rpl_binlog_query_filter_rules.test: Replaced $MYSQLTEST_VARDIR/log with $MYSQLD_DATADIR mysql-test/suite/rpl/t/rpl_misc_functions.test: Using temporary table instead to remove need for drop table. --- mysql-test/extra/rpl_tests/rpl_log.test | 8 ++------ mysql-test/suite/rpl/r/rpl_row_log.result | 2 +- mysql-test/suite/rpl/r/rpl_row_log_innodb.result | 2 +- mysql-test/suite/rpl/r/rpl_stm_log.result | 2 +- mysql-test/suite/rpl/t/rpl_binlog_query_filter_rules.test | 3 ++- mysql-test/suite/rpl/t/rpl_misc_functions.test | 2 +- 6 files changed, 8 insertions(+), 11 deletions(-) diff --git a/mysql-test/extra/rpl_tests/rpl_log.test b/mysql-test/extra/rpl_tests/rpl_log.test index a7e5de6b7c1..cff6951fdcd 100644 --- a/mysql-test/extra/rpl_tests/rpl_log.test +++ b/mysql-test/extra/rpl_tests/rpl_log.test @@ -70,11 +70,7 @@ eval create table t3 (a int)ENGINE=$engine_type; connection master; select * from t1 order by 1 asc; -save_master_pos; -connection slave; -source include/start_slave.inc; - -sync_with_master; +sync_slave_with_master; #check t1 on slave to ensure whether it's identical with on master select * from t1 order by 1 asc; flush logs; @@ -142,4 +138,4 @@ drop table t1; # End of 4.1 tests sync_slave_with_master; - +drop table t1; diff --git a/mysql-test/suite/rpl/r/rpl_row_log.result b/mysql-test/suite/rpl/r/rpl_row_log.result index d08444ce586..6c3811daa47 100644 --- a/mysql-test/suite/rpl/r/rpl_row_log.result +++ b/mysql-test/suite/rpl/r/rpl_row_log.result @@ -113,7 +113,6 @@ Aberdeen Abernathy aberrant aberration -include/start_slave.inc select * from t1 order by 1 asc; word Aarhus @@ -306,3 +305,4 @@ a b 5 1 6 1 drop table t1; +drop table t1; diff --git a/mysql-test/suite/rpl/r/rpl_row_log_innodb.result b/mysql-test/suite/rpl/r/rpl_row_log_innodb.result index 412f24602a8..7c2ffdba473 100644 --- a/mysql-test/suite/rpl/r/rpl_row_log_innodb.result +++ b/mysql-test/suite/rpl/r/rpl_row_log_innodb.result @@ -113,7 +113,6 @@ Aberdeen Abernathy aberrant aberration -include/start_slave.inc select * from t1 order by 1 asc; word Aarhus @@ -306,3 +305,4 @@ a b 5 1 6 1 drop table t1; +drop table t1; diff --git a/mysql-test/suite/rpl/r/rpl_stm_log.result b/mysql-test/suite/rpl/r/rpl_stm_log.result index 7c0f5547470..d8528ff1c44 100644 --- a/mysql-test/suite/rpl/r/rpl_stm_log.result +++ b/mysql-test/suite/rpl/r/rpl_stm_log.result @@ -109,7 +109,6 @@ Aberdeen Abernathy aberrant aberration -include/start_slave.inc select * from t1 order by 1 asc; word Aarhus @@ -287,3 +286,4 @@ a b 5 1 6 1 drop table t1; +drop table t1; diff --git a/mysql-test/suite/rpl/t/rpl_binlog_query_filter_rules.test b/mysql-test/suite/rpl/t/rpl_binlog_query_filter_rules.test index d8e25b244fa..d56a32ce2bd 100644 --- a/mysql-test/suite/rpl/t/rpl_binlog_query_filter_rules.test +++ b/mysql-test/suite/rpl/t/rpl_binlog_query_filter_rules.test @@ -16,8 +16,9 @@ reset master; create table t1 (a int); insert into t1 values (1); +let $MYSQLD_DATADIR= `select @@datadir`; flush logs; ---exec $MYSQL_BINLOG $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/bug36099.sql +--exec $MYSQL_BINLOG $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/bug36099.sql drop table t1; --exec $MYSQL -e "source $MYSQLTEST_VARDIR/tmp/bug36099.sql" diff --git a/mysql-test/suite/rpl/t/rpl_misc_functions.test b/mysql-test/suite/rpl/t/rpl_misc_functions.test index 873c54b679b..d2e61d579e3 100644 --- a/mysql-test/suite/rpl/t/rpl_misc_functions.test +++ b/mysql-test/suite/rpl/t/rpl_misc_functions.test @@ -23,7 +23,7 @@ insert into t1 values(4, connection_id(), rand()*1000, rand()*1000, password('do select * into outfile 'rpl_misc_functions.outfile' from t1; let $MYSQLD_DATADIR= `select @@datadir`; sync_slave_with_master; -create table t2 like t1; +create temporary table t2 like t1; # read the values from the master table --replace_result $MYSQLD_DATADIR MYSQLD_DATADIR eval load data local infile '$MYSQLD_DATADIR/test/rpl_misc_functions.outfile' into table t2; From 6d120d9818f2ae280c63a851862171745e79c2c0 Mon Sep 17 00:00:00 2001 From: Mats Kindahl Date: Tue, 7 Oct 2008 14:22:28 +0200 Subject: [PATCH 2/2] Fixing some missing table drops. mysql-test/suite/rpl/r/rpl_misc_functions.result: Using temporary table to avoid leaving a table after test. mysql-test/suite/rpl/t/rpl_ps.test: Adding drop of table t1. --- mysql-test/suite/rpl/r/rpl_misc_functions.result | 2 +- mysql-test/suite/rpl/t/rpl_ps.test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/suite/rpl/r/rpl_misc_functions.result b/mysql-test/suite/rpl/r/rpl_misc_functions.result index 8025387b43e..28b777822e4 100644 --- a/mysql-test/suite/rpl/r/rpl_misc_functions.result +++ b/mysql-test/suite/rpl/r/rpl_misc_functions.result @@ -14,7 +14,7 @@ set sql_log_bin=1; insert into t1 values(3, 0, 0, 0, password('does_this_work?')); insert into t1 values(4, connection_id(), rand()*1000, rand()*1000, password('does_this_still_work?')); select * into outfile 'rpl_misc_functions.outfile' from t1; -create table t2 like t1; +create temporary table t2 like t1; load data local infile 'MYSQLD_DATADIR/test/rpl_misc_functions.outfile' into table t2; 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 diff --git a/mysql-test/suite/rpl/t/rpl_ps.test b/mysql-test/suite/rpl/t/rpl_ps.test index 27f1ac3348d..b00dec6b80c 100644 --- a/mysql-test/suite/rpl/t/rpl_ps.test +++ b/mysql-test/suite/rpl/t/rpl_ps.test @@ -123,7 +123,7 @@ DROP DATABASE mysqltest1; --echo use test; - +DROP TABLE t1; --echo --save_master_pos