diff options
| author | Vlad Lesin <vlad_lesin@mail.ru> | 2020-06-16 12:02:13 +0300 |
|---|---|---|
| committer | Vlad Lesin <vlad_lesin@mail.ru> | 2020-06-18 12:19:48 +0300 |
| commit | 205b0ce6ad21dbafe8def505307b4922398db5b2 (patch) | |
| tree | bde8365b79bde6b78e2bb4c905e9a73be2f0d146 | |
| parent | 0121a9e0bb9b65963c676ccf7ef2eb50cabad8da (diff) | |
| download | mariadb-git-205b0ce6ad21dbafe8def505307b4922398db5b2.tar.gz | |
MDEV-22894: Mariabackup should not read [mariadb-client] option group
from configuration files
| -rw-r--r-- | extra/mariabackup/xtrabackup.cc | 2 | ||||
| -rw-r--r-- | mysql-test/suite/mariabackup/options_check.result | 1 | ||||
| -rw-r--r-- | mysql-test/suite/mariabackup/options_check.test | 11 |
3 files changed, 13 insertions, 1 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index 19058398258..3946879415d 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -1626,7 +1626,7 @@ end: } static const char *xb_client_default_groups[]= { - "client", "client-server", "client-mariadb", "mariadb-client", 0, 0, 0}; + "client", "client-server", "client-mariadb", 0, 0, 0}; static const char *backup_default_groups[]= { "xtrabackup", "mariabackup", "mariadb-backup", 0, 0, 0}; diff --git a/mysql-test/suite/mariabackup/options_check.result b/mysql-test/suite/mariabackup/options_check.result index da44f1dda5f..6b9925a0a8e 100644 --- a/mysql-test/suite/mariabackup/options_check.result +++ b/mysql-test/suite/mariabackup/options_check.result @@ -4,3 +4,4 @@ # Check for unknown options in "mariadb-backup" group # Check for options overwriting # Check if uknown options that follow --mysqld-args are ingored +# Check if [mariadb-client] group is not loaded (MDEV-22894) diff --git a/mysql-test/suite/mariabackup/options_check.test b/mysql-test/suite/mariabackup/options_check.test index f4f65fa7eae..7483453d19b 100644 --- a/mysql-test/suite/mariabackup/options_check.test +++ b/mysql-test/suite/mariabackup/options_check.test @@ -51,3 +51,14 @@ exec $XTRABACKUP --defaults-file=$custom_cnf --backup --target-dir=$targetdir; --echo # Check if uknown options that follow --mysqld-args are ingored exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir=$targetdir --mysqld-args --unknown-option; --rmdir $targetdir + +--echo # Check if [mariadb-client] group is not loaded (MDEV-22894) +--copy_file $MYSQLTEST_VARDIR/my.cnf $custom_cnf +--append_file $custom_cnf +[mariadb-client] +user=bla +password=bla +EOF +exec $XTRABACKUP --defaults-file=$custom_cnf --backup --target-dir=$targetdir; +--remove_file $custom_cnf +--rmdir $targetdir |