From 16e9943d8960aa80f58ba1dc949a8f0f955d0631 Mon Sep 17 00:00:00 2001
From: Vlad Lesin <vlad_lesin@mail.ru>
Date: Wed, 4 Sep 2019 10:31:40 +0300
Subject: [PATCH] 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.
---
 mysql-test/lib/My/Handles.pm                     |  8 +++++---
 mysql-test/suite/mariabackup/big_innodb_log.test |  1 +
 mysql-test/suite/mariabackup/disabled.def        | 12 ------------
 3 files changed, 6 insertions(+), 15 deletions(-)
 delete mode 100644 mysql-test/suite/mariabackup/disabled.def

diff --git a/mysql-test/lib/My/Handles.pm b/mysql-test/lib/My/Handles.pm
index c07e2edb09e8c..e23d3b754902a 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";
   }
 }
diff --git a/mysql-test/suite/mariabackup/big_innodb_log.test b/mysql-test/suite/mariabackup/big_innodb_log.test
index 05dc3aa39c504..4a87ecb18fe92 100644
--- a/mysql-test/suite/mariabackup/big_innodb_log.test
+++ b/mysql-test/suite/mariabackup/big_innodb_log.test
@@ -76,6 +76,7 @@ rmdir $targetdir;
 
 perl;
 use lib "lib";
+use My::Handles { suppress_init_messages => 1 };
 use My::File::Path;
 my $install_db_dir = ($ENV{MTR_PARALLEL} == 1) ?
   "$ENV{'MYSQLTEST_VARDIR'}/install.db" :
diff --git a/mysql-test/suite/mariabackup/disabled.def b/mysql-test/suite/mariabackup/disabled.def
deleted file mode 100644
index 88a66df052d31..0000000000000
--- a/mysql-test/suite/mariabackup/disabled.def
+++ /dev/null
@@ -1,12 +0,0 @@
-##############################################################################
-#
-#  List the test cases that are to be disabled temporarily.
-#
-#  Separate the test case name and the comment with ':'.
-#
-#    <testcasename> : BUG#<xxxx> <date disabled> <disabler> <comment>
-#
-#  Do not use any TAB characters for whitespace.
-#
-##############################################################################
-big_innodb_log : MDEV-20421 2019-08-26 wlad Always fails on Windows buildbot
\ No newline at end of file