diff options
| author | Julius Goryavsky <julius.goryavsky@mariadb.com> | 2020-03-24 14:55:07 +0100 |
|---|---|---|
| committer | Julius Goryavsky <julius.goryavsky@mariadb.com> | 2020-10-20 12:41:06 +0200 |
| commit | 888010d9dd5409c48caf01fb0f465c98caa232c7 (patch) | |
| tree | f34a112ccc366dfb561fe32f8225b7db53f1964c /extra/mariabackup | |
| parent | 692a44b30928e9bfb8f7a1aaf450fc29fa97c4b8 (diff) | |
| download | mariadb-git-888010d9dd5409c48caf01fb0f465c98caa232c7.tar.gz | |
MDEV-21951: mariabackup SST fail if data-directory have lost+found directory
To fix this, it is necessary to add an option to exclude the
database with the name "lost+found" from processing (the database
name will be checked by the check_if_skip_database_by_path() or
by the check_if_skip_database() function, and as a result
"lost+found" will be skipped).
In addition, it is necessary to slightly modify the verification
logic in the check_if_skip_database() function.
Also added a new test galera_sst_mariabackup_lost_found.test
Diffstat (limited to 'extra/mariabackup')
| -rw-r--r-- | extra/mariabackup/xtrabackup.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index 162efebbd9f..7cb9d5ac3fe 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -2371,7 +2371,7 @@ check_if_skip_database( if (databases_exclude_hash && find_filter_in_hashtable(name, databases_exclude_hash, &database) && - !database->has_tables) { + (!database->has_tables || !databases_include_hash)) { /* Database is found and there are no tables specified, skip entire db. */ return DATABASE_SKIP; |