Commit ae3680c5 authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
parents 614fb882 0c84cf4c

ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp

+13 −2
Original line number Diff line number Diff line
@@ -1004,7 +1004,18 @@ Dbtup::read_psuedo(Uint32 attrId, Uint32* outBuffer){ 
    return 1;

  case AttributeHeader::FRAGMENT_MEMORY:

    {

      Uint64 tmp= fragptr.p->noOfPages;

      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);

    }