bk commit into 5.1 tree (hartmut:1.1951) BUG#15486

['Hartmut Holzgraefe']

Below is the list of changes that have just been committed into a local
5.1 repository of hartmut. When hartmut does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1951 05/12/05 14:17:53 hartmut@stripped +2 -0
  fixed "perror --ndb" for 5.1 (bug #15486)

  extra/perror.c
    1.45 05/12/05 14:17:39 hartmut@stripped +4 -4
    perror.c still used HAVE_NDBCLUSTER_DB, not the new WITH_NDBCLUSTER_STORAGE_ENGINE

  extra/Makefile.am
    1.33 05/12/05 14:17:39 hartmut@stripped +3 -0
    perror needs ndb header files if ndb support is enabled

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	hartmut
# Host:	linux.site
# Root:	/home/hartmut/projects/mysql/dev/5.1

--- 1.32/extra/Makefile.am	2005-11-23 13:04:05 +01:00
+++ 1.33/extra/Makefile.am	2005-12-05 14:17:39 +01:00
@@ -44,5 +44,8 @@
 			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.%

--- 1.44/extra/perror.c	2005-10-07 01:07:49 +02:00
+++ 1.45/extra/perror.c	2005-12-05 14:17:39 +01:00
@@ -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 @@
    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 @@
 
       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) &&