diff options
| author | Vlad Lesin <vlad_lesin@mail.ru> | 2019-09-04 10:31:40 +0300 |
|---|---|---|
| committer | Vlad Lesin <vlad_lesin@mail.ru> | 2019-09-06 12:05:20 +0300 |
| commit | 16e9943d8960aa80f58ba1dc949a8f0f955d0631 (patch) | |
| tree | efc689bb5d4389823df71e0fcc601df69ea90fe6 /mysql-test/lib | |
| parent | 41e351f6082a60140f1d71a0261037d039b30925 (diff) | |
| download | mariadb-git-16e9943d8960aa80f58ba1dc949a8f0f955d0631.tar.gz | |
MDEV-20421: big_innodb_log reliably fails on buildbot Windows
The test fails because it reuses mysqltest perl code to copy directory
tree, and this code contains Windows-specific piece which outputs some
diagnostic information.
The patch introduces new parameter for that Windows-specific perl code to
have the ability to suppress diagnostic output on the corresponding
mysqltest perl module initialization.
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"; } } |