mirror of
https://github.com/MariaDB/server.git
synced 2025-11-27 05:41:41 +03:00
9bdf35e90f
MDEV-21298: mariabackup doesn't read from the [mariadbd] and [mariadbd-X.Y]
server option groups from configuration files
MDEV-21301: mariabackup doesn't read [mariadb-backup] option group in
configuration file
All three issues require to change the same code, that is why their
fixes are joined in one commit.
The fix is in invoking load_defaults_or_exit() and handle_options() for
backup-specific groups separately from client-server groups to let the last
handle_options() call fail on unknown backup-specific options.
The order of options procesing is the following:
1) Load server groups and process server options, ignore unknown
options
2) Load client groups and process client options, ignore unknown
options
3) Load backup groups and process client-server options, exit on
unknown option
4) Process --mysqld-args command line options, ignore unknown options
New global flag my_handle_options_init_variables was added to have
ability to invoke handle_options() for the same allowed options set
several times without re-initialising previously set option values.
--password value destroying is moved from option processing callback to
mariabackup's handle_options() function to have ability to invoke server's
handle_options() several times for the same possible allowed options
set.
Galera invokes wsrep_sst_mariabackup.sh with mysqld command line
options to configure mariabackup as close to the server as possible.
It is not known what server options are supported by mariabackup when the
script is invoked. That is why new mariabackup option "--mysqld-args" is added,
all unknown options that follow this option will be silently ignored.
wsrep_sst_mariabackup.sh was also changed to:
- use "--mysqld-args" mariabackup option to pass mysqld options,
- remove deprecated innobackupex mode,
- remove unsupported mariabackup options:
--encrypt
--encrypt-key
--rebuild-indexes
--rebuild-threads
53 lines
1.6 KiB
Plaintext
53 lines
1.6 KiB
Plaintext
--source include/have_debug.inc
|
|
|
|
call mtr.add_suppression("InnoDB: New log files created");
|
|
|
|
let $basedir=$MYSQLTEST_VARDIR/tmp/backup;
|
|
let $incremental_dir=$MYSQLTEST_VARDIR/tmp/backup_inc1;
|
|
|
|
CREATE TABLE t1(i INT PRIMARY KEY) ENGINE INNODB;
|
|
CREATE TABLE t2(i INT PRIMARY KEY) ENGINE INNODB;
|
|
CREATE TABLE t3(i INT) ENGINE INNODB;
|
|
|
|
echo # Create full backup , modify table, then create incremental/differential backup;
|
|
--disable_result_log
|
|
exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir=$basedir;
|
|
--enable_result_log
|
|
|
|
INSERT into t1 values(1);
|
|
|
|
--let after_load_tablespaces=CREATE TABLE test.t4 ENGINE=INNODB SELECT UUID() from test.seq_1_to_10000
|
|
--let after_copy_test_t1=RENAME TABLE test.t1 TO test.t1_renamed
|
|
--let after_copy_test_t2=DROP TABLE test.t2
|
|
--let after_copy_test_t3=CREATE INDEX a_i ON test.t3(i);
|
|
|
|
exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir=$incremental_dir --incremental-basedir=$basedir --dbug=+d,mariabackup_events;
|
|
--let after_load_tablespaces=
|
|
--disable_result_log
|
|
echo # Prepare full backup, apply incremental one;
|
|
exec $XTRABACKUP --prepare --target-dir=$basedir;
|
|
exec $XTRABACKUP --prepare --target-dir=$basedir --incremental-dir=$incremental_dir ;
|
|
|
|
echo # Restore and check results;
|
|
let $targetdir=$basedir;
|
|
-- source include/restart_and_restore.inc
|
|
--enable_result_log
|
|
|
|
# Test that t1 does not exist, but t1_renamed does
|
|
CREATE TABLE t1(i int);
|
|
DROP TABLE t1;
|
|
|
|
SELECT * from t1_renamed;
|
|
DROP TABLE t1_renamed;
|
|
|
|
# Test that t2 does not exist;
|
|
CREATE TABLE t2(i INT PRIMARY KEY) ENGINE INNODB;
|
|
DROP TABLE t2;
|
|
|
|
DROP TABLE t3;
|
|
DROP TABLE t4;
|
|
|
|
# Cleanup
|
|
rmdir $basedir;
|
|
rmdir $incremental_dir;
|