Commit 3e9758bc authored by unknown's avatar unknown
Browse files

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main


ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
parents 4d71b8f8 123c0a98

ndb/include/mgmapi/ndbd_exit_codes.h

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ typedef ndbd_exit_classification_enum ndbd_exit_classification; 
#define NDBD_EXIT_INDEX_NOTINRANGE            2304

#define NDBD_EXIT_ARBIT_SHUTDOWN              2305

#define NDBD_EXIT_POINTER_NOTINRANGE          2306

#define NDBD_EXIT_PARTITIONED_SHUTDOWN        2307

#define NDBD_EXIT_SR_OTHERNODEFAILED          2308

#define NDBD_EXIT_NODE_NOT_DEAD               2309

#define NDBD_EXIT_SR_REDOLOG                  2310

ndb/src/kernel/blocks/qmgr/QmgrMain.cpp

+9 −9
Original line number Diff line number Diff line
@@ -438,6 +438,7 @@ void Qmgr::execCONNECT_REP(Signal* signal) 
void

Qmgr::execREAD_NODESCONF(Signal* signal)

{

  jamEntry();

  check_readnodes_reply(signal, 

			refToNode(signal->getSendersBlockRef()),

			GSN_READ_NODESCONF);
@@ -446,6 +447,7 @@ Qmgr::execREAD_NODESCONF(Signal* signal) 
void

Qmgr::execREAD_NODESREF(Signal* signal)

{

  jamEntry();

  check_readnodes_reply(signal, 

			refToNode(signal->getSendersBlockRef()),

			GSN_READ_NODESREF);
@@ -907,7 +909,7 @@ Qmgr::check_readnodes_reply(Signal* signal, Uint32 nodeId, Uint32 gsn) 


  char buf[255];

  BaseString::snprintf(buf, sizeof(buf),

		       "Partitioned cluster! check StartPartialTimeout, "

		       "check StartPartialTimeout, "

		       "node %d thinks %d is president, "

		       "I think president is: %d",

		       nodeId, president, cpresident);
@@ -941,7 +943,7 @@ Qmgr::check_readnodes_reply(Signal* signal, Uint32 nodeId, Uint32 gsn) 
  CRASH_INSERTION(932);

  

  progError(__LINE__, 

	    NDBD_EXIT_ARBIT_SHUTDOWN,

	    NDBD_EXIT_PARTITIONED_SHUTDOWN,

	    buf);

  

  ndbrequire(false);
@@ -2794,7 +2796,7 @@ void Qmgr::failReportLab(Signal* signal, Uint16 aFailedNode, 
      break;

    case FailRep::ZPARTITIONED_CLUSTER:

    {

      code = NDBD_EXIT_ARBIT_SHUTDOWN;

      code = NDBD_EXIT_PARTITIONED_SHUTDOWN;

      char buf1[100], buf2[100];

      c_clusterNodes.getText(buf1);

      if (signal->getLength()== FailRep::SignalLength + FailRep::ExtraLength &&
@@ -2805,7 +2807,6 @@ void Qmgr::failReportLab(Signal* signal, Uint16 aFailedNode, 
	part.assign(NdbNodeBitmask::Size, rep->partition);

	part.getText(buf2);

	BaseString::snprintf(extra, sizeof(extra),

			     "Partitioned cluster!"

			     "Our cluster: %s other cluster: %s",

			     buf1, buf2);

      }
@@ -2813,7 +2814,6 @@ void Qmgr::failReportLab(Signal* signal, Uint16 aFailedNode, 
      {

	jam();

	BaseString::snprintf(extra, sizeof(extra),

			     "Partitioned cluster!"

			     "Our cluster: %s", buf1);

      }

      msg = extra;

ndb/src/kernel/error/ndbd_exit_codes.c

+2 −0
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ static const ErrStruct errArray[] = 
   {NDBD_EXIT_ARBIT_SHUTDOWN, XAE, "Node lost connection to other nodes and "

    "can not form a unpartitioned cluster, please investigate if there are "

    "error(s) on other node(s)"},

   {NDBD_EXIT_PARTITIONED_SHUTDOWN, XAE, "Partitioned cluster detected. "

    "Please check if cluster is already running"},

   {NDBD_EXIT_POINTER_NOTINRANGE, XIE, "Pointer too large"},

   {NDBD_EXIT_SR_OTHERNODEFAILED, XRE, "Another node failed during system "

    "restart, please investigate error(s) on other node(s)"},

ndb/src/ndbapi/DictCache.cpp

+8 −5
Original line number Diff line number Diff line
@@ -325,6 +325,8 @@ GlobalDictCache::invalidate_all() 
    if (vers->size())

    {

      TableVersion * ver = & vers->back();

      if (ver->m_status != RETREIVING)

      {

        ver->m_impl->m_status = NdbDictionary::Object::Invalid;

        ver->m_status = DROPPED;

        if (ver->m_refCount == 0)
@@ -333,6 +335,7 @@ GlobalDictCache::invalidate_all() 
          vers->erase(vers->size() - 1);

        }

      }

    }

    curr = m_tableHash.getNext(curr);

  }

  DBUG_VOID_RETURN;