mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 13:32:33 +01:00
ndb - Fix bug in backward compatility code (for our test programs)
This commit is contained in:
parent
193310c884
commit
8aa60fdd01
1 changed files with 13 additions and 8 deletions
|
@ -204,14 +204,6 @@ Ndb::~Ndb()
|
|||
TransporterFacade::instance()->close(theNdbBlockNumber, theFirstTransId);
|
||||
}
|
||||
|
||||
if (global_ndb_cluster_connection != 0) {
|
||||
theNoOfNdbObjects--;
|
||||
if(theNoOfNdbObjects == 0){
|
||||
delete global_ndb_cluster_connection;
|
||||
global_ndb_cluster_connection= 0;
|
||||
}
|
||||
}//if
|
||||
|
||||
// if (theSchemaConToNdbList != NULL)
|
||||
// closeSchemaTransaction(theSchemaConToNdbList);
|
||||
while ( theConIdleList != NULL )
|
||||
|
@ -249,6 +241,19 @@ Ndb::~Ndb()
|
|||
|
||||
delete theImpl;
|
||||
|
||||
/**
|
||||
* This needs to be put after delete theImpl
|
||||
* as TransporterFacade::instance is delete by global_ndb_cluster_connection
|
||||
* and used by theImpl
|
||||
*/
|
||||
if (global_ndb_cluster_connection != 0) {
|
||||
theNoOfNdbObjects--;
|
||||
if(theNoOfNdbObjects == 0){
|
||||
delete global_ndb_cluster_connection;
|
||||
global_ndb_cluster_connection= 0;
|
||||
}
|
||||
}//if
|
||||
|
||||
/**
|
||||
* This sleep is to make sure that the transporter
|
||||
* send thread will come in and send any
|
||||
|
|
Loading…
Reference in a new issue