diff options
| author | unknown <hartmut@mysql.com> | 2005-12-05 14:17:53 +0100 |
|---|---|---|
| committer | unknown <hartmut@mysql.com> | 2005-12-05 14:17:53 +0100 |
| commit | d1685606ed61f2d3804bd4cffa8ee1a110abaf09 (patch) | |
| tree | e7eda81d3fb95b1732ece2e9be5bc4f9c91e80a8 /extra | |
| parent | 51e8d273507a6c1e5dc427b440738f5cfa33f647 (diff) | |
| download | mariadb-git-d1685606ed61f2d3804bd4cffa8ee1a110abaf09.tar.gz | |
fixed "perror --ndb" for 5.1 (bug #15486)
extra/Makefile.am:
perror needs ndb header files if ndb support is enabled
extra/perror.c:
perror.c still used HAVE_NDBCLUSTER_DB, not the new WITH_NDBCLUSTER_STORAGE_ENGINE
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/Makefile.am | 3 | ||||
| -rw-r--r-- | extra/perror.c | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/extra/Makefile.am b/extra/Makefile.am index a2b4dce374a..3a6495e514a 100644 --- a/extra/Makefile.am +++ b/extra/Makefile.am @@ -44,5 +44,8 @@ bin_PROGRAMS = replace comp_err perror resolveip my_print_defaults \ resolve_stack_dump mysql_waitpid innochecksum noinst_PROGRAMS = charset2html +perror.o: perror.c + $(COMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $< + # Don't update the files from bitkeeper %::SCCS/s.% diff --git a/extra/perror.c b/extra/perror.c index 06a42c5ec06..e82ff08ad5d 100644 --- a/extra/perror.c +++ b/extra/perror.c @@ -23,14 +23,14 @@ #include <m_string.h> #include <errno.h> #include <my_getopt.h> -#ifdef HAVE_NDBCLUSTER_DB +#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE #include "../storage/ndb/src/ndbapi/ndberror.c" #include "../storage/ndb/src/kernel/error/ndbd_exit_codes.c" #endif static my_bool verbose, print_all_codes; -#ifdef HAVE_NDBCLUSTER_DB +#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE static my_bool ndb_code; static char ndb_string[1024]; #endif @@ -41,7 +41,7 @@ static struct my_option my_long_options[] = NO_ARG, 0, 0, 0, 0, 0, 0}, {"info", 'I', "Synonym for --help.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, -#ifdef HAVE_NDBCLUSTER_DB +#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE {"ndb", 257, "Ndbcluster storage engine specific error codes.", (gptr*) &ndb_code, (gptr*) &ndb_code, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, #endif @@ -233,7 +233,7 @@ int main(int argc,char *argv[]) found=0; code=atoi(*argv); -#ifdef HAVE_NDBCLUSTER_DB +#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE if (ndb_code) { if ((ndb_error_string(code, ndb_string, sizeof(ndb_string)) < 0) && |