Commit 60f34874 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main 

into  mysql.com:/home/stewart/Documents/MySQL/5.0/bug15215
parents 97bfd41f c2421d3f

ndb/src/common/mgmcommon/ConfigRetriever.cpp

+6 −0
Original line number Diff line number Diff line
@@ -341,9 +341,15 @@ ConfigRetriever::allocNodeId(int no_retries, int retry_delay_in_seconds) 
  {

    while (1)

    {

      if(!ndb_mgm_is_connected(m_handle))

	if(!ndb_mgm_connect(m_handle, 0, 0, 0))

	  goto next;



      int res= ndb_mgm_alloc_nodeid(m_handle, m_version, m_node_type);

      if(res >= 0)

	return _ownNodeId= (Uint32)res;



  next:

      if (no_retries == 0)

	break;

      no_retries--;

ndb/src/mgmapi/mgmapi.cpp

+7 −1
Original line number Diff line number Diff line
@@ -336,10 +336,16 @@ ndb_mgm_call(NdbMgmHandle handle, const ParserRow<ParserDummy> *command_reply, 
  const Properties* p = parser.parse(ctx, session);

  if (p == NULL){

    if(!ndb_mgm_is_connected(handle)) {

      return NULL;

      DBUG_RETURN(NULL);

    }

    else

    {

      if(ctx.m_status==Parser_t::Eof

	 || ctx.m_status==Parser_t::NoLine)

      {

	ndb_mgm_disconnect(handle);

	DBUG_RETURN(NULL);

      }

      /**

       * Print some info about why the parser returns NULL

       */