Commit 2773b73c authored by unknown's avatar unknown
Browse files

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 

into  mysql.com:/home/marty/MySQL/mysql-5.1-extra


sql/ha_ndbcluster.cc:
  Auto merged
parents 2ef57b83 f9bc24ef

sql/ha_ndbcluster.cc

+6 −3
Original line number Diff line number Diff line
@@ -7420,7 +7420,7 @@ ndb_get_table_statistics(Ndb* ndb, const NDBTAB *ndbtab, 


  do

  {

    Uint64 rows, commits, mem;

    Uint64 rows, commits, fixed_mem, var_mem;

    Uint32 size;

    Uint32 count= 0;

    Uint64 sum_rows= 0;
@@ -7458,7 +7458,10 @@ ndb_get_table_statistics(Ndb* ndb, const NDBTAB *ndbtab, 
    pOp->getValue(NdbDictionary::Column::ROW_COUNT, (char*)&rows);

    pOp->getValue(NdbDictionary::Column::COMMIT_COUNT, (char*)&commits);

    pOp->getValue(NdbDictionary::Column::ROW_SIZE, (char*)&size);

    pOp->getValue(NdbDictionary::Column::FRAGMENT_MEMORY, (char*)&mem);

    pOp->getValue(NdbDictionary::Column::FRAGMENT_FIXED_MEMORY, 

		  (char*)&fixed_mem);

    pOp->getValue(NdbDictionary::Column::FRAGMENT_VARSIZED_MEMORY, 

		  (char*)&var_mem);

    

    if (pTrans->execute(NdbTransaction::NoCommit,

                        NdbTransaction::AbortOnError,
@@ -7474,7 +7477,7 @@ ndb_get_table_statistics(Ndb* ndb, const NDBTAB *ndbtab, 
      sum_commits+= commits;

      if (sum_row_size < size)

        sum_row_size= size;

      sum_mem+= mem;

      sum_mem+= fixed_mem + var_mem;

      count++;

    }

storage/ndb/include/kernel/AttributeHeader.hpp

+2 −1
Original line number Diff line number Diff line
@@ -39,12 +39,13 @@ public: 
  STATIC_CONST( RANGE_NO     = 0xFFFB ); // Read range no (when batched ranges)

  

  STATIC_CONST( ROW_SIZE     = 0xFFFA );

  STATIC_CONST( FRAGMENT_MEMORY= 0xFFF9 );

  STATIC_CONST( FRAGMENT_FIXED_MEMORY= 0xFFF9 );



  STATIC_CONST( RECORDS_IN_RANGE = 0xFFF8 );

  STATIC_CONST( DISK_REF     = 0xFFF7 );

  STATIC_CONST( ROWID        = 0xFFF6 );

  STATIC_CONST( ROW_GCI      = 0xFFF5 );

  STATIC_CONST( FRAGMENT_VARSIZED_MEMORY = 0xFFF4 );



  // NOTE: in 5.1 ctors and init take size in bytes

storage/ndb/include/ndbapi/NdbDictionary.hpp

+2 −1
Original line number Diff line number Diff line
@@ -525,7 +525,8 @@ public: 
    const char* getDefaultValue() const;



    static const Column * FRAGMENT;

    static const Column * FRAGMENT_MEMORY;

    static const Column * FRAGMENT_FIXED_MEMORY;

    static const Column * FRAGMENT_VARSIZED_MEMORY;

    static const Column * ROW_COUNT;

    static const Column * COMMIT_COUNT;

    static const Column * ROW_SIZE;

storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp

+1 −0
Original line number Diff line number Diff line
@@ -604,6 +604,7 @@ struct Fragrecord { 
  Uint32 currentPageRange;

  Uint32 rootPageRange;

  Uint32 noOfPages;

  Uint32 noOfVarPages;

  Uint32 noOfPagesToGrow;



  DLList<Page>::Head emptyPrimPage; // allocated pages (not init)

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

+1 −0
Original line number Diff line number Diff line
@@ -351,6 +351,7 @@ void Dbtup::initFragRange(Fragrecord* const regFragPtr) 
  regFragPtr->rootPageRange = RNIL;

  regFragPtr->currentPageRange = RNIL;

  regFragPtr->noOfPages = 0;

  regFragPtr->noOfVarPages = 0;

  regFragPtr->noOfPagesToGrow = 2;

  regFragPtr->nextStartRange = 0;

}//initFragRange()