Commit f852307d authored by mskold@mysql.com's avatar mskold@mysql.com

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

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
parents 6b32d44d cb474559
...@@ -1004,8 +1004,19 @@ Dbtup::read_psuedo(Uint32 attrId, Uint32* outBuffer){ ...@@ -1004,8 +1004,19 @@ Dbtup::read_psuedo(Uint32 attrId, Uint32* outBuffer){
return 1; return 1;
case AttributeHeader::FRAGMENT_MEMORY: case AttributeHeader::FRAGMENT_MEMORY:
{ {
Uint64 tmp= fragptr.p->noOfPages; Uint64 tmp = 0;
tmp*= 32768; tmp += fragptr.p->noOfPages;
{
/**
* Each fragment is split into 2...get #pages from other as well
*/
Uint32 twin = fragptr.p->fragmentId ^ 1;
FragrecordPtr twinPtr;
getFragmentrec(twinPtr, twin, tabptr.p);
ndbrequire(twinPtr.p != 0);
tmp += twinPtr.p->noOfPages;
}
tmp *= 32768;
memcpy(outBuffer,&tmp,8); memcpy(outBuffer,&tmp,8);
} }
return 2; return 2;
......
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