Commit 64c8b3a6 authored by unknown's avatar unknown
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
  merge
parents 22edf825 2c9c4508

storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp

+7 −0
Original line number Diff line number Diff line
@@ -484,6 +484,13 @@ Uint32 Dbtup::leafPageRangeFull(Fragrecord* const regFragPtr, PageRangePtr curr 
      ptrCheckGuard(parentPageRangePtr, cnoOfPageRangeRec, pageRange);

      if (parentPageRangePtr.p->currentIndexPos < 3) {

        jam();



        if (c_noOfFreePageRanges < tiprNoLevels) 

        {

          jam();

          return RNIL;

        }//if

	

/* ---------------------------------------------------------------- */

/*       WE HAVE FOUND AN EMPTY ENTRY IN A PAGE RANGE RECORD.       */

/*       ALLOCATE A NEW PAGE RANGE RECORD, FILL IN THE START RANGE, */

storage/ndb/src/mgmsrv/InitConfigFileParser.cpp

+1 −1
Original line number Diff line number Diff line
@@ -669,7 +669,7 @@ InitConfigFileParser::store_in_properties(Vector<struct my_option>& options, 
      if (options[i].var_type == GET_INT)

	ctx.m_currentSection->put(options[i].name, (Uint32)value_int);

      else

	ctx.m_currentSection->put(options[i].name, value_int);	

	ctx.m_currentSection->put64(options[i].name, value_int);	

    }

  }

  return true;