Commit ffd2ffed authored by unknown's avatar unknown
Browse files

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

into hundin.mysql.fi:/home/jan/mysql-4.1
parents f8a1a341 a2e905a5

ndb/src/kernel/blocks/dbtup/DbtupGen.cpp

+3 −6
Original line number Diff line number Diff line
@@ -633,13 +633,10 @@ void Dbtup::execREAD_CONFIG_REQ(Signal* signal) 


  ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_TUP_OP_RECS, &cnoOfOprec));

  

  // MemorySpaceTuples is specified in 8k pages, divide by 4 for 32k pages

  Uint32 tmp;

  ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_TUP_PAGE, &tmp));

  Uint64 pages = (tmp * 2048 + (ZWORDS_ON_PAGE - 1))/ (Uint64)ZWORDS_ON_PAGE;

  cnoOfPage = (Uint32)pages;

  ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_TUP_PAGE, &cnoOfPage));

  Uint32 noOfTriggers= 0;

  

  Uint32 tmp= 0;

  ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_TUP_PAGE_RANGE, &tmp));

  initPageRangeSize(tmp);

  ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_TUP_TABLE, &cnoOfTablerec));

ndb/src/kernel/vm/Configuration.cpp

+1 −1
Original line number Diff line number Diff line
@@ -521,7 +521,7 @@ Configuration::calcSizeAlt(ConfigValues * ownConfig){ 
    ERROR_SET(fatal, ERR_INVALID_CONFIG, msg, buf);

  }



  noOfDataPages = (dataMem / 8192);

  noOfDataPages = (dataMem / 32768);

  noOfIndexPages = (indexMem / 8192);



  for(unsigned j = 0; j<LogLevel::LOGLEVEL_CATEGORIES; j++){