Bug#11761576 54082: HANDLE_SEGFAULT MAKES USE OF UNSAFE FUNCTIONS
Post-push fixes. mysys/stacktrace.c: Missing comma after "%s" format specifier. sql/mysqld.cc: Move #define to signal_handler.cc sql/signal_handler.cc: Missing #define UNSAFE_DEFAULT_LINUX_THREADS 200
This commit is contained in:
parent
937ee6b7a0
commit
c657f00458
@ -170,7 +170,7 @@ void my_print_stacktrace(uchar* stack_bottom __attribute__((unused)),
|
|||||||
my_safe_printf_stderr("%s",
|
my_safe_printf_stderr("%s",
|
||||||
"Error when traversing the stack, stack appears corrupt.\n");
|
"Error when traversing the stack, stack appears corrupt.\n");
|
||||||
else
|
else
|
||||||
my_safe_printf_stderr("%s"
|
my_safe_printf_stderr("%s",
|
||||||
"Please read "
|
"Please read "
|
||||||
"http://dev.mysql.com/doc/refman/5.1/en/resolve-stack-dump.html\n"
|
"http://dev.mysql.com/doc/refman/5.1/en/resolve-stack-dump.html\n"
|
||||||
"and follow instructions on how to resolve the stack trace.\n"
|
"and follow instructions on how to resolve the stack trace.\n"
|
||||||
|
@ -2468,10 +2468,6 @@ static void check_data_home(const char *path)
|
|||||||
|
|
||||||
#endif /*__WIN__ || __NETWARE */
|
#endif /*__WIN__ || __NETWARE */
|
||||||
|
|
||||||
#ifdef HAVE_LINUXTHREADS
|
|
||||||
#define UNSAFE_DEFAULT_LINUX_THREADS 200
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#if BACKTRACE_DEMANGLE
|
#if BACKTRACE_DEMANGLE
|
||||||
#include <cxxabi.h>
|
#include <cxxabi.h>
|
||||||
|
@ -131,6 +131,7 @@ extern "C" sig_handler handle_fatal_signal(int sig)
|
|||||||
"Hope that's ok; if not, decrease some variables in the equation.\n\n");
|
"Hope that's ok; if not, decrease some variables in the equation.\n\n");
|
||||||
|
|
||||||
#if defined(HAVE_LINUXTHREADS)
|
#if defined(HAVE_LINUXTHREADS)
|
||||||
|
#define UNSAFE_DEFAULT_LINUX_THREADS 200
|
||||||
if (sizeof(char*) == 4 && thread_count > UNSAFE_DEFAULT_LINUX_THREADS)
|
if (sizeof(char*) == 4 && thread_count > UNSAFE_DEFAULT_LINUX_THREADS)
|
||||||
{
|
{
|
||||||
my_safe_printf_stderr(
|
my_safe_printf_stderr(
|
||||||
|
Loading…
x
Reference in New Issue
Block a user