mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ndb: wl-2066 small fix

Browse source 
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  wl-2066 small fix
This commit is contained in:
unknown 2004-11-11 14:32:52 +01:00
parent 7225ca1c3f
commit 981cb88ef5
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
View file

@ -4555,6 +4555,11 @@ 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
/*
* 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 = const bool compareLocalKey =
operationRecPtr.p->isAccLockReq || operationRecPtr.p->isUndoLogReq; operationRecPtr.p->isAccLockReq || operationRecPtr.p->isUndoLogReq;
@ -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) {