diff options
| author | kevincheng2 <chengyf112@gmail.com> | 2023-03-03 17:33:07 -0800 |
|---|---|---|
| committer | Anel <an3l@users.noreply.github.com> | 2023-03-07 11:02:44 +0100 |
| commit | e240e2749eeaadc594b05dc600440f316d50eaee (patch) | |
| tree | b567146bdc008d8fabed5a44662f45fd4deb86b0 /extra | |
| parent | 46a7e96339d166fee60f80f03a8cf9281b42aa32 (diff) | |
| download | mariadb-git-e240e2749eeaadc594b05dc600440f316d50eaee.tar.gz | |
MDEV-30758 mariabackup --help only lists server groups read in configuration
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/mariabackup/xtrabackup.cc | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index c674b3e16e1..d2ce3395da8 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -1817,6 +1817,12 @@ static void print_version(void) my_progname, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE); } +static void concatenate_default_groups(std::vector<const char*> &backup_load_groups, const char **default_groups) +{ + for ( ; *default_groups ; default_groups++) + backup_load_groups.push_back(*default_groups); +} + static void usage(void) { puts("Open source backup tool for InnoDB and XtraDB\n\ @@ -1837,7 +1843,11 @@ GNU General Public License for more details.\n\ You can download full text of the license on http://www.gnu.org/licenses/gpl-2.0.txt\n"); printf("Usage: %s [--defaults-file=#] [--backup | --prepare | --copy-back | --move-back] [OPTIONS]\n",my_progname); - print_defaults("my", load_default_groups); + std::vector<const char*> backup_load_default_groups; + concatenate_default_groups(backup_load_default_groups, backup_default_groups); + concatenate_default_groups(backup_load_default_groups, load_default_groups); + backup_load_default_groups.push_back(nullptr); + print_defaults("my", &backup_load_default_groups[0]); my_print_help(xb_client_options); my_print_help(xb_server_options); my_print_variables(xb_server_options); |