HASHICORP_KEY_MANAGEMENT: code unification between MariaDB editions

plugin/hashicorp_key_management/hashicorp_key_management_plugin.cc

@@ -13,18 +13,17 @@
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
-#include <my_global.h>
 #include <mysql/plugin_encryption.h>
 #include <mysqld_error.h>
+#include <my_alloca.h>
 #include <string.h>
+#include <stdlib.h>
+#include <limits.h>
+#include <time.h>
 #include <errno.h>
 #include <string>
 #include <sstream>
 #include <curl/curl.h>
-#ifdef _WIN32
-#include <malloc.h>
-#define alloca _alloca
-#endif
 #include <algorithm>
 #include <unordered_map>
 #include <mutex>

plugin/hashicorp_key_management/mysql-test/vault/suite.pm

 package My::Suite::Vault;
+use My::Platform;
 
 @ISA = qw(My::Suite);
 
 use strict;
 
+return "Hashicorp Key Management plugin tests are currently not available on Windows"
+  if IS_WINDOWS;
+
 return "You need to set the value of the VAULT_ADDR variable"
   unless $ENV{VAULT_ADDR};
 

plugin/hashicorp_key_management/mysql-test/vault/t/hashicorp_mariabackup.opt

+--innodb --loose-changed_page_bitmaps --innodb-sys-tables --innodb-flush-log-at-trx-commit=2 --sequence

plugin/hashicorp_key_management/mysql-test/vault/t/hashicorp_mariabackup.test

@@ -8,9 +8,13 @@
 CREATE TABLE t(i INT) ENGINE INNODB encrypted=yes encryption_key_id=1;
 INSERT INTO t VALUES(1);
 
-echo # mariabackup backup;
 let $targetdir=$MYSQLTEST_VARDIR/tmp/backup;
 
+--error 0,1
+rmdir $targetdir;
+
+echo # mariabackup backup;
+
 --disable_result_log
 exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir=$targetdir;
 --enable_result_log