mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 11:01:52 +01:00
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
This commit is contained in:
commit
b942a98b76
1 changed files with 13 additions and 2 deletions
|
@ -1004,8 +1004,19 @@ Dbtup::read_psuedo(Uint32 attrId, Uint32* outBuffer){
|
|||
return 1;
|
||||
case AttributeHeader::FRAGMENT_MEMORY:
|
||||
{
|
||||
Uint64 tmp= fragptr.p->noOfPages;
|
||||
tmp*= 32768;
|
||||
Uint64 tmp = 0;
|
||||
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);
|
||||
}
|
||||
return 2;
|
||||
|
|
Loading…
Add table
Reference in a new issue