Commit 582b0ba8 authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 

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


storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
parents 7403890a 5118e111

storage/ndb/test/ndbapi/testNodeRestart.cpp

+2 −3
Original line number Diff line number Diff line
@@ -1231,8 +1231,7 @@ int runBug25984(NDBT_Context* ctx, NDBT_Step* step){ 
    if (restarter.startNodes(&victim, 1))

      return NDBT_FAILED;



    if (restarter.waitNodesStartPhase(&victim, 1, 2))

      return NDBT_FAILED;

    NdbSleep_SecSleep(3);

  }



  if (restarter.waitNodesNoStart(&victim, 1))
@@ -1459,7 +1458,7 @@ runBug27003(NDBT_Context* ctx, NDBT_Step* step) 
	return NDBT_FAILED;

      

      res.startNodes(&node, 1);

      res.waitNodesStartPhase(&node, 1, 2);

      NdbSleep_SecSleep(3);

      pos++;

    }

    pos = 0;