bk commit into 5.1 tree (jonas:1.2270) BUG#21283

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas 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-08-10 13:49:37+02:00, jonas@stripped +1 -0
  ndb - bug#21283 - merge disabled.def

  mysql-test/t/disabled.def@stripped, 2006-08-10 13:49:35+02:00, jonas@stripped +0 -1
    merge

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/mysql-5.1-new-ndb

--- 1.184/mysql-test/t/disabled.def	2006-08-10 13:49:41 +02:00
+++ 1.185/mysql-test/t/disabled.def	2006-08-10 13:49:41 +02:00
@@ -20,7 +20,6 @@ ndb_autodiscover         : BUG#18952 200
 ndb_autodiscover2        : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
 ndb_binlog_ignore_db     : BUG#21279 2006-07-25 ingo    Randomly throws a warning
 ndb_load                 : BUG#17233 2006-05-04 tomas failed load data from infile causes mysqld dbug_assert, binlog not flushed
-ndb_restore_compat       : BUG#21283 2006-07-26 ingo    Test fails randomly
 partition_03ndb          : BUG#16385 2006-03-24 mikael Partitions: crash when updating a range partitioned NDB table
 ps                       : BUG#21524 2006-08-08 pgalbraith 'ps' test fails in --ps-protocol test AMD64 bit
 ps_7ndb                  : BUG#18950 2006-02-16 jmiller create table like does not obtain LOCK_open