diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-26 14:05:15 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-26 14:05:15 +0200 |
| commit | 1afed2077491329797dd577c5b1e6594e4a82f65 (patch) | |
| tree | a6869ae2e32dc2a7db8e01e2a69f3e350da831ee /mysql-test/suite/galera_3nodes | |
| parent | 06972b2fbc3d3ae77e8a7ca4558d2e9ee64eba6d (diff) | |
| parent | 9669536c2355efb6f71babc9d2e615e9125c816b (diff) | |
| download | mariadb-git-1afed2077491329797dd577c5b1e6594e4a82f65.tar.gz | |
Merge 10.2 into 10.3
The test galera_sst_mariabackup_table_options was disabled,
because the server refuses to start up due to wrong parameters.
Diffstat (limited to 'mysql-test/suite/galera_3nodes')
| -rw-r--r-- | mysql-test/suite/galera_3nodes/disabled.def | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/suite/galera_3nodes/disabled.def b/mysql-test/suite/galera_3nodes/disabled.def index a9b9b00b40c..e640baebf7d 100644 --- a/mysql-test/suite/galera_3nodes/disabled.def +++ b/mysql-test/suite/galera_3nodes/disabled.def @@ -1,3 +1,4 @@ galera_slave_options_do :MDEV-8798 galera_slave_options_ignore : MDEV-8798 - +galera_innobackupex_backup : xtrabackup is deprecated +galera_ipv6_xtrabackup-v2 : xtrabackup is deprecated |