Commit a2139d02 authored by unknown's avatar unknown
Browse files

Post merge fix

parent 1d3d4d0d
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -29,8 +29,6 @@
#define SCHED_POLICY SCHED_OTHER
#endif

uint thd_lib_detected= 0;

uint thd_lib_detected;

#ifndef my_pthread_setprio
+0 −3
Original line number Diff line number Diff line
@@ -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;