bk commit into 5.1 tree (jonas:1.2146)

[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, 2007-06-21 09:11:28+02:00, jonas@stripped +1 -0
  Merge joreland@stripped:/home/bk/mysql-5.1-wl2325-5.0-drop6
  into  perch.ndb.mysql.com:/home/jonas/src/drop6
  MERGE: 1.2143.1.1

  storage/ndb/test/run-test/daily-basic-tests.txt@stripped, 2007-06-21 09:11:26+02:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.55.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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/drop6/RESYNC

--- 1.56/storage/ndb/test/run-test/daily-basic-tests.txt	2007-06-21 09:11:31 +02:00
+++ 1.57/storage/ndb/test/run-test/daily-basic-tests.txt	2007-06-21 09:11:31 +02:00
@@ -497,6 +497,10 @@
 cmd: testSystemRestart
 args: -n Bug27434 T1
 
+max-time: 300
+cmd: testSystemRestart
+args: -n Bug29167 T1
+
 max-time: 1000
 cmd: test_event
 args: -l 10 -n Bug27169 T1