From: Date: September 2 2008 4:38pm
Subject: bzr push into mysql-5.1 branch (msvensson:2744 to 2745) Bug#39158
List-Archive: http://lists.mysql.com/commits/53108
X-Bug: 39158
Message-Id: <20080902143832.A4F2A30E868@pilot>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 2745 Magnus Svensson	2008-09-02 [merge]
      Merge bug#39158
modified:
  storage/ndb/src/mgmsrv/MgmtSrvr.cpp

 2744 Magnus Svensson	2008-09-02 [merge]
      Merge bug#31315
modified:
  scripts/mysql_install_db.sh

=== modified file 'storage/ndb/src/mgmsrv/MgmtSrvr.cpp'
--- a/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2008-08-21 22:18:36 +0000
+++ b/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2008-09-02 14:37:17 +0000
@@ -2338,6 +2338,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);
     }