[Commits] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (monty:2894)

#At lp:maria based on revid:monty@askmonty.org-20100828082944-bq139doh4xwcq795 2894 Michael Widenius 2010-08-28 [merge] Automatic merge modified: mysql-test/lib/mtr_cases.pm mysql-test/mysql-test-run.pl === modified file 'mysql-test/lib/mtr_cases.pm' --- a/mysql-test/lib/mtr_cases.pm 2010-08-25 20:22:33 +0000 +++ b/mysql-test/lib/mtr_cases.pm 2010-08-27 14:53:16 +0000 @@ -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); } } === modified file 'mysql-test/mysql-test-run.pl' --- a/mysql-test/mysql-test-run.pl 2010-08-25 20:22:33 +0000 +++ b/mysql-test/mysql-test-run.pl 2010-08-27 14:53:16 +0000 @@ -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
participants (1)
-
Michael Widenius