summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <miguel@hegel.br>2002-12-13 05:18:22 -0400
committerunknown <miguel@hegel.br>2002-12-13 05:18:22 -0400
commitdaeed63662488d47389df44ff2d64947127c9257 (patch)
treeb7cffc36af0feca4c5a3f77c67a174ca69680268 /sql
parent0e481109c2d4ed8e501bdb83d4bcb6343c506083 (diff)
downloadmariadb-git-daeed63662488d47389df44ff2d64947127c9257.tar.gz
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
Diffstat (limited to 'sql')
-rw-r--r--sql/mysqld.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 811713bec15..9de04ac3454 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -184,7 +184,6 @@ static uint handler_count;
static bool opt_enable_named_pipe = 0;
#endif
#ifdef __WIN__
-static bool opt_console=0,start_mode=0;
static pthread_cond_t COND_handler_count;
static uint handler_count;
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
#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;
if (pthread_create(&hThread,&connection_attrib,handle_shutdown,0))
sql_print_error("Warning: Can't create thread to handle shutdown requests");