diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-09-02 14:36:14 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-09-02 14:36:14 +0200 |
| commit | 5edf3e03887142f83044ee9fcc8fcf65386c43c7 (patch) | |
| tree | 179e1f56be501aeb8ed2a975ee49efad5e5144dd /client/mysqltest.cc | |
| parent | 32a29afea777d8bbfcea7a2b5e6e5ee674013cb5 (diff) | |
| parent | c58e184b14ccdf0b0eaeeeb7947e23b8b5fff7a7 (diff) | |
| download | mariadb-git-5edf3e03887142f83044ee9fcc8fcf65386c43c7.tar.gz | |
Merge branch '10.5' into 10.6
Diffstat (limited to 'client/mysqltest.cc')
| -rw-r--r-- | client/mysqltest.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 6b829ccb8be..f8238cbb26d 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -184,7 +184,7 @@ static uint opt_tail_lines= 0; static uint opt_connect_timeout= 0; static uint opt_wait_for_pos_timeout= 0; - +static const uint default_wait_for_pos_timeout= 300; static char delimiter[MAX_DELIMITER_LENGTH]= ";"; static size_t delimiter_length= 1; @@ -5079,6 +5079,8 @@ void do_shutdown_server(struct st_command *command) }; DBUG_ENTER("do_shutdown_server"); + /* the wait-for-pos' default based value of 'timeout' must fit to MDEV-23511 */ + compile_time_assert(default_wait_for_pos_timeout / 5 >= 60); check_command_args(command, command->first_argument, shutdown_args, sizeof(shutdown_args)/sizeof(struct command_arg), ' '); @@ -7058,7 +7060,7 @@ static struct my_option my_long_options[] = {"wait_for_pos_timeout", 0, "Number of seconds to wait for master_pos_wait", &opt_wait_for_pos_timeout, &opt_wait_for_pos_timeout, 0, GET_UINT, - REQUIRED_ARG, 300, 0, 3600 * 12, 0, 0, 0}, + REQUIRED_ARG, default_wait_for_pos_timeout, 0, 3600 * 12, 0, 0, 0}, {"plugin_dir", 0, "Directory for client-side plugins.", &opt_plugin_dir, &opt_plugin_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, @@ -9085,10 +9087,6 @@ static void init_signal_handling(void) struct sigaction sa; DBUG_ENTER("init_signal_handling"); -#ifdef HAVE_STACKTRACE - my_init_stacktrace(0); -#endif - sa.sa_flags = SA_RESETHAND | SA_NODEFER; sigemptyset(&sa.sa_mask); sigprocmask(SIG_SETMASK, &sa.sa_mask, NULL); |