summaryrefslogtreecommitdiff
path: root/mysql-test/lib/My/Handles.pm
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/lib/My/Handles.pm')
-rw-r--r--mysql-test/lib/My/Handles.pm8
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";
}
}