bk commit into 5.1 tree (ingo:1.2268)

[ingo]

Below is the list of changes that have just been committed into a local
5.1 repository of mydev. When mydev 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@stripped, 2006-07-24 13:34:30+02:00, ingo@stripped +3 -0
  After merge fix

  mysql-test/extra/binlog_tests/blackhole.test@stripped, 2006-07-24 13:34:26+02:00, ingo@stripped +1 -0
    After merge fix

  mysql-test/r/binlog_row_blackhole.result@stripped, 2006-07-24 13:34:26+02:00, ingo@stripped +0 -5
    After merge fix

  mysql-test/r/binlog_stm_blackhole.result@stripped, 2006-07-24 13:34:26+02:00, ingo@stripped +0 -5
    After merge fix

# 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:	ingo
# Host:	chilla.local
# Root:	/home/mydev/mysql-5.1-amerge

--- 1.15/mysql-test/r/binlog_stm_blackhole.result	2006-07-24 13:34:39 +02:00
+++ 1.16/mysql-test/r/binlog_stm_blackhole.result	2006-07-24 13:34:39 +02:00
@@ -141,8 +141,3 @@ 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;
-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;

--- 1.12/mysql-test/extra/binlog_tests/blackhole.test	2006-07-24 13:34:39 +02:00
+++ 1.13/mysql-test/extra/binlog_tests/blackhole.test	2006-07-24 13:34:39 +02:00
@@ -146,5 +146,6 @@ set autocommit=1;
 --replace_column 2 # 5 #
 --replace_regex /table_id: [0-9]+/table_id: #/
 show binlog events;
+drop table if exists t1;
 
 # End of 5.0 tests

--- 1.7/mysql-test/r/binlog_row_blackhole.result	2006-07-24 13:34:39 +02:00
+++ 1.8/mysql-test/r/binlog_row_blackhole.result	2006-07-24 13:34:39 +02:00
@@ -141,8 +141,3 @@ master-bin.000001	#	Table_map	1	#	table_
 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;