diff options
| -rw-r--r-- | mysql-test/lib/mtr_cases.pm | 7 | ||||
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index f7794d1964d..2aa12f60f32 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -621,6 +621,7 @@ sub process_opts { $tinfo->{$opt_name} = []; my @plugins; + my %seen; foreach my $opt (@opts) { @@ -640,7 +641,8 @@ sub process_opts { $value= mtr_match_prefix($opt, "--plugin-load="); if (defined $value) { - push @plugins, $value; + push @plugins, $value unless $seen{$value}; + $seen{$value}=1; next; } @@ -685,7 +687,8 @@ sub process_opts { } if (@plugins) { - push @{$tinfo->{$opt_name}}, "--plugin-load=" . join(':', @plugins); + my $sep = (IS_WIN32PERL) ? ';' : ':'; + push @{$tinfo->{$opt_name}}, "--plugin-load=" . join($sep, @plugins); } } diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 98e116b4217..62253b550f3 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -5840,7 +5840,7 @@ sub time_format($) { my $num_tests; sub xterm_stat { - if (-t STDOUT and $ENV{TERM} =~ /xterm/) { + if (-t STDOUT and defined $ENV{TERM} and $ENV{TERM} =~ /xterm/) { my ($left) = @_; # 2.5 -> best by test |