Commit 4fb031af authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/jonas/src/mysql-4.1-ndb
parents 9d35b07f 22db858b

ndb/test/ndbapi/testBackup.cpp

+3 −1
Original line number Diff line number Diff line
@@ -149,6 +149,9 @@ int runRestartInitial(NDBT_Context* ctx, NDBT_Step* step){ 
  if (restarter.restartAll(true) != 0)

    return NDBT_FAILED;



  if (restarter.waitClusterStarted() != 0)

    return NDBT_FAILED;

  

  return NDBT_OK;

}
@@ -413,7 +416,6 @@ TESTCASE("BackupOne", 
  INITIALIZER(runRestoreOne);

  VERIFIER(runVerifyOne);

  FINALIZER(runClearTable);

  FINALIZER(runDropTable);

}

TESTCASE("BackupBank", 

	 "Test that backup and restore works during transaction load\n"

ndb/test/run-test/daily-devel-tests.txt

+4 −4
Original line number Diff line number Diff line
@@ -193,16 +193,16 @@ args: -n BasicEventOperation T1 T6 
#

max-time: 1500

cmd: testSystemRestart

args: -n SR6 -l 1 T1 

args: -l 1 -n SR6 T1 



max-time: 1500

cmd: testSystemRestart

args: -n SR7 -l 1 T1 

args: -l 1 -n SR7 T1 



max-time: 1500

cmd: testSystemRestart

args: -n S8 -l 1 T1 

args: -l 1 -n SR8 T1 



max-time: 1500

cmd: testSystemRestart

args: -n S9 -l 1 T1 
args: -l 1 -n SR9 T1

ndb/test/src/HugoTransactions.cpp

+3 −3
Original line number Diff line number Diff line
@@ -729,10 +729,9 @@ HugoTransactions::loadTable(Ndb* pNdb, 
      NdbSleep_MilliSleep(doSleep);



    //    if (first_batch || !oneTrans) {

    if (first_batch) {

    if (first_batch || !pTrans) {

      first_batch = false;

      pTrans = pNdb->startTransaction();

    

      if (pTrans == NULL) {

        const NdbError err = pNdb->getNdbError();
@@ -786,7 +785,7 @@ HugoTransactions::loadTable(Ndb* pNdb, 
    if(check == -1 ) {

      const NdbError err = pTrans->getNdbError();

      pNdb->closeTransaction(pTrans);

      

      pTrans= 0;

      switch(err.status){

      case NdbError::Success:

	ERR(err);
@@ -828,6 +827,7 @@ HugoTransactions::loadTable(Ndb* pNdb, 
    else{

      if (closeTrans) {

        pNdb->closeTransaction(pTrans);

	pTrans= 0;

      }

    }