Commit dbfce2a5 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jonas/src/mysql-4.1 

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


ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
ndb/tools/restore/Restore.cpp:
  Auto merged
ndb/tools/restore/consumer_restore.cpp:
  Auto merged
parents e595b7ee a7917b1e

ndb/src/kernel/blocks/backup/Backup.cpp

+21 −4
Original line number Diff line number Diff line
@@ -1676,13 +1676,30 @@ Backup::execWAIT_GCP_CONF(Signal* signal){ 
    ptr.p->masterData.sendCounter= 0;

    ptr.p->masterData.gsn = GSN_BACKUP_FRAGMENT_REQ;

    nextFragment(signal, ptr);

    return;

  } else {

    jam();

    if(gcp >= ptr.p->startGCP + 3)

    {

      CRASH_INSERTION((10009));

      ptr.p->stopGCP = gcp;

      sendDropTrig(signal, ptr); // regular dropping of triggers

      return;

    }//if

    

    /**

     * Make sure that we got entire stopGCP 

     */

    WaitGCPReq * req = (WaitGCPReq*)signal->getDataPtrSend();

    req->senderRef = reference();

    req->senderData = ptr.i;

    req->requestType = WaitGCPReq::CompleteForceStart;

    sendSignal(DBDIH_REF, GSN_WAIT_GCP_REQ, signal, 

	       WaitGCPReq::SignalLength,JBB);

    return;

  }

}



/*****************************************************************************

 * 

 * Master functionallity - Backup fragment

ndb/src/kernel/blocks/dbacc/DbaccMain.cpp

+12 −1
Original line number Diff line number Diff line
@@ -1668,7 +1668,7 @@ void Dbacc::initOpRec(Signal* signal) 
void Dbacc::sendAcckeyconf(Signal* signal) 

{

  signal->theData[0] = operationRecPtr.p->userptr;

  signal->theData[1] = operationRecPtr.p->insertIsDone;

  signal->theData[1] = operationRecPtr.p->operation;

  signal->theData[2] = operationRecPtr.p->fid;

  signal->theData[3] = operationRecPtr.p->localdata[0];

  signal->theData[4] = operationRecPtr.p->localdata[1];
@@ -1754,6 +1754,11 @@ void Dbacc::execACCKEYREQ(Signal* signal) 
    case ZWRITE:

    case ZSCAN_OP:

      if (!tgeLocked){

	if(operationRecPtr.p->operation == ZWRITE)

	{

	  jam();

	  operationRecPtr.p->operation = ZUPDATE;

	}

        sendAcckeyconf(signal);

        if (operationRecPtr.p->dirtyRead == ZFALSE) {

	  /*---------------------------------------------------------------*/
@@ -2279,6 +2284,12 @@ Uint32 Dbacc::placeWriteInLockQueue(Signal* signal) 
    return ZWRITE_ERROR;

  }//if



  if(operationRecPtr.p->operation == ZWRITE)

  {

    operationRecPtr.p->operation = 

      (mlpqOperPtr.p->operation == ZDELETE) ? ZINSERT : ZUPDATE;

  }

  

  operationRecPtr.p->localdata[0] = queOperPtr.p->localdata[0];

  operationRecPtr.p->localdata[1] = queOperPtr.p->localdata[1];

  operationRecPtr.p->prevParallelQue = mlpqOperPtr.i;

ndb/src/kernel/blocks/dblqh/DblqhMain.cpp

+14 −13
Original line number Diff line number Diff line
@@ -3905,20 +3905,21 @@ void Dblqh::execACCKEYCONF(Signal* signal) 
   * EITHER TO THE TC BLOCK OR DIRECTLY TO THE APPLICATION. THE SCHEMA VERSION

   * IS NEEDED SINCE TWO SCHEMA VERSIONS CAN BE ACTIVE SIMULTANEOUSLY ON A 

   * TABLE.

   * ------------------------------------------------------------------------ */

  if (regTcPtr->operation == ZWRITE) {

    if (signal->theData[1] > 0) {

      /* --------------------------------------------------------------------

       * ACC did perform an insert and thus we should indicate that the WRITE 

       * is an INSERT otherwise it is an UPDATE.

       * -------------------------------------------------------------------- */

      jam();

      regTcPtr->operation = ZINSERT;

    } else {

      jam();

      tcConnectptr.p->operation = ZUPDATE;

    }//if

   * ----------------------------------------------------------------------- */

  if (regTcPtr->operation == ZWRITE) 

  {

    Uint32 op= signal->theData[1];

    if(likely(op == ZINSERT || op == ZUPDATE))

    {

      regTcPtr->operation = op;

    }

    else

    {

      warningEvent("Convering %d to ZUPDATE", op);

      regTcPtr->operation = ZUPDATE;

    }

  }//if

  

  ndbrequire(localKeyFlag == 1);

  localKey2 = localKey1 & MAX_TUPLES_PER_PAGE;

  localKey1 = localKey1 >> MAX_TUPLES_BITS;

ndb/test/ndbapi/testNdbApi.cpp

+239 −0
Original line number Diff line number Diff line
@@ -1037,6 +1037,239 @@ int runCheckGetNdbErrorOperation(NDBT_Context* ctx, NDBT_Step* step){ 
  return result;

}



int runBug_11133(NDBT_Context* ctx, NDBT_Step* step){

  int result = NDBT_OK;

  const NdbDictionary::Table* pTab = ctx->getTab();



  HugoOperations hugoOps(*pTab);



  Ndb* pNdb = GETNDB(step);

  Uint32 lm;



  NdbConnection* pCon = pNdb->startTransaction();

  if (pCon == NULL){

    pNdb->closeTransaction(pCon);  

    return NDBT_FAILED;

  }

  

  NdbOperation* pOp = pCon->getNdbOperation(pTab->getName());

  if (pOp == NULL){

    ERR(pCon->getNdbError());

    pNdb->closeTransaction(pCon);  

    return NDBT_FAILED;

  }

  

  if (pOp->readTuple(NdbOperation::LM_Exclusive) != 0){

    pNdb->closeTransaction(pCon);

    ERR(pOp->getNdbError());

    return NDBT_FAILED;

  }

      

  for(int a = 0; a<pTab->getNoOfColumns(); a++){

    if (pTab->getColumn(a)->getPrimaryKey() == true){

      if(hugoOps.equalForAttr(pOp, a, 1) != 0){

	ERR(pCon->getNdbError());

	pNdb->closeTransaction(pCon);

	return NDBT_FAILED;

      }

    }

  }



  for(int a = 0; a<pTab->getNoOfColumns(); a++){

    if (pTab->getColumn(a)->getPrimaryKey() != true){

      if (pOp->getValue(pTab->getColumn(a)->getName()) == NULL) {

	ERR(pCon->getNdbError());

	pNdb->closeTransaction(pCon);

	return NDBT_FAILED;

      }

    }

  }

  

  int check = pCon->execute(NoCommit);

  if (check == 0){

    ndbout << "execute worked" << endl;

  } else {

    ERR(pCon->getNdbError());

    result = NDBT_FAILED;

  }

  

  pOp = pCon->getNdbOperation(pTab->getName());

  if (pOp == NULL){

    ERR(pCon->getNdbError());

    pNdb->closeTransaction(pCon);  

    return NDBT_FAILED;

  }

  

  if (pOp->deleteTuple() != 0){

    pNdb->closeTransaction(pCon);

    ERR(pOp->getNdbError());

    return NDBT_FAILED;

  }

      

  for(int a = 0; a<pTab->getNoOfColumns(); a++){

    if (pTab->getColumn(a)->getPrimaryKey() == true){

      if(hugoOps.equalForAttr(pOp, a, 1) != 0){

	ERR(pCon->getNdbError());

	pNdb->closeTransaction(pCon);

	return NDBT_FAILED;

      }

    }

  }



  check = pCon->execute(NoCommit);

  if (check == 0){

    ndbout << "execute worked" << endl;

  } else {

    ERR(pCon->getNdbError());

    result = NDBT_FAILED;

  }



  pOp = pCon->getNdbOperation(pTab->getName());

  if (pOp == NULL){

    ERR(pCon->getNdbError());

    pNdb->closeTransaction(pCon);  

    return NDBT_FAILED;

  }

  

  if (pOp->writeTuple() != 0){

    pNdb->closeTransaction(pCon);

    ERR(pOp->getNdbError());

    return NDBT_FAILED;

  }

  

  for(int a = 0; a<pTab->getNoOfColumns(); a++){

    if (pTab->getColumn(a)->getPrimaryKey() == true){

      if(hugoOps.equalForAttr(pOp, a, 1) != 0){

	ERR(pCon->getNdbError());

	pNdb->closeTransaction(pCon);

	return NDBT_FAILED;

      }

    }

  }

  

  for(int a = 0; a<pTab->getNoOfColumns(); a++){

    if (pTab->getColumn(a)->getPrimaryKey() != true){

      if(hugoOps.setValueForAttr(pOp, a, 1, 1) != 0)

      {

	ERR(pCon->getNdbError());

	pNdb->closeTransaction(pCon);

	return NDBT_FAILED;

      }

    }

  }

  

  check = pCon->execute(NoCommit);

  if (check == 0){

    ndbout << "execute worked" << endl;

  } else {

    ERR(pCon->getNdbError());

    result = NDBT_FAILED;

  }



  pOp = pCon->getNdbOperation(pTab->getName());

  if (pOp == NULL){

    ERR(pCon->getNdbError());

    pNdb->closeTransaction(pCon);  

    return NDBT_FAILED;

  }

  

  if (pOp->writeTuple() != 0){

    pNdb->closeTransaction(pCon);

    ERR(pOp->getNdbError());

    return NDBT_FAILED;

  }

  

  for(int a = 0; a<pTab->getNoOfColumns(); a++){

    if (pTab->getColumn(a)->getPrimaryKey() == true){

      if(hugoOps.equalForAttr(pOp, a, 1) != 0){

	ERR(pCon->getNdbError());

	pNdb->closeTransaction(pCon);

	return NDBT_FAILED;

      }

    }

  }

  

  for(int a = 0; a<pTab->getNoOfColumns(); a++){

    if (pTab->getColumn(a)->getPrimaryKey() != true){

      if(hugoOps.setValueForAttr(pOp, a, 1, 1) != 0)

      {

	ERR(pCon->getNdbError());

	pNdb->closeTransaction(pCon);

	return NDBT_FAILED;

      }

    }

  }

  

  check = pCon->execute(NoCommit);

  if (check == 0){

    ndbout << "execute worked" << endl;

  } else {

    ERR(pCon->getNdbError());

    result = NDBT_FAILED;

  }

  

  check = pCon->execute(Rollback);

  if (check == 0){

    ndbout << "execute worked" << endl;

  } else {

    ERR(pCon->getNdbError());

    result = NDBT_FAILED;

  }

  

  pCon->close();



  pCon = pNdb->startTransaction();

  if (pCon == NULL){

    pNdb->closeTransaction(pCon);  

    return NDBT_FAILED;

  }



  pOp = pCon->getNdbOperation(pTab->getName());

  if (pOp == NULL){

    ERR(pCon->getNdbError());

    pNdb->closeTransaction(pCon);  

    return NDBT_FAILED;

  }

  

  if (pOp->writeTuple() != 0){

    pNdb->closeTransaction(pCon);

    ERR(pOp->getNdbError());

    return NDBT_FAILED;

  }

  

  for(int a = 0; a<pTab->getNoOfColumns(); a++){

    if (pTab->getColumn(a)->getPrimaryKey() == true){

      if(hugoOps.equalForAttr(pOp, a, 1) != 0){

	ERR(pCon->getNdbError());

	pNdb->closeTransaction(pCon);

	return NDBT_FAILED;

      }

    }

  }

  

  for(int a = 0; a<pTab->getNoOfColumns(); a++){

    if (pTab->getColumn(a)->getPrimaryKey() != true){

      if(hugoOps.setValueForAttr(pOp, a, 1, 1) != 0)

      {

	ERR(pCon->getNdbError());

	pNdb->closeTransaction(pCon);

	return NDBT_FAILED;

      }

    }

  }

  

  check = pCon->execute(Commit);

  if (check == 0){

    ndbout << "execute worked" << endl;

  } else {

    ERR(pCon->getNdbError());

    result = NDBT_FAILED;

  }

  

  return result;

}







NDBT_TESTSUITE(testNdbApi);

TESTCASE("MaxNdb",
@@ -1112,6 +1345,12 @@ TESTCASE("ReadWithoutGetValue", 
  INITIALIZER(runReadWithoutGetValue);

  FINALIZER(runClearTable);

}

TESTCASE("Bug_11133", 

	 "Test ReadEx-Delete-Write\n"){ 

  INITIALIZER(runLoadTable);

  INITIALIZER(runBug_11133);

  FINALIZER(runClearTable);

}

NDBT_TESTSUITE_END(testNdbApi);



int main(int argc, const char** argv){

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

+4 −0
Original line number Diff line number Diff line
@@ -516,6 +516,10 @@ max-time: 500 
cmd: testNdbApi

args: -n ReadWithoutGetValue



max-time: 500

cmd: testNdbApi

args: -n Bug_11133 T1 



#max-time: 500

#cmd: testInterpreter

#args: T1