bk commit into 5.1 tree (acurtis:1.2394)

[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.2394 06/05/13 01:09:00 acurtis@stripped +1 -0
  fix binlog results

  mysql-test/r/binlog_row_blackhole.result
    1.5 06/05/13 01:08:51 acurtis@stripped +6 -0
    fix binlog results

# 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-fixpartition

--- 1.4/mysql-test/r/binlog_row_blackhole.result	2006-02-24 07:19:47 -08:00
+++ 1.5/mysql-test/r/binlog_row_blackhole.result	2006-05-13 01:08:51 -07:00
@@ -156,3 +156,9 @@ master-bin.000001	#	Query	1	#	use `test`
 master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	1	#	use `test`; COMMIT
+drop table if exists t1;
+create table t1 (c char(20)) engine=MyISAM;
+insert into t1 values ("Monty"),("WAX"),("Walrus");
+alter table t1 engine=blackhole;
+ERROR HY000: Table storage engine for 't1' doesn't have this option
+drop table t1;