Skip to content

Commit 12f9002

Browse files
grooverdanvaintroub
authored andcommitted
mariadbbackup: use defaults-group-suffix even if no --defaults-file
Signed-off-by: Daniel Black <daniel@linux.vnet.ibm.com>
1 parent 7cc507f commit 12f9002

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

extra/mariabackup/xtrabackup.cc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1223,8 +1223,8 @@ static int prepare_export()
12231223
if (strncmp(orig_argv1,"--defaults-file=",16) == 0)
12241224
{
12251225
sprintf(cmdline,
1226-
IF_WIN("\"","") "\"%s\" --mysqld \"%s\" --defaults-group-suffix=%s"
1227-
" --defaults-extra-file=./backup-my.cnf --datadir=."
1226+
IF_WIN("\"","") "\"%s\" --mysqld \"%s\" "
1227+
" --defaults-extra-file=./backup-my.cnf --defaults-group-suffix=%s --datadir=."
12281228
" --innodb --innodb-fast-shutdown=0"
12291229
" --innodb_purge_rseg_truncate_frequency=1 --innodb-buffer-pool-size=%llu"
12301230
" --console --skip-log-error --bootstrap < " BOOTSTRAP_FILENAME IF_WIN("\"",""),
@@ -1236,11 +1236,12 @@ static int prepare_export()
12361236
{
12371237
sprintf(cmdline,
12381238
IF_WIN("\"","") "\"%s\" --mysqld"
1239-
" --defaults-file=./backup-my.cnf --datadir=."
1239+
" --defaults-file=./backup-my.cnf --defaults-group-suffix=%s --datadir=."
12401240
" --innodb --innodb-fast-shutdown=0"
12411241
" --innodb_purge_rseg_truncate_frequency=1 --innodb-buffer-pool-size=%llu"
12421242
" --console --log-error= --bootstrap < " BOOTSTRAP_FILENAME IF_WIN("\"",""),
12431243
mariabackup_exe,
1244+
(my_defaults_group_suffix?my_defaults_group_suffix:""),
12441245
xtrabackup_use_memory);
12451246
}
12461247

0 commit comments

Comments
 (0)