Skip to content

Commit 268bf55

Browse files
author
Tor Didriksen
committed
Bug#11761576 54082: HANDLE_SEGFAULT MAKES USE OF UNSAFE FUNCTIONS
Post-push fixes.
1 parent bd5f062 commit 268bf55

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

mysys/stacktrace.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ void my_print_stacktrace(uchar* stack_bottom __attribute__((unused)),
170170
my_safe_printf_stderr("%s",
171171
"Error when traversing the stack, stack appears corrupt.\n");
172172
else
173-
my_safe_printf_stderr("%s"
173+
my_safe_printf_stderr("%s",
174174
"Please read "
175175
"http://dev.mysql.com/doc/refman/5.1/en/resolve-stack-dump.html\n"
176176
"and follow instructions on how to resolve the stack trace.\n"

sql/mysqld.cc

-4
Original file line numberDiff line numberDiff line change
@@ -2468,10 +2468,6 @@ static void check_data_home(const char *path)
24682468

24692469
#endif /*__WIN__ || __NETWARE */
24702470

2471-
#ifdef HAVE_LINUXTHREADS
2472-
#define UNSAFE_DEFAULT_LINUX_THREADS 200
2473-
#endif
2474-
24752471

24762472
#if BACKTRACE_DEMANGLE
24772473
#include <cxxabi.h>

sql/signal_handler.cc

+1
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ extern "C" sig_handler handle_fatal_signal(int sig)
131131
"Hope that's ok; if not, decrease some variables in the equation.\n\n");
132132

133133
#if defined(HAVE_LINUXTHREADS)
134+
#define UNSAFE_DEFAULT_LINUX_THREADS 200
134135
if (sizeof(char*) == 4 && thread_count > UNSAFE_DEFAULT_LINUX_THREADS)
135136
{
136137
my_safe_printf_stderr(

0 commit comments

Comments
 (0)