From: magnus.blaudd Date: October 17 2012 4:22pm Subject: bzr push into mysql-5.1-telco-7.1 branch (magnus.blaudd:4629 to 4630) List-Archive: http://lists.mysql.com/commits/145087 Message-Id: <20121017162208.25263.96376.4630@wholphin> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 4630 magnus.blaudd@stripped 2012-10-17 [merge] Merge 7.0 -> 7.1 modified: storage/ndb/src/common/portlib/NdbThread.c 4629 magnus.blaudd@stripped 2012-10-17 [merge] Merge 7.0 -> 7.1 modified: storage/ndb/src/common/portlib/NdbThread.c === modified file 'storage/ndb/src/common/portlib/NdbThread.c' --- a/storage/ndb/src/common/portlib/NdbThread.c 2012-10-17 13:18:33 +0000 +++ b/storage/ndb/src/common/portlib/NdbThread.c 2012-10-17 15:58:59 +0000 @@ -340,12 +340,12 @@ void NdbThread_Destroy(struct NdbThread* { DBUG_ENTER("NdbThread_Destroy"); if (*p_thread != NULL){ - DBUG_PRINT("enter",("*p_thread: 0x%lx", (long) *p_thread)); #ifdef _WIN32 HANDLE thread_handle = (*p_thread)->thread_handle; if (thread_handle) CloseHandle(thread_handle); #endif + DBUG_PRINT("enter",("*p_thread: 0x%lx", (long) *p_thread)); free(* p_thread); * p_thread = 0; } No bundle (reason: useless for push emails).