Skip to content

Commit 376fbd5

Browse files
grooverdanThirunarayanan
authored andcommitted
MDEV-39585: Support SHUTDOWN command on Windows in bootstrap
Don't perform mysqld_win_initiate_shutdown under --bootstrap when triggered by SHUTDOWN. With this we don't perform any service interactions. Then the shutdown can proceeded without then hard process termination in mysqld_win_initiate_shutdown. This previously occurred because the handle_connections_win() was never called in --bootstrap and therefore startup_complete() was false. Thanks Vladislav Vaintroub for investigation and providing implementation guidance.
1 parent 3427e04 commit 376fbd5

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

sql/mysqld.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1698,7 +1698,8 @@ static void break_connect_loop()
16981698
abort_loop= 1;
16991699

17001700
#if defined(_WIN32)
1701-
mysqld_win_initiate_shutdown();
1701+
if (!opt_bootstrap)
1702+
mysqld_win_initiate_shutdown();
17021703
#else
17031704
mysql_mutex_lock(&LOCK_start_thread);
17041705
if (termination_event_fd >= 0)

0 commit comments

Comments
 (0)