Bug #21951764 IMPOSSIBLE TO UPGRADE DATABASE FROM 5.7 TO 5.8,

		EVEN WHEN STOPPING GRACEFULLY

Problem:
=======
In function logs_empty_and_mark_files_at_shutdown(), checkpoint is done
repeatedly until log_sys->lsn == log_sys->last_checkpoint_lsn. So after
writing MLOG_CHECKPOINT record, log_sys->lsn will be greater than
last_checkpoint_lsn. In the next iteration of log_make_checkpoint_at(),
updation is done only the checkpoint lsn in the log file header
with the log_sys->lsn. In trunk, there will no MLOG_CHECKPOINT record
after checkpoint_lsn and it leads to upgrade failure.

Solution:
========
To verify if the shutdown is normal before upgrade, make sure that there
are no redo log records after checkpoint lsn.

Reviewed-by: Marko Makela<marko.makela@oracle.com>
RB:11603

Author: Thirunarayanan

mysql-test/suite/innodb/r/log_corruption.result

@@ -13,8 +13,11 @@
 # --innodb-force-recovery=6 (skip the entire redo log)
 # valid 5.7.9 header, valid checkpoint 1, no matching MLOG_CHECKSUM
 # --innodb-force-recovery=6 (skip the entire redo log)
-# upgrade: valid 5.7.9 header, valid checkpoint 1, clean redo log
+# upgrade: valid 5.7.9 header, valid checkpoint 1, logically non empty
+# redo log
 # Test a corrupted MLOG_FILE_NAME record.
 # current header, valid checkpoint 1, all-zero (invalid) checkpoint 2
 # Test a corrupted MLOG_FILE_NAME record.
 # valid header, invalid checkpoint 1, valid checkpoint 2
+# Upgrade: valid 5.7.9 header, valid checkpoint 1, logically empty
+# redo log

mysql-test/suite/innodb/t/log_corruption.test

@@ -113,15 +113,14 @@ let SEARCH_PATTERN=Plugin 'InnoDB' registration as a STORAGE ENGINE failed;
 let SEARCH_PATTERN=InnoDB: Cannot create sys_virtual system tables. running in read-only mode;
 --source include/search_pattern_in_file.inc
 
---echo # upgrade: valid 5.7.9 header, valid checkpoint 1, clean redo log
+--echo # upgrade: valid 5.7.9 header, valid checkpoint 1, logically non empty
+--echo # redo log
 --remove_file $newdir/ib_logfile0
 --exec unzip $MYSQL_TEST_DIR/suite/innodb/t/log_corruption4d.zip -d $newdir > $SEARCH_FILE
 --error 1
 --exec $MYSQLD $args --innodb-log-file-size=4M
-let SEARCH_PATTERN=InnoDB: Upgrading redo log: 2\\*.* pages, LSN=1213964;
+let SEARCH_PATTERN=InnoDB: Upgrade after a crash is not supported\\. This redo log was created with malicious intentions, or perhaps\\.;
 --source include/search_pattern_in_file.inc
-# This was created by the upgrade.
---remove_file $newdir/ib_buffer_pool
 
 # Replace database with 1M redo logs from before MySQL 5.7.9
 --remove_file $newdir/ib_logfile0
@@ -165,6 +164,17 @@ let SEARCH_PATTERN= len 22. hex 38000000000012860cb7809781e80006626f67757300. as
 let SEARCH_PATTERN=InnoDB: Set innodb_force_recovery to ignore this error;
 --source include/search_pattern_in_file.inc
 
+--echo # Upgrade: valid 5.7.9 header, valid checkpoint 1, logically empty
+--echo # redo log
+--remove_file $newdir/ib_logfile0
+--exec unzip $MYSQL_TEST_DIR/suite/innodb/t/log_corruption7.zip -d $newdir > $SEARCH_FILE
+--error 1
+--exec $MYSQLD $args
+let SEARCH_PATTERN=InnoDB: Upgrading redo log: 2\\*.* pages, LSN=1213973;
+--source include/search_pattern_in_file.inc
+# This was created by the upgrade.
+--remove_file $newdir/ib_buffer_pool
+
 --remove_file $SEARCH_FILE
 --remove_file $newdir/ibdata1
 --remove_file $newdir/ib_logfile0

mysql-test/suite/innodb/t/log_corruption7.zip

@@ -1111,15 +1111,11 @@ recv_log_recover_5_7(lsn_t lsn)
 		return(DB_CORRUPTION);
 	}
 
-	/* On a clean shutdown, there will only be the MLOG_CHECKPOINT
-	record pointing to our checkpoint. */
+	/* On a clean shutdown, the redo log will be logically empty
+	after the checkpoint lsn. */
 
 	if (log_block_get_data_len(buf)
-	    != ((source_offset + SIZE_OF_MLOG_CHECKPOINT)
-		& (OS_FILE_LOG_BLOCK_SIZE - 1))
-	    || log_block_get_first_rec_group(buf) != LOG_BLOCK_HDR_SIZE
-	    || mach_read_from_1(buf + LOG_BLOCK_HDR_SIZE) != MLOG_CHECKPOINT
-	    || mach_read_from_8(buf + (LOG_BLOCK_HDR_SIZE + 1)) != lsn) {
+	    != (source_offset & (OS_FILE_LOG_BLOCK_SIZE - 1))) {
 		ib::error() << NO_UPGRADE_RECOVERY_MSG
 			<< log_header_creator
 			<< NO_UPGRADE_RTFM_MSG;