bk commit into 5.1 tree (acurtis:1.2390)

[antony]

Below is the list of changes that have just been committed into a local
5.1 repository of antony. When antony 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.2390 06/05/12 11:49:35 acurtis@stripped +1 -0
  fix results after merge

  mysql-test/r/binlog_stm_blackhole.result
    1.11 06/05/12 11:49:30 acurtis@stripped +0 -2
    fix results after merge

# 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:	acurtis
# Host:	localhost.(none)
# Root:	/home/antony/work2/mysql-5.1-merge

--- 1.10/mysql-test/r/binlog_stm_blackhole.result	2006-05-12 08:50:27 -07:00
+++ 1.11/mysql-test/r/binlog_stm_blackhole.result	2006-05-12 11:49:30 -07:00
@@ -150,8 +150,6 @@ master-bin.000001	#	Query	1	#	use `test`
 master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(1)
 master-bin.000001	#	Query	1	#	use `test`; COMMIT
 drop table if exists t1;
-Warnings:
-Note	1051	Unknown table 't1'
 create table t1 (c char(20)) engine=MyISAM;
 insert into t1 values ("Monty"),("WAX"),("Walrus");
 alter table t1 engine=blackhole;