Commit ba6c03cd authored by unknown's avatar unknown
Browse files

Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl 

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge


sql/ha_ndbcluster.cc:
  Auto merged
parents 11d38c1d d6fe37ae

ndb/include/kernel/signaldata/LqhFrag.hpp

+22 −22
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ class LqhFragReq { 
  friend bool printLQH_FRAG_REQ(FILE *, const Uint32 *, Uint32, Uint16);



public:

  STATIC_CONST( SignalLength = 24 );

  STATIC_CONST( SignalLength = 23 );

  

  enum RequestInfo {

    CreateInRunning = 0x8000000,
@@ -115,33 +115,33 @@ private: 
  Uint32 senderData;

  Uint32 senderRef;

  Uint32 fragmentId;

  Uint8  requestInfo; 

  Uint8  unused1; 

  Uint16 noOfAttributes;

  Uint32 tableId;

  Uint32 localKeyLength;

  Uint16 maxLoadFactor;

  Uint16 minLoadFactor;

  Uint16 kValue;

  Uint8  tableType;             // DictTabInfo::TableType

  Uint8  GCPIndicator;

  Uint32 lh3DistrBits;

  Uint32 lh3PageBits;

  Uint32 noOfNullAttributes;

  Uint32 maxRowsLow;

  Uint32 maxRowsHigh;

  Uint32 minRowsLow;

  Uint32 minRowsHigh;

  Uint32 requestInfo; 

  Uint32 maxLoadFactor;

  Uint32 minLoadFactor;

  Uint32 kValue;

  Uint32 schemaVersion;

  Uint32 keyLength;

  Uint32 nextLCP;

  Uint32 noOfKeyAttr;

  Uint16 noOfNewAttr;

  Uint16 noOfCharsets;

  Uint32 checksumIndicator;

  Uint32 noOfAttributeGroups;

  Uint32 startGci;

  Uint32 tableType;             // DictTabInfo::TableType

  Uint32 primaryTableId;        // table of index or RNIL

  Uint16 tableId;

  Uint16 localKeyLength;

  Uint16 lh3DistrBits;

  Uint16 lh3PageBits;

  Uint16 noOfAttributes;

  Uint16 noOfNullAttributes;

  Uint16 noOfPagesToPreAllocate;

  Uint16 keyLength;

  Uint16 noOfKeyAttr;

  Uint8 checksumIndicator;

  Uint8 GCPIndicator;

  Uint32 noOfAttributeGroups;

  Uint32 maxRowsLow;

  Uint32 maxRowsHigh;

  Uint32 minRowsLow;

  Uint32 minRowsHigh;

};



class LqhFragConf {

sql/ha_ndbcluster.cc

+56 −44
Original line number Diff line number Diff line
@@ -363,6 +363,7 @@ void ha_ndbcluster::records_update() 
  {

    Ndb *ndb= get_ndb();

    struct Ndb_statistics stat;

    ndb->setDatabaseName(m_dbname);

    if (ndb_get_table_statistics(ndb, m_tabname, &stat) == 0){

      mean_rec_length= stat.row_size;

      data_file_length= stat.fragment_memory;
@@ -3081,6 +3082,7 @@ void ha_ndbcluster::info(uint flag) 
        DBUG_VOID_RETURN;

      Ndb *ndb= get_ndb();

      struct Ndb_statistics stat;

      ndb->setDatabaseName(m_dbname);

      if (current_thd->variables.ndb_use_exact_count &&

          ndb_get_table_statistics(ndb, m_tabname, &stat) == 0)

      {
@@ -5842,62 +5844,60 @@ ndb_get_table_statistics(Ndb* ndb, const char * table, 
  DBUG_ENTER("ndb_get_table_statistics");

  DBUG_PRINT("enter", ("table: %s", table));

  NdbTransaction* pTrans;

  NdbError error;

  int retries= 10;

  int retry_sleep= 30 * 1000; /* 30 milliseconds */



  do

  {

    pTrans= ndb->startTransaction();

    if (pTrans == NULL)

    {

      if (ndb->getNdbError().status == NdbError::TemporaryError &&

          retries--)

    Uint64 rows, commits, mem;

    Uint32 size;

    Uint32 count= 0;

    Uint64 sum_rows= 0;

    Uint64 sum_commits= 0;

    Uint64 sum_row_size= 0;

    Uint64 sum_mem= 0;

    NdbScanOperation*pOp;

    NdbResultSet *rs;

    int check;



    if ((pTrans= ndb->startTransaction()) == NULL)

    {

        my_sleep(retry_sleep);

        continue;

      }

      break;

      error= ndb->getNdbError();

      goto retry;

    }

      

    NdbScanOperation* pOp= pTrans->getNdbScanOperation(table);

    if (pOp == NULL)

      break;

    if ((pOp= pTrans->getNdbScanOperation(table)) == NULL)

    {

      error= pTrans->getNdbError();

      goto retry;

    }

    

    if (pOp->readTuples(NdbOperation::LM_CommittedRead))

      break;

    {

      error= pOp->getNdbError();

      goto retry;

    }

    

    int check= pOp->interpret_exit_last_row();

    if (check == -1)

      break;

    if (pOp->interpret_exit_last_row() == -1)

    {

      error= pOp->getNdbError();

      goto retry;

    }

    

    Uint64 rows, commits, mem;

    Uint32 size;

    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);

    

    check= pTrans->execute(NdbTransaction::NoCommit,

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

                        NdbTransaction::AbortOnError,

                           TRUE);

    if (check == -1)

                        TRUE) == -1)

    {

      if (pTrans->getNdbError().status == NdbError::TemporaryError &&

          retries--)

      {

        ndb->closeTransaction(pTrans);

        pTrans= 0;

        my_sleep(retry_sleep);

        continue;

      }

      break;

      error= pTrans->getNdbError();

      goto retry;

    }

    

    Uint32 count= 0;

    Uint64 sum_rows= 0;

    Uint64 sum_commits= 0;

    Uint64 sum_row_size= 0;

    Uint64 sum_mem= 0;

    while ((check= pOp->nextResult(TRUE, TRUE)) == 0)

    {

      sum_rows+= rows;
@@ -5909,7 +5909,10 @@ ndb_get_table_statistics(Ndb* ndb, const char * table, 
    }

    

    if (check == -1)

      break;

    {

      error= pOp->getNdbError();

      goto retry;

    }



    pOp->close(TRUE);
@@ -5926,12 +5929,21 @@ ndb_get_table_statistics(Ndb* ndb, const char * table, 
                        sum_mem, count));



    DBUG_RETURN(0);

  } while(1);



retry:

    if (pTrans)

    {

      ndb->closeTransaction(pTrans);

  DBUG_PRINT("exit", ("failed"));

  DBUG_RETURN(-1);

      pTrans= NULL;

    }

    if (error.status == NdbError::TemporaryError && retries--)

    {

      my_sleep(retry_sleep);

      continue;

    }

    break;

  } while(1);

  DBUG_PRINT("exit", ("failed, error %u(%s)", error.code, error.message));

  ERR_RETURN(error);

}



/*