diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-22 13:27:18 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-22 13:27:18 +0300 |
| commit | 46957a6a77518b579c6c8e1345666f84a5a59455 (patch) | |
| tree | c0e463f14123cd09bb4d5854d32577e44b3a9827 /extra | |
| parent | 1619ae899099c4934f3b5919b2398c95a7cacc94 (diff) | |
| parent | e3d692aa092a76415ce1ce0e9662338873d84abb (diff) | |
| download | mariadb-git-46957a6a77518b579c6c8e1345666f84a5a59455.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'extra')
| -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 76c90152c39..b32c9d9b523 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -2358,7 +2358,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; @@ -2718,7 +2718,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; |