diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-07-26 14:09:20 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-07-26 14:09:20 +0200 |
| commit | de41f4e7bb0582101e4e1c8343962fa31bbe549e (patch) | |
| tree | 328d27d08b707854347a0457312e5c1ee8517dbd /ndb | |
| parent | 0227a7b066bc64a05ab81dc8859227545829a386 (diff) | |
| download | mariadb-git-de41f4e7bb0582101e4e1c8343962fa31bbe549e.tar.gz | |
Bug#16561 Unknown ERROR msg "ERROR 1186 (HY000): Binlog closed" by perror
- Since error 1186 is not found among NDB error codes, the message retuned should indicate that.
extra/perror.c:
Move the !found out one level
mysql-test/t/perror.test:
Add test case for bug#16561
ndb/src/kernel/error/ndbd_exit_codes.c:
Check not only for zero size string but also classification "unknown error" when looking for an error mesage for an error code
Diffstat (limited to 'ndb')
| -rw-r--r-- | ndb/src/kernel/error/ndbd_exit_codes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ndb/src/kernel/error/ndbd_exit_codes.c b/ndb/src/kernel/error/ndbd_exit_codes.c index 07b276346a0..cb3272b38a9 100644 --- a/ndb/src/kernel/error/ndbd_exit_codes.c +++ b/ndb/src/kernel/error/ndbd_exit_codes.c @@ -247,7 +247,7 @@ int ndbd_exit_string(int err_no, char *str, unsigned int size) ndbd_exit_classification cl; ndbd_exit_status st; const char *msg = ndbd_exit_message(err_no, &cl); - if (msg[0] != '\0') + if (msg[0] != '\0' && cl != XUE) { const char *cl_msg = ndbd_exit_classification_message(cl, &st); const char *st_msg = ndbd_exit_status_message(st); |