Commit 90040183 authored by unknown's avatar unknown
Browse files

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

into  chilla.local:/home/mydev/mysql-4.1
parents 752b826e 868fee4d

sql/ha_ndbcluster.cc

+59 −24
Original line number Diff line number Diff line
@@ -270,6 +270,7 @@ void ha_ndbcluster::records_update() 
  {

    Ndb *ndb= get_ndb();

    Uint64 rows;

    ndb->setDatabaseName(m_dbname);

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

      info->records= rows;

    }
@@ -2876,6 +2877,7 @@ void ha_ndbcluster::info(uint flag) 
        DBUG_VOID_RETURN;

      Ndb *ndb= get_ndb();

      Uint64 rows= 100;

      ndb->setDatabaseName(m_dbname);

      if (current_thd->variables.ndb_use_exact_count)

	ndb_get_table_statistics(ndb, m_tabname, &rows, 0);

      records= rows;
@@ -5228,34 +5230,53 @@ ndb_get_table_statistics(Ndb* ndb, const char * table, 
{

  DBUG_ENTER("ndb_get_table_statistics");

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

  NdbConnection* pTrans= ndb->startTransaction();

  NdbConnection* pTrans;

  NdbError error;

  int retries= 10;

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



  do

  {

    if (pTrans == NULL)

      break;

    Uint64 rows, commits;

    Uint64 sum_rows= 0;

    Uint64 sum_commits= 0;

    NdbScanOperation*pOp;

    NdbResultSet *rs;

    int check;



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

    if (pOp == NULL)

      break;

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

    {

      error= ndb->getNdbError();

      goto retry;

    }

      

    NdbResultSet* rs= pOp->readTuples(NdbOperation::LM_CommittedRead); 

    if (rs == 0)

      break;

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

    {

      error= pTrans->getNdbError();

      goto retry;

    }

    

    int check= pOp->interpret_exit_last_row();

    if (check == -1)

      break;

    if ((rs= pOp->readTuples(NdbOperation::LM_CommittedRead)) == 0)

    {

      error= pOp->getNdbError();

      goto retry;

    }

    

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

    {

      error= pOp->getNdbError();

      goto retry;

    }

    

    Uint64 rows, commits;

    pOp->getValue(NdbDictionary::Column::ROW_COUNT, (char*)&rows);

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

    

    check= pTrans->execute(NoCommit, AbortOnError, TRUE);

    if (check == -1)

      break;

    if (pTrans->execute(NoCommit, AbortOnError, TRUE) == -1)

    {

      error= pTrans->getNdbError();

      goto retry;

    }

    

    Uint64 sum_rows= 0;

    Uint64 sum_commits= 0;

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

    {

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

    

    if (check == -1)

      break;

    {

      error= pOp->getNdbError();

      goto retry;

    }



    rs->close(TRUE);
@@ -5274,11 +5298,22 @@ ndb_get_table_statistics(Ndb* ndb, const char * table, 
      * commit_count= sum_commits;

    DBUG_PRINT("exit", ("records: %u commits: %u", sum_rows, sum_commits));

    DBUG_RETURN(0);

  } while(0);



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

}



/*

sql/sql_base.cc

+5 −3
Original line number Diff line number Diff line
@@ -499,8 +499,10 @@ void close_temporary_tables(THD *thd) 


  if (!mysql_bin_log.is_open())

  {

    for (table= thd->temporary_tables; table; table= table->next)

    TABLE *next;

    for (table= thd->temporary_tables; table; table= next)

    {

      next= table->next;

      close_temporary(table, 1);

    }

    thd->temporary_tables= 0;