bzr push into mysql-5.1-rep+3 branch (Li-Bing.Song:3150 to 3151)

[Li-Bing.Song]

 3151 Li-Bing.Song@stripped	2010-06-30 [merge]
      Auto merge

    modified:
      mysql-test/extra/binlog_tests/database.test
      mysql-test/suite/binlog/r/binlog_database.result
 3150 Li-Bing.Song@stripped	2010-06-29 [merge]
      Manual merge

    removed:
      mysql-test/include/show_slave_hosts.inc
    added:
      mysql-test/include/show_slave_hosts.inc
      mysql-test/r/server_uuid.result
      mysql-test/suite/rpl/r/rpl_server_uuid.result
      mysql-test/suite/rpl/t/rpl_server_uuid.cnf
      mysql-test/suite/rpl/t/rpl_server_uuid.test
      mysql-test/t/server_uuid.test
    modified:
      mysql-test/extra/binlog_tests/database.test
      mysql-test/include/mtr_warnings.sql
      mysql-test/mysql-test-run.pl
      mysql-test/suite/binlog/r/binlog_database.result
      mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result
      mysql-test/suite/rpl/r/rpl_show_slave_hosts.result
      mysql-test/suite/rpl/t/rpl_mixed_ddl_dml.test
      mysql-test/suite/rpl/t/rpl_show_slave_hosts.test
      mysys/default.c
      sql/mysql_priv.h
      sql/mysqld.cc
      sql/repl_failsafe.cc
      sql/rpl_mi.cc
      sql/rpl_mi.h
      sql/set_var.cc
      sql/slave.cc
      sql/slave.h
      sql/sql_db.cc
      sql/sql_parse.cc
      sql/sql_repl.cc
      sql/sql_repl.h
=== modified file 'mysql-test/extra/binlog_tests/database.test'
--- a/mysql-test/extra/binlog_tests/database.test	2010-06-27 06:35:09 +0000
+++ b/mysql-test/extra/binlog_tests/database.test	2010-06-30 07:12:50 +0000
@@ -49,9 +49,14 @@ eval SELECT 'hello' INTO OUTFILE 'fake_f
 --echo
 --echo # 'DROP DATABASE' will fail if there is any other file in the the
 --echo # database directory
+
+# Use '/' instead of '\' in the error message. On windows platform, dir is
+# formed with '\'.
+--replace_regex /\\testing_1\\*/\/testing_1\//
 --error 1010
 DROP DATABASE testing_1;
-source include/show_binlog_events.inc;
+let $wait_binlog_event= DROP TABLE IF EXIST;
+source include/wait_for_binlog_event.inc;
 let $MYSQLD_DATADIR= `SELECT @@datadir`;
 
 --echo

=== modified file 'mysql-test/suite/binlog/r/binlog_database.result'
--- a/mysql-test/suite/binlog/r/binlog_database.result	2010-06-27 06:35:09 +0000
+++ b/mysql-test/suite/binlog/r/binlog_database.result	2010-06-30 07:12:50 +0000
@@ -54,12 +54,6 @@ SELECT 'hello' INTO OUTFILE 'fake_file.F
 # database directory
 DROP DATABASE testing_1;
 ERROR HY000: Error dropping database (can't rmdir './testing_1/', errno: 17)
-show binlog events from <binlog_start>;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	#	#	CREATE DATABASE testing_1
-master-bin.000001	#	Query	#	#	use `testing_1`; CREATE TABLE t1(c1 INT)
-master-bin.000001	#	Query	#	#	use `testing_1`; CREATE TABLE t2(c1 INT)
-master-bin.000001	#	Query	#	#	use `testing_1`; DROP TABLE IF EXISTS `t2`,`t1`
 
 # Remove the fake file.
 # Now we can drop the database.
@@ -120,12 +114,6 @@ SELECT 'hello' INTO OUTFILE 'fake_file.F
 # database directory
 DROP DATABASE testing_1;
 ERROR HY000: Error dropping database (can't rmdir './testing_1/', errno: 17)
-show binlog events from <binlog_start>;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	#	#	CREATE DATABASE testing_1
-master-bin.000001	#	Query	#	#	use `testing_1`; CREATE TABLE t1(c1 INT)
-master-bin.000001	#	Query	#	#	use `testing_1`; CREATE TABLE t2(c1 INT)
-master-bin.000001	#	Query	#	#	use `testing_1`; DROP TABLE IF EXISTS `t2`,`t1`
 
 # Remove the fake file.
 # Now we can drop the database.
@@ -187,12 +175,6 @@ SELECT 'hello' INTO OUTFILE 'fake_file.F
 # database directory
 DROP DATABASE testing_1;
 ERROR HY000: Error dropping database (can't rmdir './testing_1/', errno: 17)
-show binlog events from <binlog_start>;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	#	#	CREATE DATABASE testing_1
-master-bin.000001	#	Query	#	#	use `testing_1`; CREATE TABLE t1(c1 INT)
-master-bin.000001	#	Query	#	#	use `testing_1`; CREATE TABLE t2(c1 INT)
-master-bin.000001	#	Query	#	#	use `testing_1`; DROP TABLE IF EXISTS `t2`,`t1`
 
 # Remove the fake file.
 # Now we can drop the database.


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