mirror of
https://github.com/MariaDB/server.git
synced 2026-04-24 17:25:31 +02:00
use the correct path separator on windows.
remove duplicates from the --plugin-load list.
$ENV{TERM} can be undefined (on Windows)
This commit is contained in:
parent
9bc9855c16
commit
e86aeaeec0
2 changed files with 6 additions and 3 deletions
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue