Commit fa2673f1 authored by unknown's avatar unknown
Browse files

Bug #17297 Fix error messages

parent c782aadd

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/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/error/ndbd_exit_codes.c

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ static const ErrStruct errArray[] = 
   {NDBD_EXIT_NODE_NOT_DEAD, XRE, "Internal node state conflict, "

    "most probably resolved by restarting node again"},

   {NDBD_EXIT_SR_REDOLOG, XFI, "Error while reading the REDO log"},

   {NDBD_EXIT_SR_SCHEMAFILE, XFI, "Error while reading the schema file"},

   /* Currently unused? */

   {2311, XIE, "Conflict when selecting restart type"},

   {NDBD_EXIT_NO_MORE_UNDOLOG, XCR,

storage/ndb/src/ndbapi/ndberror.c

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

   * SchemaError

   */

  { 311,  DMEC, IE, "Undefined fragment" },

  { 703,  DMEC, SE, "Invalid table format" },

  { 704,  DMEC, SE, "Attribute name too long" },

  { 705,  DMEC, SE, "Table name too long" },