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

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

storage/ndb/test/ndbapi/testDict.cpp

@@ -322,6 +322,10 @@ int runCreateAndDropAtRandom(NDBT_Context* ctx, NDBT_Step* step)
     i++;
   }
   
+  for (Uint32 i = 0; i<numTables; i++)
+    if (tabList[i])
+      pDic->dropTable(NDBT_Tables::getTable(i)->getName());
+  
   delete [] tabList;
   return result;
 }

storage/ndb/test/run-test/daily-basic-tests.txt

@@ -525,7 +525,7 @@ max-time: 1000
 cmd: testNodeRestart
 args: -n Bug25554 T1
 
-max-time: 1000
+max-time: 3000
 cmd: testNodeRestart
 args: -n Bug25984