database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

use the correct path separator on windows.

Browse Source 
remove duplicates from the --plugin-load list.
$ENV{TERM} can be undefined (on Windows)
This commit is contained in:
Sergei Golubchik
2010-08-27 16:53:16 +02:00
parent 9bc9855c16
commit e86aeaeec0
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/lib/mtr_cases.pm
View File

@ -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);
}
}

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

@ -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