mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Bug #9665 After registering MySQL service and starting with shared mem, cannot stop
The shared memory connect event was not being set in kill_server. This caused the thread that is handling shared memory connections to never exit.
This commit is contained in:
@ -835,6 +835,18 @@ static void __cdecl kill_server(int sig_ptr)
|
|||||||
else
|
else
|
||||||
sql_print_error(ER(ER_GOT_SIGNAL),my_progname,sig); /* purecov: inspected */
|
sql_print_error(ER(ER_GOT_SIGNAL),my_progname,sig); /* purecov: inspected */
|
||||||
|
|
||||||
|
#if defined(HAVE_SMEM) && defined(__WIN__)
|
||||||
|
/*
|
||||||
|
Send event to smem_event_connect_request for aborting
|
||||||
|
*/
|
||||||
|
if (!SetEvent(smem_event_connect_request))
|
||||||
|
{
|
||||||
|
DBUG_PRINT("error",
|
||||||
|
("Got error: %ld from SetEvent of smem_event_connect_request",
|
||||||
|
GetLastError()));
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined(__NETWARE__) || (defined(USE_ONE_SIGNAL_HAND) && !defined(__WIN__) && !defined(OS2))
|
#if defined(__NETWARE__) || (defined(USE_ONE_SIGNAL_HAND) && !defined(__WIN__) && !defined(OS2))
|
||||||
my_thread_init(); // If this is a new thread
|
my_thread_init(); // If this is a new thread
|
||||||
#endif
|
#endif
|
||||||
|
Reference in New Issue
Block a user