From: Date: September 2 2008 11:26am
Subject: bzr commit into mysql-5.1-telco-6.2 branch (msvensson:2641) Bug#39158
List-Archive: http://lists.mysql.com/commits/53107
X-Bug: 39158
Message-Id: <20080902092615.C176530E851@pilot>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///home/msvensson/mysql/bug39158/6.2/

 2641 Magnus Svensson	2008-09-02
      Bug#39158 MgmtSrvr::allocNodeId leaves mutex locked after "Ambiguity for node if %d" error
modified:
  storage/ndb/src/mgmsrv/MgmtSrvr.cpp

per-file messages:
  storage/ndb/src/mgmsrv/MgmtSrvr.cpp
    Unlock mutex before return
=== modified file 'storage/ndb/src/mgmsrv/MgmtSrvr.cpp'
--- a/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2008-07-29 09:39:57 +0000
+++ b/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2008-09-02 09:26:08 +0000
@@ -2339,6 +2339,7 @@ MgmtSrvr::alloc_node_id(NodeId * nodeId,
 			  "or specifying unique host names in config file,\n"
 			  "or specifying just one mgmt server in config file.",
 			  tmp);
+      NdbMutex_Unlock(m_configMutex);
       error_code = NDB_MGM_ALLOCID_CONFIG_MISMATCH;
       DBUG_RETURN(false);
     }