Commit bf1e09e0 authored by Julius Goryavsky's avatar Julius Goryavsky

Removed extra spaces in generated command lines (minor "cosmetic"

change after MDEV-24197)
parent d5dacca4
...@@ -1815,19 +1815,19 @@ static int prepare_export() ...@@ -1815,19 +1815,19 @@ static int prepare_export()
// Process defaults-file , it can have some --lc-language stuff, // Process defaults-file , it can have some --lc-language stuff,
// which is* unfortunately* still necessary to get mysqld up // which is* unfortunately* still necessary to get mysqld up
if (strncmp(orig_argv1,"--defaults-file=",16) == 0) if (strncmp(orig_argv1,"--defaults-file=", 16) == 0)
{ {
snprintf(cmdline, sizeof cmdline, snprintf(cmdline, sizeof cmdline,
IF_WIN("\"","") "\"%s\" --mysqld \"%s\" " IF_WIN("\"","") "\"%s\" --mysqld \"%s\""
" --defaults-extra-file=./backup-my.cnf --defaults-group-suffix=%s --datadir=." " --defaults-extra-file=./backup-my.cnf --defaults-group-suffix=%s --datadir=."
" --innodb --innodb-fast-shutdown=0 --loose-partition" " --innodb --innodb-fast-shutdown=0 --loose-partition"
" --innodb_purge_rseg_truncate_frequency=1 --innodb-buffer-pool-size=%llu" " --innodb_purge_rseg_truncate_frequency=1 --innodb-buffer-pool-size=%llu"
" --console --skip-log-error --skip-log-bin --bootstrap %s < " " --console --skip-log-error --skip-log-bin --bootstrap %s< "
BOOTSTRAP_FILENAME IF_WIN("\"",""), BOOTSTRAP_FILENAME IF_WIN("\"",""),
mariabackup_exe, mariabackup_exe,
orig_argv1, (my_defaults_group_suffix?my_defaults_group_suffix:""), orig_argv1, (my_defaults_group_suffix?my_defaults_group_suffix:""),
xtrabackup_use_memory, xtrabackup_use_memory,
(srv_force_recovery ? "--innodb-force-recovery=1" : "")); (srv_force_recovery ? "--innodb-force-recovery=1 " : ""));
} }
else else
{ {
...@@ -1836,12 +1836,12 @@ static int prepare_export() ...@@ -1836,12 +1836,12 @@ static int prepare_export()
" --defaults-file=./backup-my.cnf --defaults-group-suffix=%s --datadir=." " --defaults-file=./backup-my.cnf --defaults-group-suffix=%s --datadir=."
" --innodb --innodb-fast-shutdown=0 --loose-partition" " --innodb --innodb-fast-shutdown=0 --loose-partition"
" --innodb_purge_rseg_truncate_frequency=1 --innodb-buffer-pool-size=%llu" " --innodb_purge_rseg_truncate_frequency=1 --innodb-buffer-pool-size=%llu"
" --console --log-error= --skip-log-bin --bootstrap %s < " " --console --log-error= --skip-log-bin --bootstrap %s< "
BOOTSTRAP_FILENAME IF_WIN("\"",""), BOOTSTRAP_FILENAME IF_WIN("\"",""),
mariabackup_exe, mariabackup_exe,
(my_defaults_group_suffix?my_defaults_group_suffix:""), (my_defaults_group_suffix?my_defaults_group_suffix:""),
xtrabackup_use_memory, xtrabackup_use_memory,
(srv_force_recovery ? "--innodb-force-recovery=1" : "")); (srv_force_recovery ? "--innodb-force-recovery=1 " : ""));
} }
msg("Prepare export : executing %s\n", cmdline); msg("Prepare export : executing %s\n", cmdline);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment