diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-09-06 16:57:54 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-09-06 16:58:39 +0200 |
| commit | f80e02e043103ab4e6ca12d9efffec6eb9aa3b74 (patch) | |
| tree | f0ab69f11d47bc99139216e839c54c7b29711146 /mysql-test/lib | |
| parent | 2842c369851a8afc2a944ce6f4f60fa052f20969 (diff) | |
| parent | 39e5b76ef1e68c0aed0b0f6941d517a986fe8821 (diff) | |
| download | mariadb-git-f80e02e043103ab4e6ca12d9efffec6eb9aa3b74.tar.gz | |
Merge branch '10.2' into 10.3
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"; } } |