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

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into mysql.com:/home/jonas/src/mysql-5.0
This commit is contained in:
joreland@mysql.com 2005-06-09 07:57:10 +02:00
commit 872c84b382
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
View File

@ -247,10 +247,10 @@ Ndbfs::readWriteRequest(int action, Signal * signal)
AsyncFile* openFile = theOpenFiles.find(filePointer); AsyncFile* openFile = theOpenFiles.find(filePointer);
const NewVARIABLE *myBaseAddrRef = &getBat(blockNumber)[fsRWReq->varIndex]; const NewVARIABLE *myBaseAddrRef = &getBat(blockNumber)[fsRWReq->varIndex];
unsigned int tPageSize; UintPtr tPageSize;
unsigned int tClusterSize; UintPtr tClusterSize;
unsigned int tNRR; UintPtr tNRR;
unsigned int tPageOffset; UintPtr tPageOffset;
char* tWA; char* tWA;
FsRef::NdbfsErrorCodeType errorCode; FsRef::NdbfsErrorCodeType errorCode;
@ -294,8 +294,8 @@ Ndbfs::readWriteRequest(int action, Signal * signal)
jam(); jam();
for (unsigned int i = 0; i < fsRWReq->numberOfPages; i++) { for (unsigned int i = 0; i < fsRWReq->numberOfPages; i++) {
jam(); jam();
const Uint32 varIndex = fsRWReq->data.listOfPair[i].varIndex; const UintPtr varIndex = fsRWReq->data.listOfPair[i].varIndex;
const Uint32 fileOffset = fsRWReq->data.listOfPair[i].fileOffset; const UintPtr fileOffset = fsRWReq->data.listOfPair[i].fileOffset;
if (varIndex >= tNRR) { if (varIndex >= tNRR) {
jam(); jam();
errorCode = FsRef::fsErrInvalidParameters; errorCode = FsRef::fsErrInvalidParameters;
@ -316,8 +316,8 @@ Ndbfs::readWriteRequest(int action, Signal * signal)
errorCode = FsRef::fsErrInvalidParameters; errorCode = FsRef::fsErrInvalidParameters;
goto error; goto error;
}//if }//if
const Uint32 varIndex = fsRWReq->data.arrayOfPages.varIndex; const UintPtr varIndex = fsRWReq->data.arrayOfPages.varIndex;
const Uint32 fileOffset = fsRWReq->data.arrayOfPages.fileOffset; const UintPtr fileOffset = fsRWReq->data.arrayOfPages.fileOffset;
request->par.readWrite.pages[0].offset = fileOffset * tPageSize; request->par.readWrite.pages[0].offset = fileOffset * tPageSize;
request->par.readWrite.pages[0].size = tPageSize * fsRWReq->numberOfPages; request->par.readWrite.pages[0].size = tPageSize * fsRWReq->numberOfPages;
@ -334,7 +334,7 @@ Ndbfs::readWriteRequest(int action, Signal * signal)
for (unsigned int i = 0; i < fsRWReq->numberOfPages; i++) { for (unsigned int i = 0; i < fsRWReq->numberOfPages; i++) {
jam(); jam();
Uint32 varIndex = fsRWReq->data.listOfMemPages.varIndex[i]; UintPtr varIndex = fsRWReq->data.listOfMemPages.varIndex[i];
if (varIndex >= tNRR) { if (varIndex >= tNRR) {
jam(); jam();