From e14d0f10c254012c445edd077252dd395e527f40 Mon Sep 17 00:00:00 2001
From: Sven Sandberg <sven@mysql.com>
Date: Wed, 16 Jul 2008 11:50:11 +0200
Subject: [PATCH] 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  | 10 ++++++++++
 mysql-test/t/mysqlbinlog_base64.test | 15 ---------------
 2 files changed, 10 insertions(+), 15 deletions(-)

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;
diff --git a/mysql-test/t/mysqlbinlog_base64.test b/mysql-test/t/mysqlbinlog_base64.test
index 2d8a111d2ea..71def6a733a 100644
--- a/mysql-test/t/mysqlbinlog_base64.test
+++ b/mysql-test/t/mysqlbinlog_base64.test
@@ -32,21 +32,6 @@ drop table t2;
 select * from t1;
 select * from t2;
 
-# DEBUG CODE ADDED BY SVEN. BUG#38127
-let $count_t1= `SELECT COUNT(*) FROM t1`;
-let $count_t2= `SELECT COUNT(*) FROM t2`;
-if (`SELECT $count_t1 != 3 OR $count_t2 != 70`)
-{
-  --echo Test case bug! See BUG#38127. Printing debug info.
-  --cat_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql
-  SHOW MASTER STATUS;
-  SHOW BINLOG EVENTS;
-  --exec $MYSQL_BINLOG $MYSQLD_DATADIR/master-bin.000001
-  SHOW TABLES;
-  exit;
-}
-# END DEBUG CODE
-
 #
 #  Verify that events larger than the default IO_CACHE buffer
 #  are handled correctly (BUG#25628).