Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
de090764
Commit
de090764
authored
Dec 28, 2014
by
Jan Lindström
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-7369: MariaDB build fails when XTRADB_STORAGE_ENGINE enabled
Patch by James Taylor.
parent
bc21e7a6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
storage/xtradb/include/os0stacktrace.h
storage/xtradb/include/os0stacktrace.h
+2
-2
storage/xtradb/srv/srv0start.cc
storage/xtradb/srv/srv0start.cc
+2
-2
No files found.
storage/xtradb/include/os0stacktrace.h
View file @
de090764
...
...
@@ -20,7 +20,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
#ifndef os0stacktrace_h
#define os0stacktrace_h
#if
def __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 */
storage/xtradb/srv/srv0start.cc
View file @
de090764
...
...
@@ -1633,7 +1633,7 @@ innobase_start_or_create_for_mysql(void)
stacktrace feature. */
if
(
srv_use_stacktrace
)
{
#if
def __linux__
#if
defined (__linux__) && HAVE_BACKTRACE && HAVE_BACKTRACE_SYMBOLS
struct
sigaction
sigact
;
sigact
.
sa_sigaction
=
os_stacktrace_print
;
...
...
@@ -1646,7 +1646,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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment