Merge 10.3 into 10.4

mysql-test/suite/innodb/r/check_ibd_filesize,32k.rdiff

@@ -1,18 +1,18 @@
---- check_ibd_filesize.result
-+++ check_ibd_filesize.result,32k
+--- mysql-test/suite/innodb/r/check_ibd_filesize.result	2022-08-16 17:28:06.462350465 +0530
++++ mysql-test/suite/innodb/r/check_ibd_filesize.reject	2022-08-16 17:29:25.129637040 +0530
 @@ -3,18 +3,12 @@
  # SPACE IN 5.7 THAN IN 5.6
  #
  CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
--# bytes: 98304
-+# bytes: 196608
+-# bytes: 65536
++# bytes: 131072
  INSERT INTO t1 SELECT * FROM seq_1_to_25000;
 -# bytes: 9437184
 +# bytes: 786432
  DROP TABLE t1;
  CREATE TABLE t1 (a INT PRIMARY KEY, b BLOB) ENGINE=InnoDB;
--# bytes: 98304
-+# bytes: 196608
+-# bytes: 65536
++# bytes: 131072
  INSERT INTO t1 SELECT seq,REPEAT('a',30000) FROM seq_1_to_20;
 -# bytes: 4194304
 -DROP TABLE t1;

mysql-test/suite/innodb/r/check_ibd_filesize,4k.rdiff

@@ -1,17 +1,17 @@
---- check_ibd_filesize.result
-+++ check_ibd_filesize.result,4k
+--- mysql-test/suite/innodb/r/check_ibd_filesize.result	2022-08-16 17:28:06.462350465 +0530
++++ mysql-test/suite/innodb/r/check_ibd_filesize.reject	2022-08-16 17:31:39.288769153 +0530
 @@ -3,18 +3,18 @@
  # SPACE IN 5.7 THAN IN 5.6
  #
  CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
--# bytes: 98304
-+# bytes: 24576
+-# bytes: 65536
++# bytes: 16384
  INSERT INTO t1 SELECT * FROM seq_1_to_25000;
  # bytes: 9437184
  DROP TABLE t1;
  CREATE TABLE t1 (a INT PRIMARY KEY, b BLOB) ENGINE=InnoDB;
--# bytes: 98304
-+# bytes: 24576
+-# bytes: 65536
++# bytes: 16384
  INSERT INTO t1 SELECT seq,REPEAT('a',30000) FROM seq_1_to_20;
  # bytes: 4194304
  DROP TABLE t1;

mysql-test/suite/innodb/r/check_ibd_filesize,64k.rdiff

@@ -1,18 +1,18 @@
---- check_ibd_filesize.result
-+++ check_ibd_filesize.result,64k
+--- mysql-test/suite/innodb/r/check_ibd_filesize.result	2022-08-16 17:28:06.462350465 +0530
++++ mysql-test/suite/innodb/r/check_ibd_filesize.reject	2022-08-16 17:30:28.957174270 +0530
 @@ -3,18 +3,12 @@
  # SPACE IN 5.7 THAN IN 5.6
  #
  CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
--# bytes: 98304
-+# bytes: 393216
+-# bytes: 65536
++# bytes: 262144
  INSERT INTO t1 SELECT * FROM seq_1_to_25000;
 -# bytes: 9437184
 +# bytes: 983040
  DROP TABLE t1;
  CREATE TABLE t1 (a INT PRIMARY KEY, b BLOB) ENGINE=InnoDB;
--# bytes: 98304
-+# bytes: 393216
+-# bytes: 65536
++# bytes: 262144
  INSERT INTO t1 SELECT seq,REPEAT('a',30000) FROM seq_1_to_20;
 -# bytes: 4194304
 -DROP TABLE t1;

mysql-test/suite/innodb/r/check_ibd_filesize,8k.rdiff

@@ -1,17 +1,17 @@
---- check_ibd_filesize.result
-+++ check_ibd_filesize.result,8k
+--- mysql-test/suite/innodb/r/check_ibd_filesize.result	2022-08-16 17:28:06.462350465 +0530
++++ mysql-test/suite/innodb/r/check_ibd_filesize.reject	2022-08-16 17:31:03.516962339 +0530
 @@ -3,18 +3,18 @@
  # SPACE IN 5.7 THAN IN 5.6
  #
  CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
--# bytes: 98304
-+# bytes: 49152
+-# bytes: 65536
++# bytes: 32768
  INSERT INTO t1 SELECT * FROM seq_1_to_25000;
  # bytes: 9437184
  DROP TABLE t1;
  CREATE TABLE t1 (a INT PRIMARY KEY, b BLOB) ENGINE=InnoDB;
--# bytes: 98304
-+# bytes: 49152
+-# bytes: 65536
++# bytes: 32768
  INSERT INTO t1 SELECT seq,REPEAT('a',30000) FROM seq_1_to_20;
  # bytes: 4194304
  DROP TABLE t1;

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

@@ -3,12 +3,12 @@
 # SPACE IN 5.7 THAN IN 5.6
 #
 CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
-# bytes: 98304
+# bytes: 65536
 INSERT INTO t1 SELECT * FROM seq_1_to_25000;
 # bytes: 9437184
 DROP TABLE t1;
 CREATE TABLE t1 (a INT PRIMARY KEY, b BLOB) ENGINE=InnoDB;
-# bytes: 98304
+# bytes: 65536
 INSERT INTO t1 SELECT seq,REPEAT('a',30000) FROM seq_1_to_20;
 # bytes: 4194304
 DROP TABLE t1;

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

@@ -5,6 +5,7 @@
 #
 
 --source include/have_innodb.inc
+--source include/innodb_page_size.inc
 # Embedded server does not restart of server
 --source include/not_embedded.inc
 --source include/no_valgrind_without_big.inc