Below is the list of changes that have just been committed into a local
5.0 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2007-05-15 08:34:39+02:00, tomas@stripped +3 -0
#26906 No message slogan found
- added errormessage and code for "declaring node dead"
ndb/include/mgmapi/ndbd_exit_codes.h@stripped, 2007-05-15 08:34:36+02:00, tomas@stripped +1 -0
#26906 No message slogan found
- added errormessage and code for "declaring node dead"
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp@stripped, 2007-05-15 08:34:36+02:00, tomas@stripped +1 -1
#26906 No message slogan found
- added errormessage and code for "declaring node dead"
ndb/src/kernel/error/ndbd_exit_codes.c@stripped, 2007-05-15 08:34:36+02:00, tomas@stripped +2 -0
#26906 No message slogan found
- added errormessage and code for "declaring node dead"
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: tomas
# Host: whalegate.ndb.mysql.com
# Root: /home/tomas/mysql-5.0-ndb
--- 1.42/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp 2007-02-22 19:33:58 +01:00
+++ 1.43/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp 2007-05-15 08:34:36 +02:00
@@ -2816,7 +2816,7 @@
if (failedNodePtr.i == getOwnNodeId()) {
jam();
- Uint32 code = 0;
+ Uint32 code = NDBD_EXIT_NODE_DECLARED_DEAD;
const char * msg = 0;
char extra[100];
switch(aFailCause){
--- 1.12/ndb/include/mgmapi/ndbd_exit_codes.h 2006-12-23 20:04:10 +01:00
+++ 1.13/ndb/include/mgmapi/ndbd_exit_codes.h 2007-05-15 08:34:36 +02:00
@@ -79,6 +79,7 @@
#define NDBD_EXIT_NO_MORE_UNDOLOG 2312
#define NDBD_EXIT_SR_UNDOLOG 2313
#define NDBD_EXIT_SINGLE_USER_MODE 2314
+#define NDBD_EXIT_NODE_DECLARED_DEAD 2315
#define NDBD_EXIT_MEMALLOC 2327
#define NDBD_EXIT_BLOCK_JBUFCONGESTION 2334
#define NDBD_EXIT_TIME_QUEUE_SHORT 2335
--- 1.15/ndb/src/kernel/error/ndbd_exit_codes.c 2006-12-23 20:04:16 +01:00
+++ 1.16/ndb/src/kernel/error/ndbd_exit_codes.c 2007-05-15 08:34:36 +02:00
@@ -57,6 +57,8 @@
"error(s) on other node(s)"},
{NDBD_EXIT_PARTITIONED_SHUTDOWN, XAE, "Partitioned cluster detected. "
"Please check if cluster is already running"},
+ {NDBD_EXIT_NODE_DECLARED_DEAD, XAE,
+ "Node declared dead. See error log for details"},
{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)"},
| Thread |
|---|
| • bk commit into 5.0 tree (tomas:1.2486) | tomas | 15 May |