bk commit into 5.0 tree (pekka:1.2224)

[pekka]

Below is the list of changes that have just been committed into a local
5.0 repository of pekka. When pekka 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-07-10 13:07:13+02:00, pekka@stripped +1 -0
  Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50
  into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-bug18781
  MERGE: 1.2214.1.2

  ndb/test/run-test/daily-basic-tests.txt@stripped, 2006-07-10 13:07:00+02:00,
pekka@stripped +0 -0
    Auto merged
    MERGE: 1.38.1.1

# 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:	pekka
# Host:	orca.ndb.mysql.com
# Root:	/space_old/pekka/ndb/version/my50-bug18781/RESYNC

--- 1.39/ndb/test/run-test/daily-basic-tests.txt	2006-07-10 13:07:32 +02:00
+++ 1.40/ndb/test/run-test/daily-basic-tests.txt	2006-07-10 13:07:32 +02:00
@@ -504,6 +504,10 @@
 cmd: testDict
 args: -n TemporaryTables T1 T6 T7 T8 
 
+max-time: 1500
+cmd: testDict
+args: -n Restart_NR2 T1
+
 #
 # TEST NDBAPI
 #