database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge pull request #14 from James-TR/MDEV-7369

Browse Source 
Add fix for MDEV-7369
This commit is contained in:
Jan Lindström
2014-12-28 12:55:01 +02:00
parent f65901eef2 7860333669
commit 46f3f93a2c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
storage/xtradb/include/os0stacktrace.h
View File

@@ -20,7 +20,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
#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 @@ os_stacktrace_print(
siginfo_t* info, /*!< in: signal information */
void* ucontext);/*!< in: signal context */
#endif /* __linux__ */
#endif /* defined (__linux__) && HAVE_BACKTRACE && HAVE_BACKTRACE_SYMBOLS */
#endif /* os0stacktrace.h */

4
storage/xtradb/srv/srv0start.cc
View File

@@ -1646,7 +1646,7 @@ innobase_start_or_create_for_mysql(void)
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;
@@ -1659,7 +1659,7 @@ innobase_start_or_create_for_mysql(void)
srv_use_stacktrace = FALSE;
}
#endif /* __linux__ */
#endif /* defined (__linux__) && HAVE_BACKTRACE && HAVE_BACKTRACE_SYMBOLS */
}
#ifdef UNIV_DEBUG