Commit 1bb31494 authored by pekka@mysql.com's avatar pekka@mysql.com

ndb: wl-2066 small fix

parent ad85a10a
...@@ -4555,7 +4555,12 @@ void Dbacc::getElement(Signal* signal) ...@@ -4555,7 +4555,12 @@ void Dbacc::getElement(Signal* signal)
tgeResult = ZFALSE; tgeResult = ZFALSE;
tgeCompareLen = fragrecptr.p->keyLength; tgeCompareLen = fragrecptr.p->keyLength;
const Uint32 isAccLockReq = operationRecPtr.p->isAccLockReq; // wl-2066 remove const Uint32 isAccLockReq = operationRecPtr.p->isAccLockReq; // wl-2066 remove
const bool compareLocalKey = /*
* The value seached is
* - table key for ACCKEYREQ, stored in TUP
* - local key (1 word) for ACC_LOCKREQ and UNDO, stored in ACC
*/
const bool compareLocalKey =
operationRecPtr.p->isAccLockReq || operationRecPtr.p->isUndoLogReq; operationRecPtr.p->isAccLockReq || operationRecPtr.p->isUndoLogReq;
ndbrequire(TelemLen == ZELEM_HEAD_SIZE + fragrecptr.p->localkeylen); ndbrequire(TelemLen == ZELEM_HEAD_SIZE + fragrecptr.p->localkeylen);
...@@ -10448,11 +10453,15 @@ void Dbacc::srDoUndoLab(Signal* signal) ...@@ -10448,11 +10453,15 @@ void Dbacc::srDoUndoLab(Signal* signal)
((fragrecptr.p->keyLength != 0) && ((fragrecptr.p->keyLength != 0) &&
(fragrecptr.p->keyLength == tkeylen))); (fragrecptr.p->keyLength == tkeylen)));
// Read keydata from undo page // Read localkey1 from undo page
signal->theData[7 + 0] = undopageptr.p->undoword[tmpindex];
tmpindex = tmpindex + 1;
#if 0 // wl-2066 remove
for (Uint32 tmp = 0; tmp < tkeylen; tmp++) { for (Uint32 tmp = 0; tmp < tkeylen; tmp++) {
signal->theData[7+tmp] = undopageptr.p->undoword[tmpindex]; signal->theData[7+tmp] = undopageptr.p->undoword[tmpindex];
tmpindex = tmpindex + 1; tmpindex = tmpindex + 1;
}//for }//for
#endif
arrGuard((tmpindex - 1), 8192); arrGuard((tmpindex - 1), 8192);
getElement(signal); getElement(signal);
if (tgeResult != ZTRUE) { if (tgeResult != ZTRUE) {
......
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