MDEV-20185: Windows: Use of uninitialized value $bpath in string eqbb-10.2-MDEV-20185322

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.

1 files changed, 5 insertions, 5 deletions

diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm
index ee1eac2794d..5fc6f00b460 100644
--- a/mysql-test/suite.pm
+++ b/mysql-test/suite.pm
@@ -62,17 +62,17 @@ 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_xtrabackup.inc'} = 'Need innobackupex'
-            unless ::which(innobackupex);
+            unless IS_WINDOWS || ::which("innobackupex");
 
   $skip{'include/have_xtrabackup.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();