database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch '10.2' into 10.3

Browse Source
This commit is contained in:
Sergei Golubchik
2019-09-06 16:57:54 +02:00
parent 2842c36985 39e5b76ef1
commit f80e02e043
16 changed files with 315 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/lib/My/Handles.pm
View File

@@ -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";
}
}