Merge 10.1 into 10.2

Also, include fixes by Vladislav Vaintroub to the
aws_key_management plugin. The AWS C++ SDK specifically depends on
OPENSSL_LIBRARIES, not generic SSL_LIBRARIES (such as YaSSL).

1 files changed, 38 insertions, 0 deletions

diff --git a/mysql-test/suite/mariabackup/suite.pm b/mysql-test/suite/mariabackup/suite.pm
new file mode 100644
index 00000000000..8eecd4e8018
--- /dev/null
+++ b/mysql-test/suite/mariabackup/suite.pm
@@ -0,0 +1,38 @@
+package My::Suite::MariaBackup;
+
+@ISA = qw(My::Suite);
+use My::Find;
+use File::Basename;
+use strict;
+
+return "Not run for embedded server" if $::opt_embedded_server;
+
+my $mariabackup_exe=
+::mtr_exe_maybe_exists(
+  "$::bindir/extra/mariabackup$::opt_vs_config/mariabackup",
+  "$::path_client_bindir/mariabackup");
+
+return "No mariabackup" if !$mariabackup_exe;
+
+
+$ENV{XTRABACKUP}= $mariabackup_exe;
+
+$ENV{XBSTREAM}= ::mtr_exe_maybe_exists(
+      "$::bindir/extra/mariabackup/$::opt_vs_config/mbstream",
+      "$::path_client_bindir/mbstream");
+
+my $tar_version = `tar --version 2>&1`;
+$ENV{HAVE_TAR} = $! ? 0: 1;
+my $mariabackup_help=`$mariabackup_exe --help 2>&1`;
+$ENV{HAVE_XTRABACKUP_TAR_SUPPORT} =  (index($mariabackup_help,"'tar'") == -1) ? 0 : 1;
+
+$ENV{INNOBACKUPEX}= "$mariabackup_exe --innobackupex";
+
+sub skip_combinations {
+  my %skip;
+  $skip{'include/have_file_key_management.inc'} = 'needs file_key_management plugin'  unless $ENV{FILE_KEY_MANAGEMENT_SO};
+  %skip;
+}
+
+bless { };
+