Commit ab0e66a8 authored by unknown's avatar unknown
Browse files

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

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
parents fb074e38 f2e74338

storage/ndb/include/mgmapi/ndbd_exit_codes.h

+4 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ typedef ndbd_exit_classification_enum ndbd_exit_classification; 
#define NDBD_EXIT_SR_RESTARTCONFLICT          2311

#define NDBD_EXIT_NO_MORE_UNDOLOG             2312 

#define NDBD_EXIT_SR_UNDOLOG                  2313 

#define NDBD_EXIT_SR_SCHEMAFILE               2310

#define NDBD_EXIT_MEMALLOC                    2327

#define NDBD_EXIT_BLOCK_JBUFCONGESTION        2334

#define NDBD_EXIT_TIME_QUEUE_SHORT            2335
@@ -91,6 +92,9 @@ typedef ndbd_exit_classification_enum ndbd_exit_classification; 
#define NDBD_EXIT_INVALID_CONFIG              2350

#define NDBD_EXIT_OUT_OF_LONG_SIGNAL_MEMORY   2351



/* Errorcodes for fatal resource errors */

#define NDBD_EXIT_RESOURCE_ALLOC_ERROR        2500



#define NDBD_EXIT_OS_SIGNAL_RECEIVED          6000



/* VM 6050-> */

storage/ndb/src/common/transporter/TransporterRegistry.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1319,7 +1319,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.");

	      }

	    }

storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp

+3 −2
Original line number Diff line number Diff line
@@ -1355,10 +1355,11 @@ void Dbdict::readSchemaConf(Signal* signal, 
      sf->FileSize == sf0->FileSize &&

      sf->PageNumber == n &&

      computeChecksum((Uint32*)sf, NDB_SF_PAGE_SIZE_IN_WORDS) == 0;

    ndbrequire(ok || !crashInd);

    ndbrequireErr(ok || !crashInd, NDBD_EXIT_SR_SCHEMAFILE);

    if (! ok) {

      jam();

      ndbrequire(fsPtr.p->fsState == FsConnectRecord::READ_SCHEMA1);

      ndbrequireErr(fsPtr.p->fsState == FsConnectRecord::READ_SCHEMA1,

                    NDBD_EXIT_SR_SCHEMAFILE);

      readSchemaRef(signal, fsPtr);

      return;

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -8606,7 +8606,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;

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

+2 −1
Original line number Diff line number Diff line
@@ -17839,7 +17839,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++;