Skip to content

Commit

Permalink
MDEV-13430 InnoDB upgrade from previous versions to 10.3 is not possible
Browse files Browse the repository at this point in the history
Most of this fix was merged from a backport to 10.2.

recv_find_max_checkpoint(): Do not return DB_SUCCESS on an error.
  • Loading branch information
dr-m committed Aug 9, 2017
1 parent efa4996 commit 63ad4fe
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions storage/innobase/log/log0recv.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1087,7 +1087,6 @@ recv_find_max_checkpoint(ulint* max_field)
" The redo log was created with " << creator
<< (err == DB_ERROR
? "." : ", and it appears corrupted.");
break;
}
return(err);
}
Expand Down Expand Up @@ -3215,7 +3214,7 @@ recv_recovery_from_checkpoint_start(lsn_t flush_lsn)
err = recv_find_max_checkpoint(&max_cp_field);

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_HEADER_FORMAT_CURRENT)) {

Expand Down

0 comments on commit 63ad4fe

Please sign in to comment.