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
This commit is contained in:
unknown
commit
ab0e66a82b
@ -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-> */
|
||||
|
||||
@ -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.");
|
||||
}
|
||||
}
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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++;
|
||||
|
||||
@ -410,7 +410,22 @@ Suma::createSequenceReply(Signal* signal,
|
||||
jam();
|
||||
|
||||
if (ref != NULL)
|
||||
{
|
||||
switch ((UtilSequenceRef::ErrorCode)ref->errorCode)
|
||||
{
|
||||
case UtilSequenceRef::NoSuchSequence:
|
||||
ndbrequire(false);
|
||||
case UtilSequenceRef::TCError:
|
||||
{
|
||||
char buf[128];
|
||||
snprintf(buf, sizeof(buf),
|
||||
"Startup failed during sequence creation. TC error %d",
|
||||
ref->TCErrorCode);
|
||||
progError(__LINE__, NDBD_EXIT_RESOURCE_ALLOC_ERROR, buf);
|
||||
}
|
||||
}
|
||||
ndbrequire(false);
|
||||
}
|
||||
|
||||
sendSTTORRY(signal);
|
||||
}
|
||||
|
||||
@ -51,14 +51,16 @@ 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)"},
|
||||
{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,
|
||||
@ -80,6 +82,10 @@ static const ErrStruct errArray[] =
|
||||
/* this error message is complemented by additional info when generated */
|
||||
{NDBD_EXIT_INVALID_CONFIG, XCE,
|
||||
"Invalid configuration received from Management Server"},
|
||||
|
||||
{NDBD_EXIT_RESOURCE_ALLOC_ERROR, XCE,
|
||||
"Resource allocation error, please review the configuration"},
|
||||
|
||||
/* this error message is complemented by additional info when
|
||||
generated, such as signal, and text
|
||||
*/
|
||||
@ -94,7 +100,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)"},
|
||||
|
||||
@ -284,6 +284,7 @@ ErrorBundle ErrorCodes[] = {
|
||||
/**
|
||||
* Application error
|
||||
*/
|
||||
{ 763, DMEC, AE, "Alter table requires cluster nodes to have exact same version" },
|
||||
{ 823, DMEC, AE, "Too much attrinfo from application in tuple manager" },
|
||||
{ 831, DMEC, AE, "Too many nullable/bitfields in table definition" },
|
||||
{ 876, DMEC, AE, "876" },
|
||||
@ -344,6 +345,7 @@ ErrorBundle ErrorCodes[] = {
|
||||
/**
|
||||
* SchemaError
|
||||
*/
|
||||
{ 311, DMEC, AE, "Undefined partition used in setPartitionId" },
|
||||
{ 703, DMEC, SE, "Invalid table format" },
|
||||
{ 704, DMEC, SE, "Attribute name too long" },
|
||||
{ 705, DMEC, SE, "Table name too long" },
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user