From d2c45ec3c577040cd41f9d81d50843a32483423e Mon Sep 17 00:00:00 2001 From: "msvensson@shellback.(none)" <> Date: Mon, 20 Nov 2006 21:11:45 +0100 Subject: [PATCH] Bug#24361 valgrind error when shutting down mysqld connected to cluster - Disconnect from transporter before starting to delete objects --- storage/ndb/src/ndbapi/Ndbinit.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/storage/ndb/src/ndbapi/Ndbinit.cpp b/storage/ndb/src/ndbapi/Ndbinit.cpp index 5c0fb521c36..3d7d1b768f2 100644 --- a/storage/ndb/src/ndbapi/Ndbinit.cpp +++ b/storage/ndb/src/ndbapi/Ndbinit.cpp @@ -146,12 +146,13 @@ Ndb::~Ndb() } doDisconnect(); - delete theEventBuffer; - + /* Disconnect from transporter to stop signals from coming in */ if (theImpl->m_transporter_facade != NULL && theNdbBlockNumber > 0){ theImpl->m_transporter_facade->close(theNdbBlockNumber, theFirstTransId); } - + + delete theEventBuffer; + releaseTransactionArrays(); delete []theConnectionArray;