database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

ndb - post merge fixes

Browse Source 
ndb/include/ndbapi/NdbTransaction.hpp:
  post merge fixes
ndb/src/ndbapi/Ndblist.cpp:
  post merge fixes
sql/ha_ndbcluster.cc:
  post merge fixes
This commit is contained in:
unknown
2005-09-20 12:07:18 +02:00
parent 130e902cf1
commit 16328ca215
3 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ndb/include/ndbapi/NdbTransaction.hpp
View File

@@ -806,7 +806,7 @@ private:
void define_scan_op(NdbIndexScanOperation*); void define_scan_op(NdbIndexScanOperation*);
friend class HugoOperations; friend class HugoOperations;
friend struct Ndb_free_list_t<NdbConnection>; friend struct Ndb_free_list_t<NdbTransaction>;
}; };
#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL #ifndef DOXYGEN_SHOULD_SKIP_INTERNAL

7
ndb/src/ndbapi/Ndblist.cpp
View File

@@ -132,13 +132,6 @@ NdbTransaction*
Ndb::getNdbCon() Ndb::getNdbCon()
{ {
NdbTransaction* tNdbCon = theImpl->theConIdleList.seize(this); 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; tNdbCon->theMagicNumber = 0x37412619;
return tNdbCon; return tNdbCon;
} }

5
sql/ha_ndbcluster.cc
View File

@@ -7416,10 +7416,9 @@ ndbcluster_show_status(THD* thd)
if (protocol->send_fields(&field_list, 1)) if (protocol->send_fields(&field_list, 1))
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);
if (thd->transaction.thd_ndb && if (get_thd_ndb(thd) && get_thd_ndb(thd)->ndb)
((Thd_ndb*)thd->transaction.thd_ndb)->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; Ndb::Free_list_usage tmp; tmp.m_name= 0;
while (ndb->get_free_list_usage(&tmp)) while (ndb->get_free_list_usage(&tmp))
{ {