Commit 02fe27b3 authored by unknown's avatar unknown
Browse files

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

into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
parents 1c2cb842 3c8a296f

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

+1 −0
Original line number Diff line number Diff line
@@ -3265,6 +3265,7 @@ Backup::execBACKUP_FRAGMENT_REQ(Signal* signal) 
    req->requestInfo = 0;

    req->savePointId = 0;

    req->tableId = table.tableId;

    ScanFragReq::setReadCommittedFlag(req->requestInfo, 1);

    ScanFragReq::setLockMode(req->requestInfo, 0);

    ScanFragReq::setHoldLockFlag(req->requestInfo, 0);

    ScanFragReq::setKeyinfoFlag(req->requestInfo, 0);

ndb/src/kernel/blocks/dbtup/Dbtup.hpp

+2 −1
Original line number Diff line number Diff line
@@ -1737,7 +1737,8 @@ private: 
                       Uint32* const mainBuffer,

                       Uint32& noMainWords,

                       Uint32* const copyBuffer,

                       Uint32& noCopyWords);

                       Uint32& noCopyWords,

		       bool xfrm);



  void sendTrigAttrInfo(Signal*        signal, 

                        Uint32*        data,

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

+7 −5
Original line number Diff line number Diff line
@@ -622,7 +622,8 @@ void Dbtup::executeTrigger(Signal* signal, 
                       mainBuffer,

                       noMainWords,

                       copyBuffer,

                       noCopyWords)) {

                       noCopyWords,

		       (ref == BACKUP ? false : true))) {

    ljam();

    return;

  }//if
@@ -727,7 +728,8 @@ bool Dbtup::readTriggerInfo(TupTriggerData* const trigPtr, 
                            Uint32*  const mainBuffer,

                            Uint32& noMainWords,

                            Uint32* const copyBuffer,

                            Uint32& noCopyWords)

                            Uint32& noCopyWords,

			    bool xfrm)

{

  noCopyWords = 0;

  noMainWords = 0;
@@ -757,7 +759,7 @@ bool Dbtup::readTriggerInfo(TupTriggerData* const trigPtr, 
			  regTabPtr->noOfKeyAttr,

			  keyBuffer,

			  ZATTR_BUFFER_SIZE,

			  true);

			  xfrm);

  ndbrequire(ret != -1);

  noPrimKey= ret;
@@ -800,7 +802,7 @@ bool Dbtup::readTriggerInfo(TupTriggerData* const trigPtr, 
			    numAttrsToRead,

			    mainBuffer,

			    ZATTR_BUFFER_SIZE,

			    true);

			    xfrm);

    ndbrequire(ret != -1);

    noMainWords= ret;

  } else {
@@ -826,7 +828,7 @@ bool Dbtup::readTriggerInfo(TupTriggerData* const trigPtr, 
			    numAttrsToRead,

			    copyBuffer,

			    ZATTR_BUFFER_SIZE,

			    true);

			    xfrm);



    ndbrequire(ret != -1);

    noCopyWords = ret;