diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-04-26 18:59:40 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-04-26 18:59:40 +0300 |
| commit | 638afc4acf86b32b74b3b37314f2dbd048062814 (patch) | |
| tree | 7de9e7edb4f45cef5aa8664235270f96bd7eae07 /extra/mariabackup | |
| parent | ee5966c75404fd4e35dde52f1ebb78e3e20ebf77 (diff) | |
| parent | 2c005261cb7ee12e4da63d7769ba1ebe8f8cdc9f (diff) | |
| download | mariadb-git-638afc4acf86b32b74b3b37314f2dbd048062814.tar.gz | |
Merge 10.6 into 10.7
Diffstat (limited to 'extra/mariabackup')
| -rw-r--r-- | extra/mariabackup/backup_copy.cc | 8 | ||||
| -rw-r--r-- | extra/mariabackup/xtrabackup.cc | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/extra/mariabackup/backup_copy.cc b/extra/mariabackup/backup_copy.cc index ff2ff5bfc4a..ce94ef5864d 100644 --- a/extra/mariabackup/backup_copy.cc +++ b/extra/mariabackup/backup_copy.cc @@ -55,6 +55,7 @@ Street, Fifth Floor, Boston, MA 02110-1335 USA #include "xtrabackup.h" #include "common.h" #include "backup_copy.h" +#include "backup_debug.h" #include "backup_mysql.h" #include <btr0btr.h> @@ -1443,6 +1444,13 @@ bool backup_start(CorruptedPages &corrupted_pages) msg("Waiting for log copy thread to read lsn %llu", (ulonglong)server_lsn_after_lock); backup_wait_for_lsn(server_lsn_after_lock); + DBUG_EXECUTE_FOR_KEY("sleep_after_waiting_for_lsn", {}, + { + ulong milliseconds = strtoul(dbug_val, NULL, 10); + msg("sleep_after_waiting_for_lsn"); + my_sleep(milliseconds*1000UL); + }); + backup_fix_ddl(corrupted_pages); // There is no need to stop slave thread before coping non-Innodb data when diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index 366df161795..d16306eeec4 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -3099,7 +3099,7 @@ static void log_copying_thread() (!metadata_to_lsn || metadata_to_lsn > log_copy_scanned_lsn)) { timespec abstime; - set_timespec_nsec(abstime, 1000ULL * xtrabackup_log_copy_interval); + set_timespec_nsec(abstime, 1000000ULL * xtrabackup_log_copy_interval); mysql_cond_timedwait(&log_copying_stop, &log_sys.mutex, &abstime); } log_copying_running= false; @@ -6779,7 +6779,7 @@ int main(int argc, char **argv) key_map_full.set_all(); logger.init_base(); - logger.set_handlers(LOG_FILE, LOG_NONE, LOG_NONE); + logger.set_handlers(LOG_NONE, LOG_NONE); mysql_mutex_init(key_LOCK_error_log, &LOCK_error_log, MY_MUTEX_INIT_FAST); |