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

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push

mysys/default.c

@@ -138,7 +138,7 @@ int my_search_option_files(const char *conf_file, int *argc, char ***argv,
     defaults_group_suffix= getenv(STRINGIFY_ARG(DEFAULT_GROUP_SUFFIX_ENV));
 
   if (forced_extra_defaults)
-    defaults_extra_file= forced_extra_defaults;
+    defaults_extra_file= (char *) forced_extra_defaults;
   
   /*
     We can only handle 'defaults-group-suffix' if we are called from

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;