diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2005-10-06 10:59:58 +0200 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2005-10-06 10:59:58 +0200 |
| commit | 95b16dfa1d604854fbd4906a560f0808f48d3708 (patch) | |
| tree | cd4f07ed238e9d8f6fef333c688723e2a4193ec5 /extra | |
| parent | 3c2dca475dfa91c95f2488831fafacacaf852347 (diff) | |
| parent | e97a9d59901c6851bd99a5a517bf27b94d02e1f8 (diff) | |
| download | mariadb-git-95b16dfa1d604854fbd4906a560f0808f48d3708.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
ndb/src/mgmsrv/Services.cpp:
Auto merged
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/perror.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/extra/perror.c b/extra/perror.c index dedd558e4cf..919088ba42e 100644 --- a/extra/perror.c +++ b/extra/perror.c @@ -25,6 +25,7 @@ #include <my_getopt.h> #ifdef HAVE_NDBCLUSTER_DB #include "../ndb/src/ndbapi/ndberror.c" +#include "../ndb/src/kernel/error/ndbd_exit_codes.c" #endif static my_bool verbose, print_all_codes; @@ -235,8 +236,11 @@ int main(int argc,char *argv[]) #ifdef HAVE_NDBCLUSTER_DB if (ndb_code) { - if (ndb_error_string(code, ndb_string, sizeof(ndb_string)) < 0) - msg= 0; + if ((ndb_error_string(code, ndb_string, sizeof(ndb_string)) < 0) && + (ndbd_exit_string(code, ndb_string, sizeof(ndb_string)) < 0)) + { + msg= 0; + } else msg= ndb_string; } |