diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-08-13 22:39:31 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-08-13 22:39:31 +0100 |
| commit | 1faaaa9718e1c5b09dc5822f48f3a48a64d784cb (patch) | |
| tree | 4d76072f43feefe109e7835090f907b26e6e09fc | |
| parent | 562dd53c290e0ef361976c679bc569a64d098625 (diff) | |
| download | mariadb-git-1faaaa9718e1c5b09dc5822f48f3a48a64d784cb.tar.gz | |
MDEV-15680 xb_aws_key_management fails in buildbot.
aws_key_management needs current directory to be datadir during
initalization, it scans current directory for encrypted keys.
Fix is to ensure, that plugin initialization in mariabackup happens
after the call to my_setwd(mysql_real_data_home).
| -rw-r--r-- | extra/mariabackup/xtrabackup.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index 9c961af2583..4545e7a6857 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -3804,7 +3804,7 @@ xtrabackup_backup_func() return(false); } msg("mariabackup: cd to %s\n", mysql_real_data_home); - + encryption_plugin_backup_init(mysql_connection); msg("mariabackup: open files limit requested %u, set to %u\n", (uint) xb_open_files_limit, xb_set_max_open_files(xb_open_files_limit)); @@ -5277,7 +5277,6 @@ xb_init() return(false); } - encryption_plugin_backup_init(mysql_connection); history_start_time = time(NULL); } |