Commit 5bb90cb2 authored by Marko Mäkelä's avatar Marko Mäkelä

Merge 10.5 into 10.6

parents e99ba4ac 27309fc6
...@@ -4614,32 +4614,32 @@ static bool xtrabackup_backup_func() ...@@ -4614,32 +4614,32 @@ static bool xtrabackup_backup_func()
reread_log_header: reread_log_header:
dberr_t err = recv_find_max_checkpoint(&max_cp_field); dberr_t err = recv_find_max_checkpoint(&max_cp_field);
if (err != DB_SUCCESS) { if (err != DB_SUCCESS)
msg("Error: cannot read redo log header"); msg("Error: cannot read redo log header");
unlock_and_fail: else if (log_sys.log.format == 0) {
mysql_mutex_unlock(&log_sys.mutex);
}
if (log_sys.log.format == 0) {
msg("Error: cannot process redo log before MariaDB 10.2.2"); msg("Error: cannot process redo log before MariaDB 10.2.2");
goto unlock_and_fail; err = DB_ERROR;
} }
else {
byte* buf = log_sys.checkpoint_buf; byte* buf = log_sys.checkpoint_buf;
checkpoint_lsn_start = log_sys.log.get_lsn(); checkpoint_lsn_start = log_sys.log.get_lsn();
checkpoint_no_start = log_sys.next_checkpoint_no; checkpoint_no_start = log_sys.next_checkpoint_no;
log_sys.log.read(max_cp_field, {buf, OS_FILE_LOG_BLOCK_SIZE}); log_sys.log.read(max_cp_field, {buf, OS_FILE_LOG_BLOCK_SIZE});
if (checkpoint_no_start != mach_read_from_8(buf + LOG_CHECKPOINT_NO) if (checkpoint_no_start
!= mach_read_from_8(buf + LOG_CHECKPOINT_NO)
|| checkpoint_lsn_start || checkpoint_lsn_start
!= mach_read_from_8(buf + LOG_CHECKPOINT_LSN) != mach_read_from_8(buf + LOG_CHECKPOINT_LSN)
|| log_sys.log.get_lsn_offset() || log_sys.log.get_lsn_offset()
!= mach_read_from_8(buf + LOG_CHECKPOINT_OFFSET)) != mach_read_from_8(buf + LOG_CHECKPOINT_OFFSET))
goto reread_log_header; goto reread_log_header;
}
mysql_mutex_unlock(&log_sys.mutex); mysql_mutex_unlock(&log_sys.mutex);
if (err != DB_SUCCESS)
goto fail;
xtrabackup_init_datasinks(); xtrabackup_init_datasinks();
if (!select_history()) { if (!select_history()) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment