diff options
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/perror.c | 8 | ||||
| -rw-r--r-- | extra/resolveip.c | 5 |
2 files changed, 10 insertions, 3 deletions
diff --git a/extra/perror.c b/extra/perror.c index e22ce467949..a2951bff66a 100644 --- a/extra/perror.c +++ b/extra/perror.c @@ -59,8 +59,10 @@ static HA_ERRORS ha_errlist[]= { 121,"Duplicate key on write or update" }, { 123,"Someone has changed the row since it was read; Update with is recoverable" }, { 124,"Wrong index given to function" }, - { 126,"Index file is crashed / Wrong file format" }, + { 126,"Index file is crashed" }, { 127,"Record-file is crashed" }, + { 128,"Out of memory" }, + { 130,"Incorrect file format" }, { 131,"Command not supported by database" }, { 132,"Old database file" }, { 133,"No record read before update" }, @@ -73,7 +75,7 @@ static HA_ERRORS ha_errlist[]= { 140,"Wrong create options"}, { 141,"Duplicate unique key or constraint on write or update"}, { 142,"Unknown character set used"}, - { 143,"Conflicting table definition between MERGE and mapped table"}, + { 143,"Conflicting table definitions in sub-tables of MERGE table"}, { 144,"Table is crashed and last repair failed"}, { 145,"Table was marked as crashed and should be repaired"}, { 146,"Lock timed out; Retry transaction"}, @@ -81,6 +83,8 @@ static HA_ERRORS ha_errlist[]= { 148,"Updates are not allowed under a read only transactions"}, { 149,"Lock deadlock; Retry transaction"}, { 150,"Foreign key constraint is incorrectly formed"}, + { 151,"Cannot add a child row"}, + { 152,"Cannot delete a parent row"}, { -30999, "DB_INCOMPLETE: Sync didn't finish"}, { -30998, "DB_KEYEMPTY: Key/data deleted or never created"}, { -30997, "DB_KEYEXIST: The key/data pair already exists"}, diff --git a/extra/resolveip.c b/extra/resolveip.c index 17bf087bd19..c9446b0fdf2 100644 --- a/extra/resolveip.c +++ b/extra/resolveip.c @@ -16,7 +16,7 @@ /* Resolves IP's to hostname and hostnames to IP's */ -#define RESOLVE_VERSION "2.2" +#define RESOLVE_VERSION "2.3" #include <my_global.h> #include <m_ctype.h> @@ -147,8 +147,11 @@ int main(int argc, char **argv) else { printf ("Host name of %s is %s", ip,hpaddr->h_name); +#ifndef __NETWARE__ + /* this information is not available on NetWare */ for (q = hpaddr->h_aliases; *q != 0; q++) (void) printf(", %s", *q); +#endif /* __NETWARE__ */ puts(""); } } |