Skip to content

Commit 9e240a3

Browse files
committed
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 8c11f86 commit 9e240a3

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
@@ -1667,7 +1667,8 @@ static void break_connect_loop()
16671667
abort_loop= 1;
16681668

16691669
#if defined(_WIN32)
1670-
mysqld_win_initiate_shutdown();
1670+
if (!opt_bootstrap)
1671+
mysqld_win_initiate_shutdown();
16711672
#else
16721673
mysql_mutex_lock(&LOCK_start_thread);
16731674
if (termination_event_fd >= 0)

0 commit comments

Comments
 (0)