bk commit into 5.1 tree (tomas:1.2203)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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.2203 06/03/22 16:01:04 tomas@stripped +1 -0
  Merge tulin@stripped:/home/bk/mysql-5.1-new
  into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

  mysql-test/t/disabled.def
    1.107 06/03/22 16:00:49 tomas@stripped +0 -0
    Auto merged

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-new/RESYNC

--- 1.106/mysql-test/t/disabled.def	2006-03-22 12:03:11 +01:00
+++ 1.107/mysql-test/t/disabled.def	2006-03-22 16:00:49 +01:00
@@ -23,8 +23,8 @@
 ps_7ndb                 : dbug assert in RBR mode when executing test suite
 #rpl_bit_npk             : Bug#13418
 rpl_ddl                 : Bug#15963 SBR does not show "Definer" correctly
-rpl_ndb_2innodb         : Assert failure in ha_partition::extra()
-rpl_ndb_2myisam         : Assert failure in ha_partition::extra()
+rpl_ndb_2innodb         : If removed fails later on assertion in get_parts_for_update()
+rpl_ndb_2myisam         : If removed fails later on assertion in get_parts_for_update()
 rpl_ndb_auto_inc        : Bug#17086
 #rpl_ndb_basic           : Bug#16228 [IN REVIEW]
 rpl_ndb_blob            : interferes with following tests, causing hang