mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 02:30:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ndb - post merge fixes

Browse source
This commit is contained in:
jonas@perch.ndb.mysql.com 2005-09-20 12:07:18 +02:00
parent 2119a88abe
commit 75cc4ef28a
3 changed files with 3 additions and 11 deletions
Show stats 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*);
friend class HugoOperations;
friend struct Ndb_free_list_t<NdbConnection>;
friend struct Ndb_free_list_t<NdbTransaction>;
};
#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL

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

@ -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;
}

5
sql/ha_ndbcluster.cc
View file

@ -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))
{