Commit 65c617af authored by unknown's avatar unknown
Browse files

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

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge


sql/ha_ndbcluster.cc:
  Auto merged
parents 300346fa 091e238c

sql/ha_ndbcluster.cc

+28 −4
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ void ha_ndbcluster::records_update() 
  DBUG_PRINT("info", ("id=%d, no_uncommitted_rows_count=%d",

		      ((const NDBTAB *)m_table)->getTableId(),

		      info->no_uncommitted_rows_count));

  if (info->records == ~(ha_rows)0)

  //  if (info->records == ~(ha_rows)0)

  {

    Uint64 rows;

    if(ndb_get_table_statistics(m_ndb, m_tabname, &rows, 0) == 0){
@@ -618,7 +618,7 @@ int ha_ndbcluster::get_metadata(const char *path) 
  DBUG_ENTER("get_metadata");

  DBUG_PRINT("enter", ("m_tabname: %s, path: %s", m_tabname, path));



  if (!(tab= dict->getTable(m_tabname, &m_table_info)))

  if (!(tab= dict->getTable(m_tabname)))

    ERR_RETURN(dict->getNdbError());

  DBUG_PRINT("info", ("Table schema version: %d", tab->getObjectVersion()));
@@ -667,7 +667,9 @@ int ha_ndbcluster::get_metadata(const char *path) 
    DBUG_RETURN(error);



  // All checks OK, lets use the table

  m_table= (void*)tab;

  //  m_table= (void*)tab;

  m_table= 0;

  m_table_info= 0;

  

  DBUG_RETURN(build_index_list(table, ILBP_OPEN));  

}
@@ -2405,8 +2407,18 @@ void ha_ndbcluster::info(uint flag) 
  if (flag & HA_STATUS_VARIABLE)

  {

    DBUG_PRINT("info", ("HA_STATUS_VARIABLE"));

    if (m_table_info)

    {

      records_update();

    }

    else

    {

      Uint64 rows;

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

	records= rows;

      }

    }

  }

  if (flag & HA_STATUS_ERRKEY)

  {

    DBUG_PRINT("info", ("HA_STATUS_ERRKEY"));
@@ -2792,6 +2804,16 @@ int ha_ndbcluster::external_lock(THD *thd, int lock_type) 
    // Start of transaction

    retrieve_all_fields= FALSE;

    ops_pending= 0;    

    {

      NDBDICT *dict= m_ndb->getDictionary();

      const NDBTAB *tab;

      void *tab_info;

      if (!(tab= dict->getTable(m_tabname, &tab_info)))

	ERR_RETURN(dict->getNdbError());

      DBUG_PRINT("info", ("Table schema version: %d", tab->getObjectVersion()));

      m_table= (void *)tab;

      m_table_info= tab_info;

    }

    no_uncommitted_rows_init(thd);

  } 

  else
@@ -2814,6 +2836,8 @@ int ha_ndbcluster::external_lock(THD *thd, int lock_type) 
        thd->transaction.stmt.ndb_tid= 0;

      }

    }

    m_table= (void *)0;

    m_table_info= 0;

    if (m_active_trans)

      DBUG_PRINT("warning", ("m_active_trans != NULL"));

    if (m_active_cursor)