Commit 5eff43c3 authored by unknown's avatar unknown
Browse files

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

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
parents 4bd0ac3a 746f990d

storage/ndb/test/ndbapi/testDict.cpp

+5 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ max-time: 1000 
cmd: testNodeRestart

args: -n Bug25554 T1



max-time: 1000

max-time: 3000

cmd: testNodeRestart

args: -n Bug25984