Skip to content

Add fix for MDEV-7369 #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 28, 2014
Merged

Add fix for MDEV-7369 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions storage/xtradb/include/os0stacktrace.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 changes: 2 additions & 2 deletions storage/xtradb/srv/srv0start.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down