bzr commit into mysql-5.1-rep+2 branch (zhenxing.he:3124)

[He Zhenxing]

#At file:///media/sdb2/hezx/work/mysql/bzrwork/backport/5.1-rep%2B2/ based on revid:zhenxing.he@stripped

 3124 He Zhenxing	2009-10-02
      Backport fixes for the follow tests
      
      binlog_tmp_table
      rpl_row_sp006_InnoDB
      rpl_slave_status

    M  mysql-test/extra/rpl_tests/rpl_row_sp006.test
    M  mysql-test/suite/binlog/r/binlog_tmp_table.result
    M  mysql-test/suite/binlog/t/binlog_tmp_table.test
    M  mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result
    M  mysql-test/suite/rpl/t/rpl_slave_status.test
=== modified file 'mysql-test/extra/rpl_tests/rpl_row_sp006.test'
--- a/mysql-test/extra/rpl_tests/rpl_row_sp006.test	2007-06-18 13:36:10 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_row_sp006.test	2009-10-02 09:24:21 +0000
@@ -11,7 +11,8 @@
 # Begin clean up test section
 connection master;
 --disable_warnings
-create database if not exists mysqltest1;
+drop database if exists mysqltest1;
+create database mysqltest1;
 DROP PROCEDURE IF EXISTS mysqltest1.p1;
 DROP PROCEDURE IF EXISTS mysqltest1.p2;
 DROP TABLE IF EXISTS mysqltest1.t2;

=== modified file 'mysql-test/suite/binlog/r/binlog_tmp_table.result'
--- a/mysql-test/suite/binlog/r/binlog_tmp_table.result	2009-01-28 14:35:12 +0000
+++ b/mysql-test/suite/binlog/r/binlog_tmp_table.result	2009-10-02 09:24:21 +0000
@@ -1,3 +1,4 @@
+reset master;
 create table foo (a int);
 flush logs;
 create temporary table tmp1_foo like foo;

=== modified file 'mysql-test/suite/binlog/t/binlog_tmp_table.test'
--- a/mysql-test/suite/binlog/t/binlog_tmp_table.test	2009-01-31 21:47:50 +0000
+++ b/mysql-test/suite/binlog/t/binlog_tmp_table.test	2009-10-02 09:24:21 +0000
@@ -31,6 +31,8 @@ source include/have_binlog_format_mixed_
 connect (master,127.0.0.1,root,,test,$MASTER_MYPORT,);
 connect (master1,127.0.0.1,root,,test,$MASTER_MYPORT,);
 
+reset master;
+
 create table foo (a int);
 
 flush logs;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result'
--- a/mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result	2009-10-02 09:24:21 +0000
@@ -4,7 +4,8 @@ reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
-create database if not exists mysqltest1;
+drop database if exists mysqltest1;
+create database mysqltest1;
 DROP PROCEDURE IF EXISTS mysqltest1.p1;
 DROP PROCEDURE IF EXISTS mysqltest1.p2;
 DROP TABLE IF EXISTS mysqltest1.t2;

=== modified file 'mysql-test/suite/rpl/t/rpl_slave_status.test'
--- a/mysql-test/suite/rpl/t/rpl_slave_status.test	2008-10-06 08:27:36 +0000
+++ b/mysql-test/suite/rpl/t/rpl_slave_status.test	2009-10-02 09:24:21 +0000
@@ -54,6 +54,7 @@ sync_slave_with_master;
 source include/stop_slave.inc;
 START SLAVE;
 source include/wait_for_slave_sql_to_start.inc;
+source include/wait_for_slave_io_to_stop.inc;
 
 --echo ==== Verify that Slave_IO_Running = No ====
 let $result= query_get_value("SHOW SLAVE STATUS", Slave_IO_Running, 1);


Attachment: [text/bzr-bundle] bzr/[e-mail]