Remove variables redefined and variable shutdown_event_name fix
sql/mysqld.cc: Remove variables redefined and same fix for shutdown_event_name made by Monty on 4.0
This commit is contained in:
parent
0e481109c2
commit
daeed63662
@ -184,7 +184,6 @@ static uint handler_count;
|
|||||||
static bool opt_enable_named_pipe = 0;
|
static bool opt_enable_named_pipe = 0;
|
||||||
#endif
|
#endif
|
||||||
#ifdef __WIN__
|
#ifdef __WIN__
|
||||||
static bool opt_console=0,start_mode=0;
|
|
||||||
static pthread_cond_t COND_handler_count;
|
static pthread_cond_t COND_handler_count;
|
||||||
static uint handler_count;
|
static uint handler_count;
|
||||||
static bool opt_console=0, start_mode=0, use_opt_args;
|
static bool opt_console=0, start_mode=0, use_opt_args;
|
||||||
@ -2160,7 +2159,7 @@ The server will not act as a slave.");
|
|||||||
(void) thr_setconcurrency(concurrency); // 10 by default
|
(void) thr_setconcurrency(concurrency); // 10 by default
|
||||||
#if defined(__WIN__) && !defined(EMBEDDED_LIBRARY) //IRENA
|
#if defined(__WIN__) && !defined(EMBEDDED_LIBRARY) //IRENA
|
||||||
{
|
{
|
||||||
hEventShutdown=CreateEvent(0, FALSE, FALSE, event_name);
|
hEventShutdown=CreateEvent(0, FALSE, FALSE, shutdown_event_name);
|
||||||
pthread_t hThread;
|
pthread_t hThread;
|
||||||
if (pthread_create(&hThread,&connection_attrib,handle_shutdown,0))
|
if (pthread_create(&hThread,&connection_attrib,handle_shutdown,0))
|
||||||
sql_print_error("Warning: Can't create thread to handle shutdown requests");
|
sql_print_error("Warning: Can't create thread to handle shutdown requests");
|
||||||
|
Loading…
x
Reference in New Issue
Block a user