Commit b760bfd7 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-clean
parents dcfd4e41 f4db89ea

ndb/src/kernel/vm/Configuration.cpp

+15 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 


#include <kernel_types.h>

#include <ndb_limits.h>

#include <ndbapi_limits.h>

#include "pc.hpp"

#include <LogLevel.hpp>

#include <NdbSleep.h>
@@ -454,6 +455,7 @@ Configuration::calcSizeAlt(ConfigValues * ownConfig){ 
  unsigned int noOfTables = 0;

  unsigned int noOfUniqueHashIndexes = 0;

  unsigned int noOfOrderedIndexes = 0;

  unsigned int noOfTriggers = 0;

  unsigned int noOfReplicas = 0;

  unsigned int noOfDBNodes = 0;

  unsigned int noOfAPINodes = 0;
@@ -478,6 +480,7 @@ Configuration::calcSizeAlt(ConfigValues * ownConfig){ 
    { CFG_DB_NO_TABLES, &noOfTables, false },

    { CFG_DB_NO_ORDERED_INDEXES, &noOfOrderedIndexes, false },

    { CFG_DB_NO_UNIQUE_HASH_INDEXES, &noOfUniqueHashIndexes, false },

    { CFG_DB_NO_TRIGGERS, &noOfTriggers, true },

    { CFG_DB_NO_REPLICAS, &noOfReplicas, false },

    { CFG_DB_NO_ATTRIBUTES, &noOfAttributes, false },

    { CFG_DB_NO_OPS, &noOfOperations, false },
@@ -586,6 +589,18 @@ Configuration::calcSizeAlt(ConfigValues * ownConfig){ 
  ConfigValues::Iterator it2(*ownConfig, db.m_config);

  it2.set(CFG_DB_NO_TABLES, noOfTables);

  it2.set(CFG_DB_NO_ATTRIBUTES, noOfAttributes);

  {

    Uint32 neededNoOfTriggers =   /* types: Insert/Update/Delete/Custom */

      3 * noOfUniqueHashIndexes + /* for unique hash indexes, I/U/D */

      3 * NDB_MAX_ACTIVE_EVENTS + /* for events in suma, I/U/D */

      3 * noOfTables +            /* for backup, I/U/D */

      noOfOrderedIndexes;         /* for ordered indexes, C */

    if (noOfTriggers < neededNoOfTriggers)

    {

      noOfTriggers= neededNoOfTriggers;

      it2.set(CFG_DB_NO_TRIGGERS, noOfTriggers);

    }

  }



  /**

   * Do size calculations