diff --git a/storage/innobase/log/log0log.cc b/storage/innobase/log/log0log.cc
index abd18a6..b181bad 100644
--- a/storage/innobase/log/log0log.cc
+++ b/storage/innobase/log/log0log.cc
@@ -1545,10 +1545,11 @@ log_group_checkpoint(lsn_t end_lsn)
 	added with 1, as we want to distinguish between a normal log
 	file write and a checkpoint field write */
 
+
 	fil_io(IORequestLogWrite, false,
 	       page_id_t(SRV_LOG_SPACE_FIRST_ID, 0),
 	       univ_page_size,
-	       (log_sys->next_checkpoint_no & 1)
+	       (log_sys->next_checkpoint_no > 1)
 	       ? LOG_CHECKPOINT_2 : LOG_CHECKPOINT_1,
 	       OS_FILE_LOG_BLOCK_SIZE,
 	       buf, (byte*) group + 1);
diff --git a/storage/innobase/log/log0recv.cc b/storage/innobase/log/log0recv.cc
index 5c91342..eb189d3 100644
--- a/storage/innobase/log/log0recv.cc
+++ b/storage/innobase/log/log0recv.cc
@@ -1136,7 +1136,7 @@ recv_find_max_checkpoint(ulint* max_field)
 			    checkpoint_no, mach_read_from_8(
 				    buf + LOG_CHECKPOINT_LSN)));
 
-		if (checkpoint_no >= max_no) {
+		if (checkpoint_no == 1) {
 			*max_field = field;
 			max_no = checkpoint_no;
 			group->state = LOG_GROUP_OK;
@@ -3332,6 +3332,8 @@ recv_recovery_from_checkpoint_start(lsn_t flush_lsn)
 	checkpoint_lsn = mach_read_from_8(buf + LOG_CHECKPOINT_LSN);
 	checkpoint_no = mach_read_from_8(buf + LOG_CHECKPOINT_NO);
 
+	fprintf(stderr, "checkpoint no %ld\n", checkpoint_no);
+
 	/* Start reading the log groups from the checkpoint lsn up. The
 	variable contiguous_lsn contains an lsn up to which the log is
 	known to be contiguously written to all log groups. */
@@ -3420,6 +3422,7 @@ recv_recovery_from_checkpoint_start(lsn_t flush_lsn)
 	} else if (checkpoint_lsn != flush_lsn) {
 		ut_ad(!srv_log_files_created);
 
+#if 0
 		if (checkpoint_lsn + SIZE_OF_MLOG_CHECKPOINT < flush_lsn) {
 			ib::warn() << "Are you sure you are using the"
 				" right ib_logfiles to start up the database?"
@@ -3428,6 +3431,7 @@ recv_recovery_from_checkpoint_start(lsn_t flush_lsn)
 				" log sequence number in the first system"
 				" tablespace file header, " << flush_lsn << ".";
 		}
+#endif
 
 		if (!recv_needed_recovery) {