diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-09-06 20:12:11 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-09-06 20:12:11 +0200 |
| commit | 8885e7ba7814b5721bcf1a6c5241aea815a80eb9 (patch) | |
| tree | f538c222b9a5f81fd0ebb77240f75eaa0a0e976a /mysql-test/lib | |
| parent | 38e21c700049227098bf2c69d669980775f63a44 (diff) | |
| parent | f80e02e043103ab4e6ca12d9efffec6eb9aa3b74 (diff) | |
| download | mariadb-git-8885e7ba7814b5721bcf1a6c5241aea815a80eb9.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'mysql-test/lib')
| -rw-r--r-- | mysql-test/lib/My/Handles.pm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mysql-test/lib/My/Handles.pm b/mysql-test/lib/My/Handles.pm index c07e2edb09e..e23d3b75490 100644 --- a/mysql-test/lib/My/Handles.pm +++ b/mysql-test/lib/My/Handles.pm @@ -24,8 +24,10 @@ use My::Platform; my $handle_exe; - -if (IS_WINDOWS){ +sub import { + my $self = shift; + my $params = shift; + return if (!IS_WINDOWS || $handle_exe); # Check if handle.exe is available # Pass switch to accept the EULA to avoid hanging # if the program hasn't been run before. @@ -35,7 +37,7 @@ if (IS_WINDOWS){ $handle_exe= "$2.$3" if ($line =~ /(Nth|H)andle v([0-9]*)\.([0-9]*)/); } - if ($handle_exe){ + if ($handle_exe && (!$params || !$params->{suppress_init_messages})){ print "Found handle.exe version $handle_exe\n"; } } |