Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext

storage/innobase/log/log0recv.cc

@@ -3126,6 +3126,9 @@ recv_recovery_from_checkpoint_start(lsn_t flush_lsn)
 	byte*		buf;
 	dberr_t		err = DB_SUCCESS;
 
+	ut_ad(srv_operation == SRV_OPERATION_NORMAL
+	      || srv_operation == SRV_OPERATION_RESTORE);
+
 	/* Initialize red-black tree for fast insertions into the
 	flush_list during recovery process. */
 	buf_flush_init_flush_rbt();
@@ -3342,9 +3345,11 @@ recv_recovery_from_checkpoint_start(lsn_t flush_lsn)
 
 	log_sys->last_checkpoint_lsn = checkpoint_lsn;
 
-	if (!srv_read_only_mode) {
+	if (!srv_read_only_mode && srv_operation == SRV_OPERATION_NORMAL) {
 		/* Write a MLOG_CHECKPOINT marker as the first thing,
-		before generating any other redo log. */
+		before generating any other redo log. This ensures
+		that subsequent crash recovery will be possible even
+		if the server were killed soon after this. */
 		fil_names_clear(log_sys->last_checkpoint_lsn, true);
 	}
 

storage/innobase/mtr/mtr0mtr.cc

@@ -599,9 +599,6 @@ mtr_t::commit_checkpoint(
 	ut_d(m_impl.m_state = MTR_STATE_COMMITTING);
 	ut_ad(write_mlog_checkpoint || m_impl.m_n_log_recs > 1);
 
-	/* This is a dirty read, for debugging. */
-	ut_ad(!recv_no_log_write);
-
 	switch (m_impl.m_n_log_recs) {
 	case 0:
 		break;