bug#12950

    ndb backup with charsets and simultanious updates
    make sure that backup _dont_ read xfrm data
parent 668a192c
...@@ -3265,6 +3265,7 @@ Backup::execBACKUP_FRAGMENT_REQ(Signal* signal) ...@@ -3265,6 +3265,7 @@ Backup::execBACKUP_FRAGMENT_REQ(Signal* signal)
req->requestInfo = 0; req->requestInfo = 0;
req->savePointId = 0; req->savePointId = 0;
req->tableId = table.tableId; req->tableId = table.tableId;
ScanFragReq::setReadCommittedFlag(req->requestInfo, 1);
ScanFragReq::setLockMode(req->requestInfo, 0); ScanFragReq::setLockMode(req->requestInfo, 0);
ScanFragReq::setHoldLockFlag(req->requestInfo, 0); ScanFragReq::setHoldLockFlag(req->requestInfo, 0);
ScanFragReq::setKeyinfoFlag(req->requestInfo, 0); ScanFragReq::setKeyinfoFlag(req->requestInfo, 0);
......
...@@ -1737,7 +1737,8 @@ private: ...@@ -1737,7 +1737,8 @@ private:
Uint32* const mainBuffer, Uint32* const mainBuffer,
Uint32& noMainWords, Uint32& noMainWords,
Uint32* const copyBuffer, Uint32* const copyBuffer,
Uint32& noCopyWords); Uint32& noCopyWords,
bool xfrm);
void sendTrigAttrInfo(Signal* signal, void sendTrigAttrInfo(Signal* signal,
Uint32* data, Uint32* data,
......
...@@ -622,7 +622,8 @@ void Dbtup::executeTrigger(Signal* signal, ...@@ -622,7 +622,8 @@ void Dbtup::executeTrigger(Signal* signal,
mainBuffer, mainBuffer,
noMainWords, noMainWords,
copyBuffer, copyBuffer,
noCopyWords)) { noCopyWords,
(ref == BACKUP ? false : true))) {
ljam(); ljam();
return; return;
}//if }//if
...@@ -727,7 +728,8 @@ bool Dbtup::readTriggerInfo(TupTriggerData* const trigPtr, ...@@ -727,7 +728,8 @@ bool Dbtup::readTriggerInfo(TupTriggerData* const trigPtr,
Uint32* const mainBuffer, Uint32* const mainBuffer,
Uint32& noMainWords, Uint32& noMainWords,
Uint32* const copyBuffer, Uint32* const copyBuffer,
Uint32& noCopyWords) Uint32& noCopyWords,
bool xfrm)
{ {
noCopyWords = 0; noCopyWords = 0;
noMainWords = 0; noMainWords = 0;
...@@ -757,7 +759,7 @@ bool Dbtup::readTriggerInfo(TupTriggerData* const trigPtr, ...@@ -757,7 +759,7 @@ bool Dbtup::readTriggerInfo(TupTriggerData* const trigPtr,
regTabPtr->noOfKeyAttr, regTabPtr->noOfKeyAttr,
keyBuffer, keyBuffer,
ZATTR_BUFFER_SIZE, ZATTR_BUFFER_SIZE,
true); xfrm);
ndbrequire(ret != -1); ndbrequire(ret != -1);
noPrimKey= ret; noPrimKey= ret;
...@@ -800,7 +802,7 @@ bool Dbtup::readTriggerInfo(TupTriggerData* const trigPtr, ...@@ -800,7 +802,7 @@ bool Dbtup::readTriggerInfo(TupTriggerData* const trigPtr,
numAttrsToRead, numAttrsToRead,
mainBuffer, mainBuffer,
ZATTR_BUFFER_SIZE, ZATTR_BUFFER_SIZE,
true); xfrm);
ndbrequire(ret != -1); ndbrequire(ret != -1);
noMainWords= ret; noMainWords= ret;
} else { } else {
...@@ -826,7 +828,7 @@ bool Dbtup::readTriggerInfo(TupTriggerData* const trigPtr, ...@@ -826,7 +828,7 @@ bool Dbtup::readTriggerInfo(TupTriggerData* const trigPtr,
numAttrsToRead, numAttrsToRead,
copyBuffer, copyBuffer,
ZATTR_BUFFER_SIZE, ZATTR_BUFFER_SIZE,
true); xfrm);
ndbrequire(ret != -1); ndbrequire(ret != -1);
noCopyWords = ret; noCopyWords = ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment