From b1252a7ccf6af29a26f5c341a6ad6d1baaf965a2 Mon Sep 17 00:00:00 2001 From: He Zhenxing Date: Mon, 28 Jul 2008 15:15:20 +0800 Subject: [PATCH] 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 --- mysql-test/include/have_log_bin.inc | 4 +--- mysql-test/r/mysqlbinlog_base64.result | 1 + mysql-test/t/mysqlbinlog_base64.test | 5 +++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/mysql-test/include/have_log_bin.inc b/mysql-test/include/have_log_bin.inc index 13d31b70674..1c65f9352d8 100644 --- a/mysql-test/include/have_log_bin.inc +++ b/mysql-test/include/have_log_bin.inc @@ -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; diff --git a/mysql-test/r/mysqlbinlog_base64.result b/mysql-test/r/mysqlbinlog_base64.result index 436b165cfa3..c5e1e2f8ca1 100644 --- a/mysql-test/r/mysqlbinlog_base64.result +++ b/mysql-test/r/mysqlbinlog_base64.result @@ -1,3 +1,4 @@ +reset master; create table t1 (a int); insert into t1 values (1); insert into t1 values (2); diff --git a/mysql-test/t/mysqlbinlog_base64.test b/mysql-test/t/mysqlbinlog_base64.test index 71def6a733a..fb21e28fdcb 100644 --- a/mysql-test/t/mysqlbinlog_base64.test +++ b/mysql-test/t/mysqlbinlog_base64.test @@ -1,4 +1,9 @@ -- source include/have_binlog_format_row.inc +# +# Reset master to cleanup binlog +# +reset master; + # # Write different events to binlog #