bk commit into 5.1 tree (tomas:1.1876)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1876 05/08/16 13:04:31 tomas@stripped +1 -0
  blackhole.test:
    disabled test for rowbased replication because of usage of show binlog events

  mysql-test/t/blackhole.test
    1.5 05/08/16 13:03:32 tomas@stripped +2 -0
    disabled test for rowbased replication because of usage of show binlog events

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-wl1012

--- 1.4/mysql-test/t/blackhole.test	2005-07-28 02:21:39 +02:00
+++ 1.5/mysql-test/t/blackhole.test	2005-08-16 13:03:32 +02:00
@@ -3,6 +3,8 @@
 # Taken from the select test
 #
 -- source include/have_blackhole.inc
+# result file differs because of a show binlog events
+-- source include/have_binlog_format_statement.inc
 
 --disable_warnings
 drop table if exists t1,t2;