diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2019-08-26 10:58:27 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2019-08-26 11:00:19 +0000 |
| commit | 202243d59e4fafdf20d198485e94cb5920ce8741 (patch) | |
| tree | b4eb40fc92840de94a02da75a6161b7d318f37af /mysql-test/lib/My | |
| parent | 9de2e60d7491fcf3cd1f20a4be715ef0bedc316f (diff) | |
| download | mariadb-git-202243d59e4fafdf20d198485e94cb5920ce8741.tar.gz | |
MTR : improve detection of handles.exe on Windows.
Depending on version, "handle.exe -?" can output either "Handle v4.0"
or "Nthandle v4.1"
Diffstat (limited to 'mysql-test/lib/My')
| -rw-r--r-- | mysql-test/lib/My/Handles.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/lib/My/Handles.pm b/mysql-test/lib/My/Handles.pm index 3c9513fec8f..c07e2edb09e 100644 --- a/mysql-test/lib/My/Handles.pm +++ b/mysql-test/lib/My/Handles.pm @@ -32,8 +32,8 @@ if (IS_WINDOWS){ my $list= `handle.exe -? -accepteula 2>&1`; foreach my $line (split('\n', $list)) { - $handle_exe= "$1.$2" - if ($line =~ /Handle v([0-9]*)\.([0-9]*)/); + $handle_exe= "$2.$3" + if ($line =~ /(Nth|H)andle v([0-9]*)\.([0-9]*)/); } if ($handle_exe){ print "Found handle.exe version $handle_exe\n"; |