From 0642624946fb262601d58f90c12e3cbe5e1015bc Mon Sep 17 00:00:00 2001 From: Sven Sandberg Date: Wed, 16 Jul 2008 11:50:11 +0200 Subject: BUG#38127: main.mysqlbinlog_base64 fails sporadically on pushbuild Problem: mysqlbinlog_base64 fails because the binlog contains traces from previous test cases. Fix: Make have_log_bin reset the master's binlog. mysql-test/include/have_log_bin.inc: Made have_log_bin reset the master logs, so that no traces of earlier test cases are left. mysql-test/t/mysqlbinlog_base64.test: Removed debug info from previous push to this test. --- mysql-test/include/have_log_bin.inc | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'mysql-test/include/have_log_bin.inc') diff --git a/mysql-test/include/have_log_bin.inc b/mysql-test/include/have_log_bin.inc index 11530dc953e..13d31b70674 100644 --- a/mysql-test/include/have_log_bin.inc +++ b/mysql-test/include/have_log_bin.inc @@ -1,4 +1,14 @@ +# ==== Purpose ==== +# +# Ensure that the server is running with binlogging on and reset the +# binlog. +# +# ==== Usage ==== +# +# source include/have_log_bin.inc; + -- require r/have_log_bin.require disable_query_log; show variables like "log_bin"; +RESET MASTER; enable_query_log; -- cgit v1.2.1 From e948f38eae03fb938c43f9ecfafac96aaa7a8077 Mon Sep 17 00:00:00 2001 From: He Zhenxing Date: Mon, 28 Jul 2008 15:15:20 +0800 Subject: 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: remove reset master, which can cause some test to stall for slave_net_timeout and cause some test case fail mysql-test/r/mysqlbinlog_base64.result: update result mysql-test/t/mysqlbinlog_base64.test: Add reset master to make sure binlog is clean when the test case start --- mysql-test/include/have_log_bin.inc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'mysql-test/include/have_log_bin.inc') 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; -- cgit v1.2.1