database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

upmerge 56383

Browse Source
This commit is contained in:
Bjorn Munch
2010-09-01 15:52:31 +02:00
parent 71c0fde097 7749cd8fd8
commit 4e4536482b
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/mysql-test-run.pl
View File

@ -244,6 +244,7 @@ my $opt_repeat= 1;
my $opt_retry= 3; my $opt_retry= 3;
my $opt_retry_failure= env_or_val(MTR_RETRY_FAILURE => 2); my $opt_retry_failure= env_or_val(MTR_RETRY_FAILURE => 2);
my $opt_reorder= 1; my $opt_reorder= 1;
my $opt_force_restart= 0;
my $opt_strace_client; my $opt_strace_client;
@ -944,6 +945,7 @@ sub command_line_setup {
'report-features' => \$opt_report_features, 'report-features' => \$opt_report_features,
'comment=s' => \$opt_comment, 'comment=s' => \$opt_comment,
'fast' => \$opt_fast, 'fast' => \$opt_fast,
'force-restart' => \$opt_force_restart,
'reorder!' => \$opt_reorder, 'reorder!' => \$opt_reorder,
'enable-disabled' => \&collect_option, 'enable-disabled' => \&collect_option,
'verbose+' => \$opt_verbose, 'verbose+' => \$opt_verbose,
@ -4577,6 +4579,11 @@ sub server_need_restart {
return 1; return 1;
} }
if ( $opt_force_restart ) {
mtr_verbose_restart($server, "forced restart turned on");
return 1;
}
if ( $tinfo->{template_path} ne $current_config_name) if ( $tinfo->{template_path} ne $current_config_name)
{ {
mtr_verbose_restart($server, "using different config file"); mtr_verbose_restart($server, "using different config file");
@ -5605,6 +5612,7 @@ Misc options
servers to exit before finishing the process servers to exit before finishing the process
fast Run as fast as possible, dont't wait for servers fast Run as fast as possible, dont't wait for servers
to shutdown etc. to shutdown etc.
force-restart Always restart servers between tests
parallel=N Run tests in N parallel threads (default=1) parallel=N Run tests in N parallel threads (default=1)
Use parallel=auto for auto-setting of N Use parallel=auto for auto-setting of N
repeat=N Run each test N number of times repeat=N Run each test N number of times