mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-06 15:15:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.4 into 10.5

Browse source
This commit is contained in:
Marko Mäkelä 2020-07-02 09:41:44 +03:00
commit 1813d92d0c
234 changed files with 3048 additions and 789 deletions
Download patch file Download diff file Expand all files Collapse all files

1
mysql-test/suite/mariabackup/options_check.result
View file

@ -5,3 +5,4 @@
# Check for options overwriting
# Check if uknown options that follow --mysqld-args are ingored
# Check if [mariadb-client] group is not loaded (MDEV-22894)
# Check if --help presents

7
mysql-test/suite/mariabackup/options_check.test
View file

@ -7,7 +7,6 @@
exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --unknown-option=xxx --target-dir=$targetdir;
--error 2
exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --unknown-option --target-dir=$targetdir;
--enable_result_log
--echo # Check for unknown options in "mariabackup" group
--write_file $custom_cnf
@ -62,3 +61,9 @@ EOF
exec $XTRABACKUP --defaults-file=$custom_cnf --backup --target-dir=$targetdir;
--remove_file $custom_cnf
--rmdir $targetdir
--echo # Check if --help presents
exec $XTRABACKUP --help;
exec $XTRABACKUP -?;
--enable_result_log