mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-10-28 15:02:04 +01:00
dfe732c593
An initial commit preparing Alpine for migration to MariaDB. Signed-off-by: Łukasz Jendrysik <scadu@yandex.com>
39 lines
1.2 KiB
Diff
39 lines
1.2 KiB
Diff
--- mariadb-5.5.41/storage/xtradb/include/os0stacktrace.h.orig 2014-12-19 11:57:31.000000000 +0100
|
|
+++ mariadb-5.5.41/storage/xtradb/include/os0stacktrace.h 2014-12-27 12:41:11.952594278 +0100
|
|
@@ -20,7 +20,7 @@
|
|
#ifndef os0stacktrace_h
|
|
#define os0stacktrace_h
|
|
|
|
-#ifdef __linux__
|
|
+#if defined (__linux__) && HAVE_BACKTRACE && HAVE_BACKTRACE_SYMBOLS
|
|
#if HAVE_EXECINFO_H
|
|
#include <execinfo.h>
|
|
#endif
|
|
@@ -40,5 +40,5 @@
|
|
siginfo_t* info, /*!< in: signal information */
|
|
void* ucontext);/*!< in: signal context */
|
|
|
|
-#endif /* __linux__ */
|
|
+#endif /* defined (__linux__) && HAVE_BACKTRACE && HAVE_BACKTRACE_SYMBOLS */
|
|
#endif /* os0stacktrace.h */
|
|
--- mariadb-5.5.41/storage/xtradb/srv/srv0start.c.orig 2014-12-19 11:57:32.000000000 +0100
|
|
+++ mariadb-5.5.41/storage/xtradb/srv/srv0start.c 2014-12-27 12:48:08.798016960 +0100
|
|
@@ -1274,7 +1274,7 @@
|
|
stacktrace feature. */
|
|
|
|
if (srv_use_stacktrace) {
|
|
-#ifdef __linux__
|
|
+#if defined (__linux__) && HAVE_BACKTRACE && HAVE_BACKTRACE_SYMBOLS
|
|
struct sigaction sigact;
|
|
|
|
sigact.sa_sigaction = os_stacktrace_print;
|
|
@@ -1287,7 +1287,7 @@
|
|
srv_use_stacktrace = FALSE;
|
|
|
|
}
|
|
-#endif /* __linux__ */
|
|
+#endif /* defined (__linux__) && HAVE_BACKTRACE && HAVE_BACKTRACE_SYMBOLS */
|
|
}
|
|
|
|
|