bzr push into mysql-5.1 branch (mats:2669 to 2671)

[Mats Kindahl]

 2671 Mats Kindahl	2008-10-07
      Fixing some missing table drops.
modified:
  mysql-test/suite/rpl/r/rpl_misc_functions.result
  mysql-test/suite/rpl/t/rpl_ps.test

 2670 Mats Kindahl	2008-10-07
      Post-merge fixes.
modified:
  mysql-test/extra/rpl_tests/rpl_log.test
  mysql-test/suite/rpl/r/rpl_row_log.result
  mysql-test/suite/rpl/r/rpl_row_log_innodb.result
  mysql-test/suite/rpl/r/rpl_stm_log.result
  mysql-test/suite/rpl/t/rpl_binlog_query_filter_rules.test
  mysql-test/suite/rpl/t/rpl_misc_functions.test

 2669 Mats Kindahl	2008-10-06 [merge]
      Merging in 5.1-rpl

=== modified file 'mysql-test/extra/rpl_tests/rpl_log.test'
--- a/mysql-test/extra/rpl_tests/rpl_log.test	2008-10-06 08:27:36 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_log.test	2008-10-07 08:25:12 +0000
@@ -70,11 +70,7 @@ eval create table t3 (a int)ENGINE=$engi
 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;

=== modified file 'mysql-test/suite/rpl/r/rpl_misc_functions.result'
--- a/mysql-test/suite/rpl/r/rpl_misc_functions.result	2007-12-12 17:19:24 +0000
+++ b/mysql-test/suite/rpl/r/rpl_misc_functions.result	2008-10-07 12:22:28 +0000
@@ -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

=== modified file 'mysql-test/suite/rpl/r/rpl_row_log.result'
--- a/mysql-test/suite/rpl/r/rpl_row_log.result	2008-10-06 08:27:36 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_log.result	2008-10-07 08:25:12 +0000
@@ -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;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_log_innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_row_log_innodb.result	2008-10-06 08:27:36 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_log_innodb.result	2008-10-07 08:25:12 +0000
@@ -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;

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_log.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_log.result	2008-10-06 08:27:36 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_log.result	2008-10-07 08:25:12 +0000
@@ -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;

=== modified file 'mysql-test/suite/rpl/t/rpl_binlog_query_filter_rules.test'
--- a/mysql-test/suite/rpl/t/rpl_binlog_query_filter_rules.test	2008-09-03 10:01:18 +0000
+++ b/mysql-test/suite/rpl/t/rpl_binlog_query_filter_rules.test	2008-10-07 08:25:12 +0000
@@ -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"

=== modified file 'mysql-test/suite/rpl/t/rpl_misc_functions.test'
--- a/mysql-test/suite/rpl/t/rpl_misc_functions.test	2007-12-12 17:19:24 +0000
+++ b/mysql-test/suite/rpl/t/rpl_misc_functions.test	2008-10-07 08:25:12 +0000
@@ -23,7 +23,7 @@ insert into t1 values(4, connection_id()
 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;

=== modified file 'mysql-test/suite/rpl/t/rpl_ps.test'
--- a/mysql-test/suite/rpl/t/rpl_ps.test	2007-09-03 11:13:34 +0000
+++ b/mysql-test/suite/rpl/t/rpl_ps.test	2008-10-07 12:22:28 +0000
@@ -123,7 +123,7 @@ DROP DATABASE mysqltest1;
 
 --echo
 use test;
-
+DROP TABLE t1;
 --echo
 --save_master_pos