diff options
Diffstat (limited to 'extra')
| -rw-r--r--[-rwxr-xr-x] | extra/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | extra/Makefile.am | 15 | ||||
| -rw-r--r-- | extra/comp_err.c | 10 | ||||
| -rw-r--r-- | extra/perror.c | 12 | ||||
| -rw-r--r-- | extra/resolveip.c | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | extra/yassl/CMakeLists.txt | 0 | ||||
| -rw-r--r-- | extra/yassl/Makefile.am | 3 | ||||
| -rw-r--r--[-rwxr-xr-x] | extra/yassl/taocrypt/CMakeLists.txt | 0 | ||||
| -rw-r--r-- | extra/yassl/taocrypt/Makefile.am | 2 |
9 files changed, 24 insertions, 22 deletions
diff --git a/extra/CMakeLists.txt b/extra/CMakeLists.txt index f768c7b1045..5ce2f7b02ab 100755..100644 --- a/extra/CMakeLists.txt +++ b/extra/CMakeLists.txt @@ -38,7 +38,7 @@ ADD_CUSTOM_TARGET(GenError DEPENDS ${PROJECT_SOURCE_DIR}/include/mysqld_error.h) ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) -TARGET_LINK_LIBRARIES(my_print_defaults strings mysys dbug taocrypt wsock32) +TARGET_LINK_LIBRARIES(my_print_defaults strings mysys dbug taocrypt odbc32 odbccp32 wsock32) ADD_EXECUTABLE(perror perror.c) TARGET_LINK_LIBRARIES(perror strings mysys dbug wsock32) diff --git a/extra/Makefile.am b/extra/Makefile.am index 1448962e427..1ea0b7ddb38 100644 --- a/extra/Makefile.am +++ b/extra/Makefile.am @@ -14,7 +14,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ - @ndbcluster_includes@ -I$(top_srcdir)/sql + -I$(top_srcdir)/sql LDADD = @CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \ ../dbug/libdbug.a ../strings/libmystrings.a BUILT_SOURCES= $(top_builddir)/include/mysqld_error.h \ @@ -22,10 +22,7 @@ BUILT_SOURCES= $(top_builddir)/include/mysqld_error.h \ $(top_builddir)/include/mysqld_ername.h pkginclude_HEADERS= $(BUILT_SOURCES) DISTCLEANFILES = $(BUILT_SOURCES) -# We never use SUBDIRS here, but needed for automake 1.6.3 -# to generate code to handle DIST_SUBDIRS -SUBDIRS= -DIST_SUBDIRS= yassl +SUBDIRS = @yassl_dir@ # This will build mysqld_error.h, mysqld_ername.h and sql_state.h # NOTE Built files should depend on their sources to avoid @@ -43,10 +40,14 @@ $(top_builddir)/include/mysqld_error.h: comp_err.c \ $(top_builddir)/include/mysqld_ername.h: $(top_builddir)/include/mysqld_error.h $(top_builddir)/include/sql_state.h: $(top_builddir)/include/mysqld_error.h -bin_PROGRAMS = replace comp_err perror resolveip my_print_defaults \ +bin_PROGRAMS = replace perror resolveip my_print_defaults \ resolve_stack_dump mysql_waitpid innochecksum noinst_PROGRAMS = charset2html -EXTRA_DIST = CMakeLists.txt +EXTRA_PROGRAMS = comp_err +EXTRA_DIST = CMakeLists.txt + +perror.o: perror.c + $(COMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $< # Don't update the files from bitkeeper %::SCCS/s.% diff --git a/extra/comp_err.c b/extra/comp_err.c index df6df1678a6..00aab96454e 100644 --- a/extra/comp_err.c +++ b/extra/comp_err.c @@ -187,9 +187,9 @@ int main(int argc, char *argv[]) DBUG_RETURN(1); } clean_up(lang_head, error_head); - DBUG_LEAVE; /* we can't call my_end after DBUG_RETURN */ + DBUG_LEAVE; /* Can't use dbug after my_end() */ my_end(info_flag ? MY_CHECK_ERROR | MY_GIVE_INFO : 0); - return(0); + return 0; } } @@ -638,7 +638,7 @@ static char *get_word(char **str) DBUG_ENTER("get_word"); *str= find_end_of_word(start); - DBUG_RETURN(my_strdup_with_length(start, (uint) (*str - start), + DBUG_RETURN(my_strndup(start, (uint) (*str - start), MYF(MY_WME | MY_FAE))); } @@ -672,7 +672,7 @@ static struct message *parse_message_string(struct message *new_message, while (*str != ' ' && *str != '\t' && *str) str++; if (!(new_message->lang_short_name= - my_strdup_with_length(start, (uint) (str - start), + my_strndup(start, (uint) (str - start), MYF(MY_WME | MY_FAE)))) DBUG_RETURN(0); /* Fatal error */ DBUG_PRINT("info", ("msg_slang: %s", new_message->lang_short_name)); @@ -692,7 +692,7 @@ static struct message *parse_message_string(struct message *new_message, start= str + 1; str= parse_text_line(start); - if (!(new_message->text= my_strdup_with_length(start, (uint) (str - start), + if (!(new_message->text= my_strndup(start, (uint) (str - start), MYF(MY_WME | MY_FAE)))) DBUG_RETURN(0); /* Fatal error */ DBUG_PRINT("info", ("msg_text: %s", new_message->text)); diff --git a/extra/perror.c b/extra/perror.c index 4d19f4dd7eb..c49869be681 100644 --- a/extra/perror.c +++ b/extra/perror.c @@ -22,14 +22,14 @@ #include <m_string.h> #include <errno.h> #include <my_getopt.h> -#ifdef HAVE_NDBCLUSTER_DB -#include "../ndb/src/ndbapi/ndberror.c" -#include "../ndb/src/kernel/error/ndbd_exit_codes.c" +#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 @@ -40,7 +40,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 @@ -235,7 +235,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) && diff --git a/extra/resolveip.c b/extra/resolveip.c index 1061cafe380..5bbecab5e6b 100644 --- a/extra/resolveip.c +++ b/extra/resolveip.c @@ -31,7 +31,7 @@ #include <my_net.h> #include <my_getopt.h> -#if !defined(_AIX) && !defined(HAVE_UNIXWARE7_THREADS) && !defined(HAVE_UNIXWARE7_POSIX) && !defined(h_errno) +#if !defined(_AIX) && !defined(h_errno) extern int h_errno; #endif diff --git a/extra/yassl/CMakeLists.txt b/extra/yassl/CMakeLists.txt index 5cc97f22a36..5cc97f22a36 100755..100644 --- a/extra/yassl/CMakeLists.txt +++ b/extra/yassl/CMakeLists.txt diff --git a/extra/yassl/Makefile.am b/extra/yassl/Makefile.am index 35946e002c4..1c0e13c511a 100644 --- a/extra/yassl/Makefile.am +++ b/extra/yassl/Makefile.am @@ -1,5 +1,6 @@ SUBDIRS = taocrypt src testsuite -EXTRA_DIST = yassl.dsp yassl.dsw CMakeLists.txt +EXTRA_DIST = yassl.dsp yassl.dsw yassl.vcproj \ + CMakeLists.txt # Don't update the files from bitkeeper %::SCCS/s.% diff --git a/extra/yassl/taocrypt/CMakeLists.txt b/extra/yassl/taocrypt/CMakeLists.txt index baa8f97dff6..baa8f97dff6 100755..100644 --- a/extra/yassl/taocrypt/CMakeLists.txt +++ b/extra/yassl/taocrypt/CMakeLists.txt diff --git a/extra/yassl/taocrypt/Makefile.am b/extra/yassl/taocrypt/Makefile.am index c03c1a2713b..ac56cfdcf09 100644 --- a/extra/yassl/taocrypt/Makefile.am +++ b/extra/yassl/taocrypt/Makefile.am @@ -1,5 +1,5 @@ SUBDIRS = src test benchmark -EXTRA_DIST = taocrypt.dsw taocrypt.dsp CMakeLists.txt $(wildcard mySTL/*.hpp) +EXTRA_DIST = taocrypt.dsw taocrypt.dsp taocrypt.vcproj CMakeLists.txt $(wildcard mySTL/*.hpp) # Don't update the files from bitkeeper %::SCCS/s.% |