From bea887e6636860bfc0f4dd965173ac72d6cfef0c Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Tue, 3 Apr 2012 15:48:56 +0300 Subject: Define dummy my_init_stacktrace() to allow one to call it without #ifdef HAVE_STACKTRACE Fixed compilation problem on windows. configure.cmake: Added test for pthread_attr_getguardsize include/my_stacktrace.h: Define dummy my_init_stacktrace() to allow one to call it without #ifdef HAVE_STACKTRACE sql/mysqld.cc: Move my_setstacksize() to fix compilation problem on windows Don't disable core on signal just becasue platform doesn't handle stack trace --- include/my_stacktrace.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/my_stacktrace.h b/include/my_stacktrace.h index 726333e8f52..ad05a7df9ab 100644 --- a/include/my_stacktrace.h +++ b/include/my_stacktrace.h @@ -50,11 +50,13 @@ void my_safe_print_str(const char* val, int max_len); void my_write_core(int sig); #if BACKTRACE_DEMANGLE char *my_demangle(const char *mangled_name, int *status); -#endif +#endif /* BACKTRACE_DEMANGLE */ #ifdef __WIN__ void my_set_exception_pointers(EXCEPTION_POINTERS *ep); -#endif -#endif +#endif /* __WIN__ */ +#else +#define my_init_stacktrace() do { } while(0) +#endif /* ! (defined(HAVE_STACKTRACE) || defined(HAVE_BACKTRACE)) */ #ifndef _WIN32 #define MY_ADDR_RESOLVE_FORK -- cgit v1.2.1