Commit de090764 authored by Jan Lindström's avatar Jan Lindström

MDEV-7369: MariaDB build fails when XTRADB_STORAGE_ENGINE enabled

Patch by James Taylor.
parent bc21e7a6
...@@ -20,7 +20,7 @@ this program; if not, write to the Free Software Foundation, Inc., ...@@ -20,7 +20,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
#ifndef os0stacktrace_h #ifndef os0stacktrace_h
#define os0stacktrace_h #define os0stacktrace_h
#ifdef __linux__ #if defined (__linux__) && HAVE_BACKTRACE && HAVE_BACKTRACE_SYMBOLS
#if HAVE_EXECINFO_H #if HAVE_EXECINFO_H
#include <execinfo.h> #include <execinfo.h>
#endif #endif
...@@ -40,5 +40,5 @@ os_stacktrace_print( ...@@ -40,5 +40,5 @@ os_stacktrace_print(
siginfo_t* info, /*!< in: signal information */ siginfo_t* info, /*!< in: signal information */
void* ucontext);/*!< in: signal context */ void* ucontext);/*!< in: signal context */
#endif /* __linux__ */ #endif /* defined (__linux__) && HAVE_BACKTRACE && HAVE_BACKTRACE_SYMBOLS */
#endif /* os0stacktrace.h */ #endif /* os0stacktrace.h */
...@@ -1633,7 +1633,7 @@ innobase_start_or_create_for_mysql(void) ...@@ -1633,7 +1633,7 @@ innobase_start_or_create_for_mysql(void)
stacktrace feature. */ stacktrace feature. */
if (srv_use_stacktrace) { if (srv_use_stacktrace) {
#ifdef __linux__ #if defined (__linux__) && HAVE_BACKTRACE && HAVE_BACKTRACE_SYMBOLS
struct sigaction sigact; struct sigaction sigact;
sigact.sa_sigaction = os_stacktrace_print; sigact.sa_sigaction = os_stacktrace_print;
...@@ -1646,7 +1646,7 @@ innobase_start_or_create_for_mysql(void) ...@@ -1646,7 +1646,7 @@ innobase_start_or_create_for_mysql(void)
srv_use_stacktrace = FALSE; srv_use_stacktrace = FALSE;
} }
#endif /* __linux__ */ #endif /* defined (__linux__) && HAVE_BACKTRACE && HAVE_BACKTRACE_SYMBOLS */
} }
#ifdef UNIV_DEBUG #ifdef UNIV_DEBUG
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment