Merge 10.0 into 10.1

Rewrite the test encryption.innodb-checksum-algorithm not to
require any restarts or re-bootstrapping, and to cover all
innodb_page_size combinations.

Test innodb.101_compatibility with all innodb_page_size combinations.

mysql-test/suite/innodb/t/101_compatibility.test

@@ -1,4 +1,4 @@
---source include/have_innodb.inc
+--source include/innodb_page_size.inc
 --source include/not_embedded.inc
 
 -- echo #

mysql-test/suite/innodb/t/innodb-alter-debug.test

@@ -1,4 +1,4 @@
---source include/have_innodb.inc
+--source include/innodb_page_size.inc
 --source include/have_debug.inc
 --source include/have_debug_sync.inc
 

mysql-test/suite/innodb/t/innodb-alter-discard.test

@@ -1,7 +1,7 @@
 #Bug#13955083 ALLOW IN-PLACE DDL OPERATIONS ON MISSING OR DISCARDED TABLESPACES
 
 --source include/not_embedded.inc
---source include/have_innodb.inc
+--source include/innodb_page_size.inc
 
 let $MYSQLD_DATADIR=`select @@datadir`;
 SET GLOBAL innodb_file_per_table=1;

mysql-test/suite/innodb/t/innodb-alter-nullable.test

@@ -1,4 +1,4 @@
---source include/have_innodb.inc
+--source include/innodb_page_size.inc
 
 # Save the initial number of concurrent sessions.
 --source include/count_sessions.inc

mysql-test/suite/innodb/t/innodb-alter-table.test

@@ -1,4 +1,4 @@
---source include/have_innodb.inc
+--source include/innodb_page_size.inc
 
 #
 # MMDEV-8386: MariaDB creates very big tmp file and hangs on xtradb

mysql-test/suite/innodb/t/innodb-alter-tempfile.test

@@ -10,8 +10,7 @@
 # Avoid CrashReporter popup on Mac
 --source include/not_crashrep.inc
 
-# InnoDB is required
---source include/have_innodb.inc
+--source include/innodb_page_size.inc
 
 --echo #
 --echo # Bug #18734396	INNODB IN-PLACE ALTER FAILURES BLOCK FUTURE ALTERS