Commit d6b48592 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 

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


ndb/src/ndbapi/ndberror.c:
  Auto merged
parents 70a087e5 f62bb051

ndb/src/common/transporter/TransporterRegistry.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1322,7 +1322,7 @@ TransporterRegistry::start_clients_thread() 
	      else

	      {

		ndbout_c("Management server closed connection early. "

			 "It is probably being shut down (or has crashed). "

			 "It is probably being shut down (or has problems). "

			 "We will retry the connection.");

	      }

	    }

ndb/src/kernel/blocks/dbdih/DbdihMain.cpp

+1 −1
Original line number Diff line number Diff line
@@ -8354,7 +8354,7 @@ Dbdih::resetReplicaSr(TabRecordPtr tabPtr){ 
	     *--------_----------------------------------------------------- */

	    const Uint32 nextCrashed = noCrashedReplicas + 1;

	    replicaPtr.p->noCrashedReplicas = nextCrashed;

	    arrGuard(nextCrashed, 8);

	    arrGuardErr(nextCrashed, 8, NDBD_EXIT_MAX_CRASHED_REPLICAS);

	    replicaPtr.p->createGci[nextCrashed] = newestRestorableGCI + 1;

	    ndbrequire(newestRestorableGCI + 1 != 0xF1F1F1F1);

	    replicaPtr.p->replicaLastGci[nextCrashed] = (Uint32)-1;

ndb/src/kernel/blocks/dblqh/DblqhMain.cpp

+2 −1
Original line number Diff line number Diff line
@@ -17989,7 +17989,8 @@ void Dblqh::stepAhead(Signal* signal, Uint32 stepAheadWords) 
    logFilePtr.p->currentLogpage = logPagePtr.p->logPageWord[ZNEXT_PAGE];

    logPagePtr.i = logPagePtr.p->logPageWord[ZNEXT_PAGE];

    logFilePtr.p->currentFilepage++;

    ptrCheckGuard(logPagePtr, clogPageFileSize, logPageRecord);

    ptrCheckGuardErr(logPagePtr, clogPageFileSize, logPageRecord,

                     NDBD_EXIT_SR_REDOLOG);

    logPagePtr.p->logPageWord[ZCURR_PAGE_INDEX] = ZPAGE_HEADER_SIZE;

    logPartPtr.p->execSrPagesRead--;

    logPartPtr.p->execSrPagesExecuted++;

ndb/src/kernel/error/ndbd_exit_codes.c

+4 −3
Original line number Diff line number Diff line
@@ -51,8 +51,9 @@ static const ErrStruct errArray[] = 
   {NDBD_EXIT_SYSTEM_ERROR, XIE,

    "System error, node killed during node restart by other node"},

   {NDBD_EXIT_INDEX_NOTINRANGE, XIE, "Array index out of range"},

   {NDBD_EXIT_ARBIT_SHUTDOWN, XAE, "Arbitrator shutdown, "

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

   {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_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)"},
@@ -94,7 +95,7 @@ static const ErrStruct errArray[] = 
   {NDBD_EXIT_WATCHDOG_TERMINATE, XIE, "WatchDog terminate, internal error "

    "or massive overload on the machine running this node"},

   {NDBD_EXIT_SIGNAL_LOST_SEND_BUFFER_FULL, XCR,

    "Signal lost, out of send buffer memory, please increase SendBufferMemory"},

    "Signal lost, out of send buffer memory, please increase SendBufferMemory or lower the load"},

   {NDBD_EXIT_SIGNAL_LOST,    XIE, "Signal lost (unknown reason)"},

   {NDBD_EXIT_ILLEGAL_SIGNAL, XIE,

    "Illegal signal (version mismatch a possibility)"},

ndb/src/ndbapi/ndberror.c

+1 −0
Original line number Diff line number Diff line
@@ -266,6 +266,7 @@ ErrorBundle ErrorCodes[] = { 
  /**

   * Application error

   */

  { 763,  AE, "Alter table requires cluster nodes to have exact same version" },

  { 823,  AE, "Too much attrinfo from application in tuple manager" },

  { 831,  AE, "Too many nullable/bitfields in table definition" },

  { 876,  AE, "876" },