diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2008-03-28 18:45:03 +0200 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2008-03-28 18:45:03 +0200 |
| commit | d5a6fa7e8c84b424ca38aaf27e08a3371cb8d32c (patch) | |
| tree | 4711cd6d2ffea0a95e9b60ca57e1ad8c9a490ff9 /include/my_base.h | |
| parent | 1d9f9abce36a81c8e6a9751940ff292a1ca15e2a (diff) | |
| download | mariadb-git-d5a6fa7e8c84b424ca38aaf27e08a3371cb8d32c.tar.gz | |
Fixed problem with non-synchronous error lists
in perror and handler descriptors (BUG#25177)
Fixed problem of masking mysql error by system
error in perror (BUG#23028)
extra/perror.c:
Used common handlers error list.
Fixed BUG#23028 ignoring mysql error in case of
OS and mysql error codes overlapping.
include/my_base.h:
Added errors of maria engine.
Fixed incorrect comment in #define (can be cause of
seriouse problems)
include/my_handler.h:
Added ability to be included into C++ code.
mysys/my_handler.c:
Error texts moved to the separate files.
mysys/my_handler_errors.h:
New BitKeeper file ``mysys/my_handler_errors.h''
Diffstat (limited to 'include/my_base.h')
| -rw-r--r-- | include/my_base.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/my_base.h b/include/my_base.h index e4f59648fcd..22f518b0f9a 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -375,6 +375,7 @@ enum ha_base_keytype { #define HA_ERR_KEY_NOT_FOUND 120 /* Didn't find key on read or update */ #define HA_ERR_FOUND_DUPP_KEY 121 /* Dupplicate key on write */ +#define HA_ERR_INTERNAL_ERROR 122 /* Internal error */ #define HA_ERR_RECORD_CHANGED 123 /* Uppdate with is recoverable */ #define HA_ERR_WRONG_INDEX 124 /* Wrong index given to function */ #define HA_ERR_CRASHED 126 /* Indexfile is crashed */ @@ -411,8 +412,8 @@ enum ha_base_keytype { /* NULLs are not supported in spatial index */ #define HA_ERR_NULL_IN_SPATIAL 158 #define HA_ERR_TABLE_DEF_CHANGED 159 /* The table changed in storage engine */ -#define HA_ERR_NO_PARTITION_FOUND 160 /* There's no partition in table for - given value */ +/* There's no partition in table for given value */ +#define HA_ERR_NO_PARTITION_FOUND 160 #define HA_ERR_RBR_LOGGING_FAILED 161 /* Row-based binlogging of row failed */ #define HA_ERR_DROP_INDEX_FK 162 /* Index needed in foreign key constr */ /* @@ -437,7 +438,10 @@ enum ha_base_keytype { #define HA_ERR_NEW_FILE 172 /* New file format */ #define HA_ERR_ROWS_EVENT_APPLY 173 /* The event could not be processed no other hanlder error happened */ -#define HA_ERR_LAST 173 /* Copy of last error nr */ +#define HA_ERR_INITIALIZATION 174 /* Error during initialization */ +#define HA_ERR_FILE_TOO_SHORT 175 /* File too short */ +#define HA_ERR_WRONG_CRC 176 /* Wrong CRC on page */ +#define HA_ERR_LAST 176 /* Copy of last error nr */ /* Number of different errors */ #define HA_ERR_ERRORS (HA_ERR_LAST - HA_ERR_FIRST + 1) |