mirror of
https://github.com/MariaDB/server.git
synced 2025-07-18 23:03:28 +03:00
MDEV-20185: Windows: Use of uninitialized value $bpath in string eq
The execution of mtr in the Windows environment fails due to the fact that the new code from MDEV-18565 does not take into account the need to add the ".exe" extension to the names of executable files when searching for pre-requisites that are needed to run SST scripts (especially when using mariabackup) and when searching paths to some other Galera utilities. This patch fixes this flaw. Also adding paths to the PATH environment variable is now done with the correct delimiter character.
This commit is contained in:
@ -54,11 +54,11 @@ sub skip_combinations {
|
||||
$skip{'include/have_mariabackup.inc'} = 'Need mariabackup'
|
||||
unless ::have_mariabackup();
|
||||
|
||||
$skip{'include/have_mariabackup.inc'} = 'Need ss'
|
||||
unless ::which("ss");
|
||||
$skip{'include/have_mariabackup.inc'} = 'Need socket statistics utility'
|
||||
unless IS_WINDOWS || ::which("ss");
|
||||
|
||||
$skip{'include/have_mariabackup.inc'} = 'Need socat or nc'
|
||||
unless $ENV{MTR_GALERA_TFMT};
|
||||
unless IS_WINDOWS || $ENV{MTR_GALERA_TFMT};
|
||||
|
||||
$skip{'include/have_garbd.inc'} = 'Need garbd'
|
||||
unless ::have_garbd();
|
||||
|
Reference in New Issue
Block a user