Commit cf358493 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-5.0


ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  merge
parents 16328ca2 3c8a296f

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

+1 −0
Original line number Diff line number Diff line
@@ -3262,6 +3262,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
@@ -1791,7 +1791,8 @@ private: 
                       Uint32* const mainBuffer,

                       Uint32& noMainWords,

                       Uint32* const copyBuffer,

                       Uint32& noCopyWords);

                       Uint32& noCopyWords,

		       bool xfrm);



  void sendTrigAttrInfo(Signal*        signal, 

                        Uint32*        data,