Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb

into mysql.com:/Users/mikron/mysql-4.1-ndb

ndb/src/kernel/blocks/dbdih/DbdihMain.cpp

@@ -6174,7 +6174,7 @@ void Dbdih::execCREATE_FRAGMENTATION_REQ(Signal * signal){
       break;
     case DictTabInfo::AllNodesLargeTable:
       jam();
-      noOfFragments = 8 * cnoOfNodeGroups;
+      noOfFragments = 4 * csystemnodes;
       break;
     case DictTabInfo::SingleFragment:
       jam();
@@ -11054,6 +11054,7 @@ void Dbdih::initRestorableGciFiles()
 
 void Dbdih::initTable(TabRecordPtr tabPtr)
 {
+  tabPtr.p->noOfFragChunks = 0;
   tabPtr.p->method = TabRecord::NOTDEFINED;
   tabPtr.p->tabStatus = TabRecord::TS_IDLE;
   tabPtr.p->noOfWords = 0;

ndb/src/kernel/vm/pc.hpp

@@ -154,8 +154,8 @@
 * DIH allocates fragments in chunk for fast find of fragment record.
 * These parameters define chunk size and log of chunk size.
 */
-#define NO_OF_FRAGS_PER_CHUNK 8
-#define LOG_NO_OF_FRAGS_PER_CHUNK 3
+#define NO_OF_FRAGS_PER_CHUNK 4
+#define LOG_NO_OF_FRAGS_PER_CHUNK 2
 
 /* ---------------------------------------------------------------- */
 // To avoid synching too big chunks at a time we synch after writing