Commit 205b0ce6 authored by Vlad Lesin's avatar Vlad Lesin

MDEV-22894: Mariabackup should not read [mariadb-client] option group

from configuration files
parent 0121a9e0
...@@ -1626,7 +1626,7 @@ static int prepare_export() ...@@ -1626,7 +1626,7 @@ static int prepare_export()
} }
static const char *xb_client_default_groups[]= { 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[]= { static const char *backup_default_groups[]= {
"xtrabackup", "mariabackup", "mariadb-backup", 0, 0, 0}; "xtrabackup", "mariabackup", "mariadb-backup", 0, 0, 0};
......
...@@ -4,3 +4,4 @@ ...@@ -4,3 +4,4 @@
# Check for unknown options in "mariadb-backup" group # Check for unknown options in "mariadb-backup" group
# Check for options overwriting # Check for options overwriting
# Check if uknown options that follow --mysqld-args are ingored # Check if uknown options that follow --mysqld-args are ingored
# Check if [mariadb-client] group is not loaded (MDEV-22894)
...@@ -51,3 +51,14 @@ exec $XTRABACKUP --defaults-file=$custom_cnf --backup --target-dir=$targetdir; ...@@ -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 --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; exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir=$targetdir --mysqld-args --unknown-option;
--rmdir $targetdir --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
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