diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2005-10-05 16:35:28 +0200 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2005-10-05 16:35:28 +0200 |
| commit | e97a9d59901c6851bd99a5a517bf27b94d02e1f8 (patch) | |
| tree | 4dac44a533681b7b7a17dc8f1bd0d7159c52d68d /ndb/include | |
| parent | c54cb75c2ebcfb9c67c8bfca5a1c75140aac6a51 (diff) | |
| download | mariadb-git-e97a9d59901c6851bd99a5a517bf27b94d02e1f8.tar.gz | |
Bug #11749 No message slogan found for Signal 8 received. (need better message)
+ revised error messages after feedback
+ revides classifications and status
+ removed all progError(..0..) to make sure all error invocations have an error code
+ added some new error codes to replace some generic usage of SYSTEM_ERROR
+ removed some unused codes
configure.in:
Bug #11749 No message slogan found for Signal 8 received. (need better message)
ndb/include/kernel/signaldata/SystemError.hpp:
+ removed some unused codes
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
+ removed all progError(..0..) to make sure all error invocations have an error code
ndb/src/kernel/main.cpp:
Bug #11749 No message slogan found for Signal 8 received. (need better message)
Diffstat (limited to 'ndb/include')
| -rw-r--r-- | ndb/include/kernel/signaldata/SystemError.hpp | 3 | ||||
| -rw-r--r-- | ndb/include/mgmapi/ndbd_exit_codes.h | 25 |
2 files changed, 17 insertions, 11 deletions
diff --git a/ndb/include/kernel/signaldata/SystemError.hpp b/ndb/include/kernel/signaldata/SystemError.hpp index 7b4d47c5c2e..c2c51e88bf2 100644 --- a/ndb/include/kernel/signaldata/SystemError.hpp +++ b/ndb/include/kernel/signaldata/SystemError.hpp @@ -41,10 +41,7 @@ public: STATIC_CONST( SignalLength = 4 ); enum ErrorCode { - ScanfragStateError = 1, - ScanfragTimeout = 2, GCPStopDetected = 3, - StartInProgressError = 4, CopyFragRefError = 5, TestStopOnError = 6 }; diff --git a/ndb/include/mgmapi/ndbd_exit_codes.h b/ndb/include/mgmapi/ndbd_exit_codes.h index afce6c16504..794329ce637 100644 --- a/ndb/include/mgmapi/ndbd_exit_codes.h +++ b/ndb/include/mgmapi/ndbd_exit_codes.h @@ -44,8 +44,7 @@ typedef enum ndbd_exit_st_unknown = 1, ndbd_exit_st_permanent = 2, ndbd_exit_st_temporary = 3, - ndbd_exit_st_temporary_i = 4, - ndbd_exit_st_bug = 5 + ndbd_exit_st_filesystem_error = 4 } ndbd_exit_status_enum; typedef enum @@ -58,7 +57,8 @@ typedef enum ndbd_exit_cl_restart_error = 5, ndbd_exit_cl_resource_configuration_error = 6, ndbd_exit_cl_filesystem_full_error = 7, - ndbd_exit_cl_filesystem_inconsistency_error = 8 + ndbd_exit_cl_filesystem_inconsistency_error = 8, + ndbd_exit_cl_filesystem_limit = 9 } ndbd_exit_classification_enum; typedef ndbd_exit_status_enum ndbd_exit_status; @@ -93,15 +93,24 @@ typedef ndbd_exit_classification_enum ndbd_exit_classification; #define NDBD_EXIT_INVALID_CONFIG 2350 #define NDBD_EXIT_OUT_OF_LONG_SIGNAL_MEMORY 2351 -/* VM 6000-> */ -#define NDBD_EXIT_WATCHDOG_TERMINATE 6000 -#define NDBD_EXIT_SIGNAL_LOST 6001 -#define NDBD_EXIT_SIGNAL_LOST_SEND_BUFFER_FULL 6002 -#define NDBD_EXIT_ILLEGAL_SIGNAL 6003 +#define NDBD_EXIT_OS_SIGNAL_RECEIVED 6000 + +/* VM 6050-> */ +#define NDBD_EXIT_WATCHDOG_TERMINATE 6050 +#define NDBD_EXIT_SIGNAL_LOST 6051 +#define NDBD_EXIT_SIGNAL_LOST_SEND_BUFFER_FULL 6052 +#define NDBD_EXIT_ILLEGAL_SIGNAL 6053 + +/* NDBCNTR 6100-> */ +#define NDBD_EXIT_RESTART_TIMEOUT 6100 /* TC 6200-> */ /* DIH 6300-> */ #define NDBD_EXIT_MAX_CRASHED_REPLICAS 6300 +#define NDBD_EXIT_MASTER_FAILURE_DURING_NR 6301 +#define NDBD_EXIT_LOST_NODE_GROUP 6302 +#define NDBD_EXIT_NO_RESTORABLE_REPLICA 6303 + /* ACC 6600-> */ #define NDBD_EXIT_SR_OUT_OF_INDEXMEMORY 6600 /* TUP 6800-> */ |