At http://bazaar.launchpad.net/~maria-captains/maria/5.2/ ------------------------------------------------------------ revno: 2838 [merge] revision-id: sergii@pisem.net-20100827150227-zyumpah7qi037is7 parent: sergii@pisem.net-20100826064508-hqg2wigw8zyn3vnn parent: sergii@pisem.net-20100827145316-tz76z60n8gqr1w4h committer: Sergei Golubchik <sergii@pisem.net> branch nick: 5.2 timestamp: Fri 2010-08-27 17:02:27 +0200 message: merged modified: mysql-test/lib/mtr_cases.pm sp1f-mtr_cases.pl-20050203205008-rrteoawyobvgq6u7zeyce4tmuu334ayg mysql-test/mysql-test-run.pl sp1f-mysqltestrun.pl-20041230152716-xjnn5ndv4rr4by6ijmj5a4ysubxc7qh3 === modified file 'mysql-test/lib/mtr_cases.pm' --- a/mysql-test/lib/mtr_cases.pm 2010-08-26 06:42:53 +0000 +++ b/mysql-test/lib/mtr_cases.pm 2010-08-27 15:02:27 +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-26 06:42:53 +0000 +++ b/mysql-test/mysql-test-run.pl 2010-08-27 15:02:27 +0000 @@ -5833,7 +5833,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