Post merge fix

facba6ba · istruewing@chilla.local · caf65f2b · facba6ba · facba6ba
Commit facba6ba authored Mar 30, 2007 by istruewing@chilla.local
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

mysys/my_pthread.c mysys/my_pthread.c +0 -2

sql/mysqld.cc sql/mysqld.cc +0 -3

No files found.
--- a/mysys/my_pthread.c
+++ b/mysys/my_pthread.c
@@ -29,8 +29,6 @@
 #define SCHED_POLICY SCHED_OTHER
 #endif
-uint thd_lib_detected= 0;
 uint thd_lib_detected;
 #ifndef my_pthread_setprio

--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -599,9 +599,6 @@ pthread_mutex_t  LOCK_server_started;
 pthread_cond_t  COND_server_started;
 int mysqld_server_started= 0;
-#ifndef EMBEDDED_LIBRARY
-static uint thr_kill_signal;
-#endif
 File_parser_dummy_hook file_parser_dummy_hook;