Commit 2b6b6164 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 

into poseidon.(none):/home/tomas/mysql-4.1
parents d8e4cad7 504c2f45

extra/perror.c

+2 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ static struct my_option my_long_options[] = 
   NO_ARG, 0, 0, 0, 0, 0, 0},

#ifdef HAVE_NDBCLUSTER_DB

  {"ndb", 0, "Ndbcluster storage engine specific error codes.",  (gptr*) &ndb_code,

   (gptr*) &ndb_code, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},

   (gptr*) &ndb_code, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},

#endif

#ifdef HAVE_SYS_ERRLIST

  {"all", 'a', "Print all the error messages and the number.",
@@ -222,7 +222,7 @@ int main(int argc,char *argv[]) 
#ifdef HAVE_NDBCLUSTER_DB

      if (ndb_code)

      {

	if (ndb_error_string(code, ndb_string, 1024) < 0)

	if (ndb_error_string(code, ndb_string,  sizeof(ndb_string)) < 0)

	  msg= 0;

	else

	  msg= ndb_string;

sql/Makefile.am

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \ 
                        @innodb_system_libs@ \

			@ndbcluster_libs@ @ndbcluster_system_libs@ \

			$(LDADD)  $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ @openssl_libs@

mysqld_DEPENDENCIES = 	@ndbcluster_libs@ @ndbcluster_system_libs@

noinst_HEADERS =	item.h item_func.h item_sum.h item_cmpfunc.h \

			item_strfunc.h item_timefunc.h item_uniq.h \

			item_create.h item_subselect.h item_row.h \