bk commit into 5.0 tree (mskold:1.1980) BUG#9896

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.0 repository of marty. When marty does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1980 05/09/20 10:34:00 mskold@stripped +1 -0
  Fix for bug#9896, each fragment has a twin fragment (in 4.1,5.0), pages in this were not counted, giving incorrect memory consumption

  ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
    1.17 05/09/20 10:33:42 mskold@stripped +13 -2
    Fix for bug#9896, each fragment has a twin fragment (in 4.1,5.0), pages in this were not counted, giving incorrect memory consumption

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mskold
# Host:	blowfish.ndb.mysql.com
# Root:	/usr/local/home/marty/MySQL/mysql-5.0

--- 1.16/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp	2005-04-06 23:12:01 +02:00
+++ 1.17/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp	2005-09-20 10:33:42 +02:00
@@ -1004,8 +1004,19 @@
     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;