Commit 69718b78 authored by unknown's avatar unknown
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/50-work

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
parents fc13b0b8 2f58470f
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -481,6 +481,10 @@ max-time: 1000
cmd: testNodeRestart
args: -n Bug26457 T1

max-time: 1000
cmd: testNodeRestart
args: -n Bug26481 T1

# OLD FLEX
max-time: 500
cmd: flexBench