bzr push into mysql-5.1 branch (hezx:2638 to 2639) Bug#37732

[He Zhenxing]

 2639 He Zhenxing	2008-07-28
      Rmove RESET MASTER from have_log_bin.inc because it can cause some
      test to stall for slave_net_timeout and cause some test case fail
modified:
  mysql-test/include/have_log_bin.inc
  mysql-test/r/mysqlbinlog_base64.result
  mysql-test/t/mysqlbinlog_base64.test

 2638 Serge Kozlov	2008-07-25
      Bug#37732
modified:
  mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result
  mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test

=== modified file 'mysql-test/include/have_log_bin.inc'
--- a/mysql-test/include/have_log_bin.inc	2008-07-16 09:50:11 +0000
+++ b/mysql-test/include/have_log_bin.inc	2008-07-28 07:15:20 +0000
@@ -1,7 +1,6 @@
 # ==== Purpose ====
 # 
-# Ensure that the server is running with binlogging on and reset the
-# binlog.
+# Ensure that the server is running with binlogging on
 #
 # ==== Usage ====
 #
@@ -10,5 +9,4 @@
 -- require r/have_log_bin.require
 disable_query_log;
 show variables like "log_bin";
-RESET MASTER;
 enable_query_log;

=== modified file 'mysql-test/r/mysqlbinlog_base64.result'
--- a/mysql-test/r/mysqlbinlog_base64.result	2007-12-12 17:19:24 +0000
+++ b/mysql-test/r/mysqlbinlog_base64.result	2008-07-28 07:15:20 +0000
@@ -1,3 +1,4 @@
+reset master;
 create table t1 (a int);
 insert into t1 values (1);
 insert into t1 values (2);

=== modified file 'mysql-test/t/mysqlbinlog_base64.test'
--- a/mysql-test/t/mysqlbinlog_base64.test	2008-07-16 09:50:11 +0000
+++ b/mysql-test/t/mysqlbinlog_base64.test	2008-07-28 07:15:20 +0000
@@ -1,5 +1,10 @@
 -- source include/have_binlog_format_row.inc
 #
+# Reset master to cleanup binlog
+#
+reset master;
+
+#
 #  Write different events to binlog
 #
 create table t1 (a int);