Hi, Andrei! ok to push. one comment below. On Apr 07, Andrei Elkin wrote:

revision-id: 7665323d02a (mariadb-10.3.22-194-g7665323d02a) parent(s): 04e38549af8 author: Andrei Elkin committer: Andrei Elkin timestamp: 2020-04-07 14:25:25 +0300 message:

MENT-202 Implement system variable that makes slow master shutdown the default behavior

@@global.shutdown_wait_slaves is introduced to hold a desirable shutdown mode that the SHUTDOWN sql command runs with implicitly when invoked without any option.

diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 8bb9f86c8b6..2b23edc7000 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -4270,6 +4270,12 @@ static Sys_var_ulong Sys_profiling_history_size( VALID_RANGE(0, 100), DEFAULT(15), BLOCK_SIZE(1)); #endif

+static Sys_var_mybool Sys_shutdown_wait_for_slaves( + "shutdown_wait_for_slaves", + "when ON, SHUTDOWN command runs with implicit WAIT FOR ALL SLAVES option.", + GLOBAL_VAR(opt_shutdown_wait_for_slaves), CMD_LINE(OPT_ARG), + DEFAULT(FALSE), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0));

You don't need to write all this tail of the default behavior. The last line could be just DEFAULT(FALSE)); Regards, Sergei VP of MariaDB Server Engineering and security@mariadb.org