bzr commit into mysql-5.1 branch (hezx:2699)

[He Zhenxing]

#At file:///media/sda3/work/mysql/bzrwork/merge/5.1-rpl/

 2699 He Zhenxing	2008-09-27
      Post fixes after merge 5.1 main -> 5.1-rpl
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

=== modified file 'mysql-test/extra/rpl_tests/rpl_log.test'
--- a/mysql-test/extra/rpl_tests/rpl_log.test	2008-09-26 12:27:21 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_log.test	2008-09-27 10:13:42 +0000
@@ -13,8 +13,6 @@ sync_slave_with_master;
 source include/stop_slave.inc;
 reset master;
 reset slave;
-start slave;
---source include/wait_for_slave_to_start.inc
 
 let $VERSION=`select version()`;
 

=== modified file 'mysql-test/suite/rpl/r/rpl_row_log.result'
--- a/mysql-test/suite/rpl/r/rpl_row_log.result	2008-09-26 12:27:21 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_log.result	2008-09-27 10:13:42 +0000
@@ -7,7 +7,6 @@ start slave;
 include/stop_slave.inc
 reset master;
 reset slave;
-start slave;
 create table t1(n int not null auto_increment primary key)ENGINE=MyISAM;
 insert into t1 values (NULL);
 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-09-26 12:27:21 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_log_innodb.result	2008-09-27 10:13:42 +0000
@@ -7,7 +7,6 @@ start slave;
 include/stop_slave.inc
 reset master;
 reset slave;
-start slave;
 create table t1(n int not null auto_increment primary key)ENGINE=InnoDB;
 insert into t1 values (NULL);
 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-09-26 12:27:21 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_log.result	2008-09-27 10:13:42 +0000
@@ -7,7 +7,6 @@ start slave;
 include/stop_slave.inc
 reset master;
 reset slave;
-start slave;
 create table t1(n int not null auto_increment primary key)ENGINE=MyISAM;
 insert into t1 values (NULL);
 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-09-27 10:13:42 +0000
@@ -7,6 +7,8 @@
 -- source include/not_embedded.inc
 -- source include/have_binlog_format_row.inc
 
+let MYSQLD_DATADIR=`select @@datadir`;
+
 --disable_warnings
 drop table if exists t1;
 --enable_warnings
@@ -17,7 +19,7 @@ create table t1 (a int);
 insert into t1 values (1);
 
 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"