Commit dd5322a1 authored by unknown's avatar unknown
Browse files

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

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
parents b699f969 f85b20aa

ndb/src/kernel/vm/Configuration.cpp

+20 −16
Original line number Diff line number Diff line
@@ -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,7 +762,7 @@ Configuration::calcSizeAlt(ConfigValues * ownConfig){ 
     * Tux Size Alt values

     */

    cfg.put(CFG_TUX_INDEX, 

	    noOfOrderedIndexes);

	    noOfMetaTables /*noOfOrderedIndexes*/);

    

    cfg.put(CFG_TUX_FRAGMENT,

	    2 * NO_OF_FRAG_PER_NODE * noOfOrderedIndexes * noOfReplicas);