1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into mysql.com:/space/pekka/ndb/version/my41
This commit is contained in:
pekka@mysql.com 2005-03-28 22:56:40 +02:00
commit a259bcebd7
2 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ndb/src/kernel/blocks/dbacc/Dbacc.hpp
View File

@ -1076,7 +1076,7 @@ private:
void storeLongKeysAtPos(Signal* signal);
void reorgLongPage(Signal* signal);
void getElement(Signal* signal);
void searchLongKey(Signal* signal);
void searchLongKey(Signal* signal, bool verify);
void getdirindex(Signal* signal);
void commitdelete(Signal* signal, bool systemRestart);
void deleteElement(Signal* signal);

16
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
View File

@ -4685,7 +4685,7 @@ void Dbacc::getElement(Signal* signal)
/* --------------------------------------------------------------------------------- */
tslcPageIndex = gePageptr.p->word32[tgeKeyptr] & 0x3ff;
tslcPagedir = gePageptr.p->word32[tgeKeyptr] >> 10;
searchLongKey(signal);
searchLongKey(signal, true);
if (tslcResult == ZTRUE) {
register Uint32 TlocData1, TlocData2;
jam();
@ -4728,6 +4728,14 @@ void Dbacc::getElement(Signal* signal)
Uint32 TgeIndex = TdataIndex + tgeForward;
operationRecPtr.p->localdata[0] = gePageptr.p->word32[TdataIndex];
operationRecPtr.p->localdata[1] = gePageptr.p->word32[TgeIndex];
if (fragrecptr.p->keyLength == 0) {
// set up long key variables in operation record
tslcPageIndex = gePageptr.p->word32[tgeKeyptr] & 0x3ff;
tslcPagedir = gePageptr.p->word32[tgeKeyptr] >> 10;
// no verification since we have no key data
searchLongKey(signal, false);
}
return;
}//if
if (tgeRemLen <= ZCON_HEAD_SIZE) {
@ -4775,7 +4783,7 @@ void Dbacc::getElement(Signal* signal)
/* TSLC_RESULT */
/* DESCRIPTION: SEARCH FOR AN ELEMENT IN A LONG_KEY_PAGE. */
/* --------------------------------------------------------------------------------- */
void Dbacc::searchLongKey(Signal* signal)
void Dbacc::searchLongKey(Signal* signal, bool verify)
{
DirRangePtr slcOverflowrangeptr;
DirectoryarrayPtr slcOverflowDirptr;
@ -4801,15 +4809,18 @@ void Dbacc::searchLongKey(Signal* signal)
dbgWord32(slcPageptr, ZWORDS_IN_PAGE - tslcPageIndex, (int)slcPageptr.p->word32[ZWORDS_IN_PAGE - tslcPageIndex] & 0xffff);
dbgWord32(slcPageptr, ZWORDS_IN_PAGE - tslcPageIndex, slcPageptr.p->word32[ZWORDS_IN_PAGE - tslcPageIndex] >> 16);
tslcIndexValue = slcPageptr.p->word32[ZWORDS_IN_PAGE - tslcPageIndex];
if (verify) {
if ((tslcIndexValue >> 16) != operationRecPtr.p->tupkeylen) {
jam();
tslcResult = ZFALSE;
return;
}//if
}
tslcStartIndex = tslcIndexValue & 0xffff;
guard30 = operationRecPtr.p->tupkeylen - 1;
arrGuard(guard30, 2048);
arrGuard(guard30 + tslcStartIndex, 2048);
if (verify) {
for (tslcIndex = 0; tslcIndex <= guard30; tslcIndex++) {
dbgWord32(slcPageptr, tslcIndex + tslcStartIndex, slcPageptr.p->word32[tslcIndex + tslcStartIndex]);
if (slcPageptr.p->word32[tslcIndex + tslcStartIndex] != Tkeydata[tslcIndex]) {
@ -4818,6 +4829,7 @@ void Dbacc::searchLongKey(Signal* signal)
return;
}//if
}//for
}
jam();
tslcResult = ZTRUE;
operationRecPtr.p->longPagePtr = slcPageptr.i;