List:Commits« Previous MessageNext Message »
From:Sven Sandberg Date:July 16 2008 9:50am
Subject:bzr commit into mysql-5.1 branch (sven:2630) Bug#38127
View as plain text  
#At file:///home/sven/bzr/b38127-mysqlbinlog_base64/5.1-rpl/

 2630 Sven Sandberg	2008-07-16
      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.
modified:
  mysql-test/include/have_log_bin.inc
  mysql-test/t/mysqlbinlog_base64.test

per-file messages:
  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.
=== modified file 'mysql-test/include/have_log_bin.inc'
--- a/mysql-test/include/have_log_bin.inc	2007-05-14 12:38:50 +0000
+++ b/mysql-test/include/have_log_bin.inc	2008-07-16 09:50:11 +0000
@@ -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;

=== modified file 'mysql-test/t/mysqlbinlog_base64.test'
--- a/mysql-test/t/mysqlbinlog_base64.test	2008-07-15 16:05:39 +0000
+++ b/mysql-test/t/mysqlbinlog_base64.test	2008-07-16 09:50:11 +0000
@@ -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).

Thread
bzr commit into mysql-5.1 branch (sven:2630) Bug#38127Sven Sandberg16 Jul
  • Re: bzr commit into mysql-5.1 branch (sven:2630) Bug#38127He Zhenxing28 Jul