bk commit into 5.1 tree (jmiller:1.2136)

[Jonathan Miller]

Below is the list of changes that have just been committed into a local
5.1 repository of ndbdev. When ndbdev 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.2136 06/02/06 15:59:37 jmiller@stripped +1 -0
  Merge jmiller@stripped:/home/bk/mysql-5.1-new
  into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new

  mysql-test/t/disabled.def
    1.58 06/02/06 15:59:28 jmiller@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:	jmiller
# Host:	ndb08.mysql.com
# Root:	/home/ndbdev/jmiller/clones/mysql-5.1-new/RESYNC

--- 1.57/mysql-test/t/disabled.def	2006-02-03 16:06:02 +01:00
+++ 1.58/mysql-test/t/disabled.def	2006-02-06 15:59:28 +01:00
@@ -27,7 +27,6 @@
 rpl_sp          : Bug #16456
 ndb_autodiscover : Needs to be fixed w.r.t binlog
 ndb_autodiscover2 : Needs to be fixed w.r.t binlog
-ndb_blob        : BLOB replication causes core in master1 (Pekka will fix)
 #ndb_alter_table_row : sometimes wrong error 1015!=1046
 ndb_gis : garbled msgs from corrupt THD*
 rpl_ndb_auto_inc : MySQL Bugs:17086