From f85b20aa7843d29d169bf4d0bca8288cbb9c113a Mon Sep 17 00:00:00 2001
From: unknown <tomas@poseidon.ndb.mysql.com>
Date: Fri, 19 Nov 2004 13:52:21 +0000
Subject: set sizes array sizes correctly in ndb blocks configuration

---
 ndb/src/kernel/vm/Configuration.cpp | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

(limited to 'ndb/src/kernel/vm/Configuration.cpp')

diff --git a/ndb/src/kernel/vm/Configuration.cpp b/ndb/src/kernel/vm/Configuration.cpp
index b3a436275f7..c2f47adff29 100644
--- a/ndb/src/kernel/vm/Configuration.cpp
+++ b/ndb/src/kernel/vm/Configuration.cpp
@@ -590,6 +590,23 @@ Configuration::calcSizeAlt(ConfigValues * ownConfig){
    */
   ConfigValuesFactory cfg(ownConfig);
 
+  Uint32 noOfMetaTables= noOfTables + noOfOrderedIndexes +
+                           noOfUniqueHashIndexes;
+  if (noOfMetaTables > MAX_TABLES)
+    noOfMetaTables= MAX_TABLES;
+
+  {
+    /**
+     * Dict Size Alt values
+     */
+    cfg.put(CFG_DICT_ATTRIBUTE, 
+	    noOfAttributes);
+
+    cfg.put(CFG_DICT_TABLE, 
+	    noOfMetaTables);
+  }
+
+
   if (noOfLocalScanRecords == 0) {
     noOfLocalScanRecords = (noOfDBNodes * noOfScanRecords) + 1;
   }
@@ -599,7 +616,7 @@ Configuration::calcSizeAlt(ConfigValues * ownConfig){
   Uint32 noOfTCScanRecords = noOfScanRecords;
 
   {
-    Uint32 noOfAccTables= noOfTables + noOfUniqueHashIndexes;
+    Uint32 noOfAccTables= noOfMetaTables/*noOfTables+noOfUniqueHashIndexes*/;
     /**
      * Acc Size Alt values
      */
@@ -641,19 +658,6 @@ Configuration::calcSizeAlt(ConfigValues * ownConfig){
     cfg.put(CFG_ACC_SCAN, noOfLocalScanRecords);
   }
   
-  Uint32 noOfMetaTables= noOfTables + noOfOrderedIndexes +
-                           noOfUniqueHashIndexes;
-  {
-    /**
-     * Dict Size Alt values
-     */
-    cfg.put(CFG_DICT_ATTRIBUTE, 
-	    noOfAttributes);
-
-    cfg.put(CFG_DICT_TABLE, 
-	    noOfMetaTables);
-  }
-  
   {
     /**
      * Dih Size Alt values
@@ -758,9 +762,9 @@ Configuration::calcSizeAlt(ConfigValues * ownConfig){
      * Tux Size Alt values
      */
     cfg.put(CFG_TUX_INDEX, 
-	    noOfOrderedIndexes);
+	    noOfMetaTables /*noOfOrderedIndexes*/);
     
-    cfg.put(CFG_TUX_FRAGMENT, 
+    cfg.put(CFG_TUX_FRAGMENT,
 	    2 * NO_OF_FRAG_PER_NODE * noOfOrderedIndexes * noOfReplicas);
     
     cfg.put(CFG_TUX_ATTRIBUTE, 
-- 
cgit v1.2.1