bk commit into 5.1 tree (tomas:1.1870)

[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.1870 05/05/23 11:02:21 tomas@stripped +1 -0
  disabled.def:
    verified that 2 ndb tests in fact are now working

  mysql-test/t/disabled.def
    1.22 05/05/23 11:01:53 tomas@stripped +0 -2
    verified that 2 ndb tests in fact are now working

# 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/wl2325-test

--- 1.21/mysql-test/t/disabled.def	2005-05-20 11:06:20 +02:00
+++ 1.22/mysql-test/t/disabled.def	2005-05-23 11:01:53 +02:00
@@ -11,8 +11,6 @@
 ##############################################################################
 ndb_autodiscover : replication conflict
 ndb_autodiscover2 : replication conflict
-ndb_cache_multi : replication conflict
-ndb_cache_multi2 : replication conflict
 ndb_insert : REPLACE replication conflict
 rpl_row_trans : NYI - non-transactional tables in transactions 
 rpl_server_id2 : TBF - incompatible options