bk commit into 5.1 tree (ingo:1.2267)

[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 11:02:13+02:00, ingo@stripped +1 -0
  After merge fix

  mysql-test/extra/binlog_tests/blackhole.test@stripped, 2006-07-24 11:02:07+02:00,
ingo@stripped +0 -10
    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.11/mysql-test/extra/binlog_tests/blackhole.test	2006-07-24 11:02:34 +02:00
+++ 1.12/mysql-test/extra/binlog_tests/blackhole.test	2006-07-24 11:02:34 +02:00
@@ -147,14 +147,4 @@ set autocommit=1;
 --replace_regex /table_id: [0-9]+/table_id: #/
 show binlog events;
 
-#
-# BUG#10952 - alter table ... lost data without errors and warnings
-#
-drop table if exists t1;
-create table t1 (c char(20)) engine=MyISAM;
-insert into t1 values ("Monty"),("WAX"),("Walrus");
---error 1031
-alter table t1 engine=blackhole;
-drop table t1;
-
 # End of 5.0 tests