bk commit into 5.1 tree (jonas:1.1960)

[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
  1.1960 05/11/24 11:09:42 jonas@stripped +1 -0
  Merge joreland@stripped:/home/bk/mysql-5.1-ndb
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-ndb

  storage/ndb/test/run-test/daily-basic-tests.txt
    1.37 05/11/24 11:09:39 jonas@stripped +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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/mysql-5.1-ndb/RESYNC

--- 1.36/storage/ndb/test/run-test/daily-basic-tests.txt	2005-11-23 10:45:05 +01:00
+++ 1.37/storage/ndb/test/run-test/daily-basic-tests.txt	2005-11-24 11:09:39 +01:00
@@ -208,6 +208,10 @@
 args: -n MassiveRollback2 T1 T6 T13 D1 D2
 
 max-time: 500
+cmd: testBasic
+args: -n TupError
+
+max-time: 500
 cmd: testTimeout
 args: T1 
 
@@ -313,7 +317,7 @@
 cmd: testScan
 args: -n ScanReadRestart T1 T6 T13 D1 D2
 
-max-time: 500
+max-time: 1200
 cmd: testScan
 args: -n ScanUpdateRestart T6 D1 D2 
 
@@ -397,7 +401,7 @@
 cmd: testScan
 args: -n CheckAfterTerror T1 D1 D2 
 
-max-time: 500
+max-time: 1200
 cmd: testScan
 args: -n ScanReadWhileNodeIsDown T1 D1 D2