diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-04-03 15:48:56 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-04-03 15:48:56 +0300 |
| commit | bea887e6636860bfc0f4dd965173ac72d6cfef0c (patch) | |
| tree | 8fdb8a375a65d73b2e4b43e3874d8e3df9237ffa /include/my_stacktrace.h | |
| parent | 97a3baef7bda7ac6a50f272a1f248b42f586b9f4 (diff) | |
| download | mariadb-git-bea887e6636860bfc0f4dd965173ac72d6cfef0c.tar.gz | |
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
Diffstat (limited to 'include/my_stacktrace.h')
| -rw-r--r-- | include/my_stacktrace.h | 8 |
1 files changed, 5 insertions, 3 deletions
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 |