diff options
-rw-r--r-- | sql/mysqld.cc | 2 | ||||
-rw-r--r-- | sql/stacktrace.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index ce53cd22669..51feb197713 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -599,7 +599,6 @@ pthread_mutex_t LOCK_server_started; pthread_cond_t COND_server_started; int mysqld_server_started= 0; -static uint thr_kill_signal; File_parser_dummy_hook file_parser_dummy_hook; @@ -633,6 +632,7 @@ struct rand_struct sql_rand; // used by sql_class.cc:THD::THD() #ifndef EMBEDDED_LIBRARY struct passwd *user_info; static pthread_t select_thread; +static uint thr_kill_signal; #endif /* OS specific variables */ diff --git a/sql/stacktrace.c b/sql/stacktrace.c index 0dbf4522a71..078f62c6b2b 100644 --- a/sql/stacktrace.c +++ b/sql/stacktrace.c @@ -53,8 +53,6 @@ void safe_print_str(const char* name, const char* val, int max_len) #define SIGRETURN_FRAME_OFFSET 23 #endif -static my_bool is_nptl; - #if defined(__alpha__) && defined(__GNUC__) /* The only way to backtrace without a symbol table on alpha |