bzr push into mysql-5.1 branch (sven:2628 to 2629) Bug#37733, Bug#38127

[Sven Sandberg]

 2629 Sven Sandberg	2008-07-15
      BUG#38127: main.mysqlbinlog_base64 fails sporadically on pushbuild
      This is not a fix to the bug. I'm just pushing a change to the
      test case that will produce debug info when the test fails next
      time.
modified:
  mysql-test/t/mysqlbinlog_base64.test

 2628 Sven Sandberg	2008-07-15
      BUG#37733: rpl.rpl_flushlog_loop 'row' fails sporadically on pushbuild
      Post-push fix. The previous patch did 'reset master' at the wrong place.
modified:
  mysql-test/include/master-slave-reset.inc

=== modified file 'mysql-test/t/mysqlbinlog_base64.test'
--- a/mysql-test/t/mysqlbinlog_base64.test	2008-01-08 10:02:42 +0000
+++ b/mysql-test/t/mysqlbinlog_base64.test	2008-07-15 16:05:39 +0000
@@ -32,6 +32,21 @@ 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).