diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-22 17:08:49 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-22 17:08:49 +0300 |
| commit | 1657b7a583c62deb72267d485bfe201f43909e11 (patch) | |
| tree | a750e2a44fdd296837b566623331e8a9a707d290 /extra/mariabackup | |
| parent | cca75c95bc3c5d0d4a2efb920d3942da3e658654 (diff) | |
| parent | 9868253b32877554a2707634dc6a6fd79c491053 (diff) | |
| download | mariadb-git-1657b7a583c62deb72267d485bfe201f43909e11.tar.gz | |
Merge 10.4 to 10.5
Diffstat (limited to 'extra/mariabackup')
| -rw-r--r-- | extra/mariabackup/xtrabackup.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index cc7aea4e399..faa9b6ea45d 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -2291,7 +2291,7 @@ check_if_skip_database( if (databases_exclude_hash.array && find_filter_in_hashtable(name, &databases_exclude_hash, &database) && - !database->has_tables) { + (!database->has_tables || !databases_include_hash.array)) { /* Database is found and there are no tables specified, skip entire db. */ return DATABASE_SKIP; @@ -2650,7 +2650,7 @@ static lsn_t xtrabackup_copy_log(lsn_t start_lsn, lsn_t end_lsn, bool last) /* We got a full log block. */ scanned_lsn += data_len; } else if (data_len >= log_sys.trailer_offset() - || data_len <= LOG_BLOCK_HDR_SIZE) { + || data_len < LOG_BLOCK_HDR_SIZE) { /* We got a garbage block (abrupt end of the log). */ msg(0,"garbage block: " LSN_PF ",%zu",scanned_lsn, data_len); break; |