mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
This commit is contained in:
unknown 2005-09-21 17:58:38 +02:00
commit 02fe27b3e3
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ndb/src/kernel/blocks/backup/Backup.cpp
View file

@ -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);

3
ndb/src/kernel/blocks/dbtup/Dbtup.hpp
View file

@ -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,

12
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
View file

@ -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;