From 12f900228fbbc49032a4f22935de049ad6cf74b2 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Tue, 16 Jan 2018 14:24:27 +1100 Subject: [PATCH] mariadbbackup: use defaults-group-suffix even if no --defaults-file Signed-off-by: Daniel Black --- extra/mariabackup/xtrabackup.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index 7eee64bd6ef..016ddb6c60f 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -1223,8 +1223,8 @@ static int prepare_export() if (strncmp(orig_argv1,"--defaults-file=",16) == 0) { sprintf(cmdline, - IF_WIN("\"","") "\"%s\" --mysqld \"%s\" --defaults-group-suffix=%s" - " --defaults-extra-file=./backup-my.cnf --datadir=." + IF_WIN("\"","") "\"%s\" --mysqld \"%s\" " + " --defaults-extra-file=./backup-my.cnf --defaults-group-suffix=%s --datadir=." " --innodb --innodb-fast-shutdown=0" " --innodb_purge_rseg_truncate_frequency=1 --innodb-buffer-pool-size=%llu" " --console --skip-log-error --bootstrap < " BOOTSTRAP_FILENAME IF_WIN("\"",""), @@ -1236,11 +1236,12 @@ static int prepare_export() { sprintf(cmdline, IF_WIN("\"","") "\"%s\" --mysqld" - " --defaults-file=./backup-my.cnf --datadir=." + " --defaults-file=./backup-my.cnf --defaults-group-suffix=%s --datadir=." " --innodb --innodb-fast-shutdown=0" " --innodb_purge_rseg_truncate_frequency=1 --innodb-buffer-pool-size=%llu" " --console --log-error= --bootstrap < " BOOTSTRAP_FILENAME IF_WIN("\"",""), mariabackup_exe, + (my_defaults_group_suffix?my_defaults_group_suffix:""), xtrabackup_use_memory); }