Commit d432e3df authored by unknown's avatar unknown
Browse files

removed some (Uint32)-1 casts

parent 370fa1d0

ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp

+27 −24
Original line number Diff line number Diff line
@@ -746,14 +746,15 @@ bool Dbtup::readTriggerInfo(TupTriggerData* const trigPtr, 
//--------------------------------------------------------------------

// Read Primary Key Values

//--------------------------------------------------------------------

  noPrimKey = readAttributes(pagep.p,

  int ret= readAttributes(pagep.p,

			  tupheadoffset,

			  &tableDescriptor[regTabPtr->readKeyArray].tabDescr,

			  regTabPtr->noOfKeyAttr,

			  keyBuffer,

			  ZATTR_BUFFER_SIZE,

			  true);

  ndbrequire(noPrimKey != (Uint32)-1);

  ndbrequire(ret != -1);

  noPrimKey= ret;



  Uint32 numAttrsToRead;

  if ((regOperPtr->optype == ZUPDATE) &&
@@ -788,14 +789,15 @@ bool Dbtup::readTriggerInfo(TupTriggerData* const trigPtr, 
  if ((regOperPtr->optype != ZDELETE) ||

      (trigPtr->sendBeforeValues)) {

    ljam();

    noMainWords = readAttributes(pagep.p,

    int ret= readAttributes(pagep.p,

			    tupheadoffset,

			    &readBuffer[0],

			    numAttrsToRead,

			    mainBuffer,

			    ZATTR_BUFFER_SIZE,

			    true);

    ndbrequire(noMainWords != (Uint32)-1);

    ndbrequire(ret != -1);

    noMainWords= ret;

  } else {

    ljam();

    noMainWords = 0;
@@ -813,7 +815,7 @@ bool Dbtup::readTriggerInfo(TupTriggerData* const trigPtr, 
    pagep.i = regOperPtr->realPageIdC;

    ptrCheckGuard(pagep, cnoOfPage, page);



    noCopyWords = readAttributes(pagep.p,

    int ret= readAttributes(pagep.p,

			    tupheadoffset,

			    &readBuffer[0],

			    numAttrsToRead,
@@ -821,7 +823,8 @@ bool Dbtup::readTriggerInfo(TupTriggerData* const trigPtr, 
			    ZATTR_BUFFER_SIZE,

			    true);



    ndbrequire(noCopyWords != (Uint32)-1);

    ndbrequire(ret != -1);

    noCopyWords = ret;

    if ((noMainWords == noCopyWords) &&

        (memcmp(mainBuffer, copyBuffer, noMainWords << 2) == 0)) {

//--------------------------------------------------------------------