bk commit into 5.1 tree (msvensson:1.2115)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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.2115 06/02/16 10:24:50 msvensson@neptunus.(none) +1 -0
  Merge msvensson@devsrv-b:/space/magnus/my51-bug17386
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.1

  mysql-test/t/disabled.def
    1.71 06/02/16 10:24:42 msvensson@neptunus.(none) +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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.1/RESYNC

--- 1.70/mysql-test/t/disabled.def	2006-02-15 17:19:36 +01:00
+++ 1.71/mysql-test/t/disabled.def	2006-02-16 10:24:42 +01:00
@@ -20,7 +20,6 @@
 ndb_binlog_basic     : Results are not deterministic, Tomas will fix
 ndb_binlog_ddl_multi : Bug#17038 [PATCH PENDING]
 ndb_gis              : garbled msgs from corrupt THD*
-ndb_load             : Bug#17233
 partition_03ndb      : Bug#16385
 ps_7ndb              : dbug assert in RBR mode when executing test suite
 rpl_bit_npk          : Bug#13418
@@ -37,3 +36,4 @@
 rpl_row_basic_2myisam : Bug #17385
 rpl_row_basic_3innodb : Bug #17385
 rpl_row_create_table : Bug #17385
+ndb_load        : Bug#17233