mirror of
https://github.com/MariaDB/server.git
synced 2025-05-29 21:42:28 +03:00
Post merge fix
This commit is contained in:
parent
caf65f2b3b
commit
facba6ba3a
@ -29,8 +29,6 @@
|
|||||||
#define SCHED_POLICY SCHED_OTHER
|
#define SCHED_POLICY SCHED_OTHER
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
uint thd_lib_detected= 0;
|
|
||||||
|
|
||||||
uint thd_lib_detected;
|
uint thd_lib_detected;
|
||||||
|
|
||||||
#ifndef my_pthread_setprio
|
#ifndef my_pthread_setprio
|
||||||
|
@ -599,9 +599,6 @@ pthread_mutex_t LOCK_server_started;
|
|||||||
pthread_cond_t COND_server_started;
|
pthread_cond_t COND_server_started;
|
||||||
|
|
||||||
int mysqld_server_started= 0;
|
int mysqld_server_started= 0;
|
||||||
#ifndef EMBEDDED_LIBRARY
|
|
||||||
static uint thr_kill_signal;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
File_parser_dummy_hook file_parser_dummy_hook;
|
File_parser_dummy_hook file_parser_dummy_hook;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user