diff options
| author | Vlad Lesin <vlad_lesin@mail.ru> | 2020-12-01 18:15:53 +0300 |
|---|---|---|
| committer | Vlad Lesin <vlad_lesin@mail.ru> | 2020-12-01 18:33:10 +0300 |
| commit | e30a05f4540b581df2e7d98bd7e812aeff603744 (patch) | |
| tree | 10dfa7d640951e086b81141a8e2fef72de0fbf9d | |
| parent | 7edfed6305638366482d573f91b13f5594ffdd85 (diff) | |
| download | mariadb-git-e30a05f4540b581df2e7d98bd7e812aeff603744.tar.gz | |
MDEV-22929 MariaBackup option to report and/or continue when corruption is encountered
Post-push Windows compilation errors fix.
| -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 74605162a78..e705c00465f 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -454,7 +454,7 @@ bool CorruptedPages::print_to_file(const char *filename) const ut_a(!pthread_mutex_unlock(&m_mutex)); if (xtrabackup_backup) return backup_file_print_buf(filename, out.str().c_str(), - out.str().size()); + static_cast<int>(out.str().size())); std::ofstream outfile; outfile.open(filename); if (!outfile.is_open()) @@ -542,7 +542,7 @@ void CorruptedPages::zero_out_free_pages() space_it->second.pages.begin(); page_it != space_it->second.pages.end(); ++page_it) { - bool is_free= fseg_page_is_free(space, *page_it); + bool is_free= fseg_page_is_free(space, static_cast<unsigned>(*page_it)); if (!is_free) { space_info_t &space_info = non_free_pages[space_id]; space_info.pages.insert(*page_it); |