Commit 63ad4fe5 authored by Marko Mäkelä's avatar Marko Mäkelä

MDEV-13430 InnoDB upgrade from previous versions to 10.3 is not possible

Most of this fix was merged from a backport to 10.2.

recv_find_max_checkpoint(): Do not return DB_SUCCESS on an error.
parent efa4996b
...@@ -1087,7 +1087,6 @@ recv_find_max_checkpoint(ulint* max_field) ...@@ -1087,7 +1087,6 @@ recv_find_max_checkpoint(ulint* max_field)
" The redo log was created with " << creator " The redo log was created with " << creator
<< (err == DB_ERROR << (err == DB_ERROR
? "." : ", and it appears corrupted."); ? "." : ", and it appears corrupted.");
break;
} }
return(err); return(err);
} }
...@@ -3215,7 +3214,7 @@ recv_recovery_from_checkpoint_start(lsn_t flush_lsn) ...@@ -3215,7 +3214,7 @@ recv_recovery_from_checkpoint_start(lsn_t flush_lsn)
err = recv_find_max_checkpoint(&max_cp_field); err = recv_find_max_checkpoint(&max_cp_field);
if (err != DB_SUCCESS if (err != DB_SUCCESS
|| (log_sys->log.format != 0 || (log_sys->log.format != LOG_HEADER_FORMAT_3_23
&& (log_sys->log.format & ~LOG_HEADER_FORMAT_ENCRYPTED) && (log_sys->log.format & ~LOG_HEADER_FORMAT_ENCRYPTED)
!= LOG_HEADER_FORMAT_CURRENT)) { != LOG_HEADER_FORMAT_CURRENT)) {
......
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