Commit d1685606 authored by unknown's avatar unknown
Browse files

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
parent 51e8d273

extra/Makefile.am

+3 −0
Original line number Diff line number Diff line
@@ -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.%

extra/perror.c

+4 −4
Original line number Diff line number Diff line
@@ -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) &&