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

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

1 files changed, 13 insertions, 2 deletions

diff --git a/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp b/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
index 3170d23499a..acdad3f9f1a 100644
--- a/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
+++ b/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
@@ -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;