Commit 16328ca2 authored by unknown's avatar unknown
Browse files

ndb - post merge fixes 


ndb/include/ndbapi/NdbTransaction.hpp:
  post merge fixes
ndb/src/ndbapi/Ndblist.cpp:
  post merge fixes
sql/ha_ndbcluster.cc:
  post merge fixes
parent 130e902c

ndb/include/ndbapi/NdbTransaction.hpp

+1 −1
Original line number Diff line number Diff line
@@ -806,7 +806,7 @@ private: 
  void define_scan_op(NdbIndexScanOperation*);



  friend class HugoOperations;

  friend struct Ndb_free_list_t<NdbConnection>;

  friend struct Ndb_free_list_t<NdbTransaction>;

};



#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL

ndb/src/ndbapi/Ndblist.cpp

+0 −7
Original line number Diff line number Diff line
@@ -132,13 +132,6 @@ NdbTransaction* 
Ndb::getNdbCon()

{

  NdbTransaction* tNdbCon = theImpl->theConIdleList.seize(this);

  if (unlikely(theImpl->theConIdleList.m_alloc_cnt > theMaxNoOfTransactions)) 

  {

    theImpl->theConIdleList.release(tNdbCon);

    ndbout << "theNoOfAllocatedTransactions = " << theNoOfAllocatedTransactions << " theMaxNoOfTransactions = " << theMaxNoOfTransactions << endl;

    return NULL;

  }//if

  

  tNdbCon->theMagicNumber = 0x37412619;

  return tNdbCon;

}

sql/ha_ndbcluster.cc

+2 −3
Original line number Diff line number Diff line
@@ -7416,10 +7416,9 @@ ndbcluster_show_status(THD* thd) 
  if (protocol->send_fields(&field_list, 1))

    DBUG_RETURN(TRUE);

  

  if (thd->transaction.thd_ndb &&

      ((Thd_ndb*)thd->transaction.thd_ndb)->ndb)

  if (get_thd_ndb(thd) && get_thd_ndb(thd)->ndb)

  {

    Ndb* ndb= ((Thd_ndb*)thd->transaction.thd_ndb)->ndb;

    Ndb* ndb= (get_thd_ndb(thd))->ndb;

    Ndb::Free_list_usage tmp; tmp.m_name= 0;

    while (ndb->get_free_list_usage(&tmp))

    {