diff options
| author | Geoff Montee <geoff.montee@gmail.com> | 2019-01-23 21:59:16 -0500 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2019-01-24 12:44:55 +0100 |
| commit | f17c284c5745f34de230af8a339eabb11bc0d5ee (patch) | |
| tree | 44b1ab7cde784c1fdf4001f7ac15f4f9312b902b /extra | |
| parent | 65350042a42b46e63d24e0e84453619d57d4e203 (diff) | |
| download | mariadb-git-f17c284c5745f34de230af8a339eabb11bc0d5ee.tar.gz | |
MDEV-18347: mariabackup doesn't read all server option groups from configuration files
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/mariabackup/xtrabackup.cc | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index ef75797d1a4..338b70dc874 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -1234,11 +1234,23 @@ debug_sync_point(const char *name) #endif } -static const char *xb_client_default_groups[]= - { "xtrabackup", "mariabackup", "client", 0, 0, 0 }; +static const char *xb_client_default_groups[]={ + "xtrabackup", "mariabackup", + "client", "client-server", + "client-mariadb", + 0, 0, 0 +}; -static const char *xb_server_default_groups[]= - { "xtrabackup", "mariabackup", "mysqld", 0, 0, 0 }; +static const char *xb_server_default_groups[]={ + "xtrabackup", "mariabackup", + "mysqld", "server", MYSQL_BASE_VERSION, + "mariadb", MARIADB_BASE_VERSION, + "client-server", + #ifdef WITH_WSREP + "galera", + #endif + 0, 0, 0 +}; static void print_version(void) { |