Commit 77974c3a authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/home/jonas/src/mysql-4.1
parents 934c8966 f8f7110a

ndb/src/mgmsrv/MgmtSrvr.cpp

+7 −7
Original line number Diff line number Diff line
@@ -480,6 +480,13 @@ MgmtSrvr::MgmtSrvr(NodeId nodeId, 
  _ownNodeId= 0;

  NodeId tmp= nodeId;

  BaseString error_string;



  if ((m_node_id_mutex = NdbMutex_Create()) == 0)

  {

    ndbout << "mutex creation failed line = " << __LINE__ << endl;

    exit(-1);

  }



#if 0

  char my_hostname[256];

  struct sockaddr_in tmp_addr;
@@ -512,7 +519,6 @@ MgmtSrvr::MgmtSrvr(NodeId nodeId, 
#endif

  _ownNodeId = tmp;





  {

    DBUG_PRINT("info", ("verifyConfig"));

    ConfigRetriever cr(m_local_config, NDB_VERSION, NDB_MGM_NODE_TYPE_MGM);
@@ -534,12 +540,6 @@ MgmtSrvr::MgmtSrvr(NodeId nodeId, 
    m_statisticsListner.m_logLevel = se.m_logLevel;

  }

  

  if ((m_node_id_mutex = NdbMutex_Create()) == 0)

  {

    ndbout << "mutex creation failed line = " << __LINE__ << endl;

    exit(-1);

  }



  DBUG_VOID_RETURN;

}