1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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


storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  manual merge
This commit is contained in:
unknown 2006-06-20 19:33:25 +02:00
commit f2e7433826
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
storage/ndb/src/common/transporter/TransporterRegistry.cpp
View File

@ -1319,7 +1319,7 @@ TransporterRegistry::start_clients_thread()
else else
{ {
ndbout_c("Management server closed connection early. " 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."); "We will retry the connection.");
} }
} }

2
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
View File

@ -8606,7 +8606,7 @@ Dbdih::resetReplicaSr(TabRecordPtr tabPtr){
*--------_----------------------------------------------------- */ *--------_----------------------------------------------------- */
const Uint32 nextCrashed = noCrashedReplicas + 1; const Uint32 nextCrashed = noCrashedReplicas + 1;
replicaPtr.p->noCrashedReplicas = nextCrashed; replicaPtr.p->noCrashedReplicas = nextCrashed;
arrGuard(nextCrashed, 8); arrGuardErr(nextCrashed, 8, NDBD_EXIT_MAX_CRASHED_REPLICAS);
replicaPtr.p->createGci[nextCrashed] = newestRestorableGCI + 1; replicaPtr.p->createGci[nextCrashed] = newestRestorableGCI + 1;
ndbrequire(newestRestorableGCI + 1 != 0xF1F1F1F1); ndbrequire(newestRestorableGCI + 1 != 0xF1F1F1F1);
replicaPtr.p->replicaLastGci[nextCrashed] = (Uint32)-1; replicaPtr.p->replicaLastGci[nextCrashed] = (Uint32)-1;

3
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
View File

@ -17839,7 +17839,8 @@ void Dblqh::stepAhead(Signal* signal, Uint32 stepAheadWords)
logFilePtr.p->currentLogpage = logPagePtr.p->logPageWord[ZNEXT_PAGE]; logFilePtr.p->currentLogpage = logPagePtr.p->logPageWord[ZNEXT_PAGE];
logPagePtr.i = logPagePtr.p->logPageWord[ZNEXT_PAGE]; logPagePtr.i = logPagePtr.p->logPageWord[ZNEXT_PAGE];
logFilePtr.p->currentFilepage++; logFilePtr.p->currentFilepage++;
ptrCheckGuard(logPagePtr, clogPageFileSize, logPageRecord); ptrCheckGuardErr(logPagePtr, clogPageFileSize, logPageRecord,
NDBD_EXIT_SR_REDOLOG);
logPagePtr.p->logPageWord[ZCURR_PAGE_INDEX] = ZPAGE_HEADER_SIZE; logPagePtr.p->logPageWord[ZCURR_PAGE_INDEX] = ZPAGE_HEADER_SIZE;
logPartPtr.p->execSrPagesRead--; logPartPtr.p->execSrPagesRead--;
logPartPtr.p->execSrPagesExecuted++; logPartPtr.p->execSrPagesExecuted++;

7
storage/ndb/src/kernel/error/ndbd_exit_codes.c
View File

@ -51,8 +51,9 @@ static const ErrStruct errArray[] =
{NDBD_EXIT_SYSTEM_ERROR, XIE, {NDBD_EXIT_SYSTEM_ERROR, XIE,
"System error, node killed during node restart by other node"}, "System error, node killed during node restart by other node"},
{NDBD_EXIT_INDEX_NOTINRANGE, XIE, "Array index out of range"}, {NDBD_EXIT_INDEX_NOTINRANGE, XIE, "Array index out of range"},
{NDBD_EXIT_ARBIT_SHUTDOWN, XAE, "Arbitrator shutdown, " {NDBD_EXIT_ARBIT_SHUTDOWN, XAE, "Node lost connection to other nodes and "
"please investigate error(s) on other node(s)"}, "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_POINTER_NOTINRANGE, XIE, "Pointer too large"},
{NDBD_EXIT_SR_OTHERNODEFAILED, XRE, "Another node failed during system " {NDBD_EXIT_SR_OTHERNODEFAILED, XRE, "Another node failed during system "
"restart, please investigate error(s) on other node(s)"}, "restart, please investigate error(s) on other node(s)"},
@ -99,7 +100,7 @@ static const ErrStruct errArray[] =
{NDBD_EXIT_WATCHDOG_TERMINATE, XIE, "WatchDog terminate, internal error " {NDBD_EXIT_WATCHDOG_TERMINATE, XIE, "WatchDog terminate, internal error "
"or massive overload on the machine running this node"}, "or massive overload on the machine running this node"},
{NDBD_EXIT_SIGNAL_LOST_SEND_BUFFER_FULL, XCR, {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_SIGNAL_LOST, XIE, "Signal lost (unknown reason)"},
{NDBD_EXIT_ILLEGAL_SIGNAL, XIE, {NDBD_EXIT_ILLEGAL_SIGNAL, XIE,
"Illegal signal (version mismatch a possibility)"}, "Illegal signal (version mismatch a possibility)"},

3
storage/ndb/src/ndbapi/ndberror.c
View File

@ -284,6 +284,7 @@ ErrorBundle ErrorCodes[] = {
/** /**
* Application error * 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" }, { 823, DMEC, AE, "Too much attrinfo from application in tuple manager" },
{ 831, DMEC, AE, "Too many nullable/bitfields in table definition" }, { 831, DMEC, AE, "Too many nullable/bitfields in table definition" },
{ 876, DMEC, AE, "876" }, { 876, DMEC, AE, "876" },
@ -344,7 +345,7 @@ ErrorBundle ErrorCodes[] = {
/** /**
* SchemaError * SchemaError
*/ */
{ 311, DMEC, IE, "Undefined fragment" }, { 311, DMEC, AE, "Undefined partition used in setPartitionId" },
{ 703, DMEC, SE, "Invalid table format" }, { 703, DMEC, SE, "Invalid table format" },
{ 704, DMEC, SE, "Attribute name too long" }, { 704, DMEC, SE, "Attribute name too long" },
{ 705, DMEC, SE, "Table name too long" }, { 705, DMEC, SE, "Table name too long" },