bk commit into 5.1 tree (tomas:1.2039)

[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.2039 06/01/12 16:57:59 tomas@stripped +2 -0
  added disk test

  mysql-test/t/disabled.def
    1.40 06/01/12 16:57:53 tomas@stripped +0 -1
    added disk test

  mysql-test/mysql-test-run.sh
    1.288 06/01/12 16:57:53 tomas@stripped +1 -1
    added disk test

# 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-wl2325-v6

--- 1.287/mysql-test/mysql-test-run.sh	2006-01-10 23:30:01 +01:00
+++ 1.288/mysql-test/mysql-test-run.sh	2006-01-12 16:57:53 +01:00
@@ -1487,7 +1487,7 @@
          NDBCLUSTER_EXTRA_OPTS="--small"
       fi
 
-      OPTS="$NDBCLUSTER_OPTS_SLAVE --initial $NDBCLUSTER_EXTRA_OPTS --diskless --ndbd-nodes=1 --verbose=2"
+      OPTS="$NDBCLUSTER_OPTS_SLAVE --initial $NDBCLUSTER_EXTRA_OPTS --ndbd-nodes=1 --verbose=2"
       echo "Starting slave ndbcluster " $OPTS
       ./ndb/ndbcluster $OPTS \
                       || NDB_SLAVE_STATUS_OK=0

--- 1.39/mysql-test/t/disabled.def	2006-01-12 16:32:59 +01:00
+++ 1.40/mysql-test/t/disabled.def	2006-01-12 16:57:53 +01:00
@@ -28,4 +28,3 @@
 ndb_autodiscover2 : TBF with CR
 ndb_binlog_basic   : Results are not deterministic, Tomas will fix
 rpl_ndb_basic   : Bug#16228
-rpl_ndb_disk    : Not yet