bk commit into 5.1 tree (istruewing:1.2318)

[ingo]

Below is the list of changes that have just been committed into a local
5.1 repository of istruewing. When istruewing 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-09-15 19:31:42+02:00, istruewing@stripped +1 -0
  Merge 5.1 -> 5.1-engines
  Disabled index_merge_innodb to get autopush through

  mysql-test/t/disabled.def@stripped, 2006-09-15 19:31:38+02:00, istruewing@stripped +1
-0
    Merge 5.1 -> 5.1-engines
    Disabled index_merge_innodb to get autopush through

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

--- 1.198/mysql-test/t/disabled.def	2006-09-15 19:31:48 +02:00
+++ 1.199/mysql-test/t/disabled.def	2006-09-15 19:31:48 +02:00
@@ -16,6 +16,7 @@
 im_options                : Bug#20294 2006-07-24 stewart   Instance manager test
im_options fails randomly
 #im_life_cycle             : Bug#20368 2006-06-10 alik    im_life_cycle test fails
 im_daemon_life_cycle     : BUG#22379 2006-09-15 ingo    im_daemon_life_cycle.test fails
on merge of 5.1 -> 5.1-engines
+index_merge_innodb       : BUG#22398 2006-09-15 ingo    index_merge_innodb.test fails on
wrong result file
 concurrent_innodb        : BUG#21579 2006-08-11 mleich innodb_concurrent random failures
with varying differences
 ndb_autodiscover         : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
 ndb_autodiscover2        : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog