Merge 10.6 into 10.9

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

@@ -14,7 +14,6 @@ WHERE TABLE_NAME LIKE '%infoschema_buffer_test%' AND PAGE_TYPE='index';
 POOL_ID	BLOCK_ID	SPACE	PAGE_NUMBER	PAGE_TYPE	FLUSH_TYPE	FIX_COUNT	IS_HASHED	NEWEST_MODIFICATION	OLDEST_MODIFICATION	ACCESS_TIME	TABLE_NAME	INDEX_NAME	NUMBER_RECORDS	DATA_SIZE	COMPRESSED_SIZE	PAGE_STATE	IO_FIX	IS_OLD	FREE_PAGE_CLOCK
 0	#	#	3	INDEX	0	FIX	AHI	LSN	LSN	TIME	`test`.`infoschema_buffer_test`	GEN_CLUST_INDEX	2	58	0	FILE_PAGE	IO_FIX	OLD	#
 0	#	#	4	INDEX	0	FIX	AHI	LSN	LSN	TIME	`test`.`infoschema_buffer_test`	idx	2	32	0	FILE_PAGE	IO_FIX	OLD	#
-0	#	#	5	INDEX	0	FIX	AHI	LSN	LSN	TIME	`test`.`infoschema_buffer_test`	idx	2	32	0	FILE_PAGE	IO_FIX	OLD	#
 DROP TABLE infoschema_buffer_test;
 SELECT * FROM INFORMATION_SCHEMA.INNODB_BUFFER_PAGE
 WHERE TABLE_NAME LIKE '%infoschema_buffer_test%';

mysql-test/suite/sql_sequence/alter.result

@@ -248,3 +248,17 @@ SELECT NEXTVAL(s);
 NEXTVAL(s)
 1
 DROP SEQUENCE s;
+#
+# MDEV-31607 ER_DUP_KEY in mysql.table_stats upon REANME on sequence
+#
+CREATE SEQUENCE s1 ENGINE=InnoDB;
+CREATE SEQUENCE s2 ENGINE=InnoDB;
+SHOW CREATE SEQUENCE s1;
+Table	Create Table
+s1	CREATE SEQUENCE `s1` start with 1 minvalue 1 maxvalue 9223372036854775806 increment by 1 cache 1000 nocycle ENGINE=InnoDB
+SHOW CREATE SEQUENCE s2;
+Table	Create Table
+s2	CREATE SEQUENCE `s2` start with 1 minvalue 1 maxvalue 9223372036854775806 increment by 1 cache 1000 nocycle ENGINE=InnoDB
+DROP SEQUENCE s2;
+RENAME TABLE s1 TO s2;
+DROP SEQUENCE s2;

mysql-test/suite/sql_sequence/alter.test

@@ -161,3 +161,15 @@ CREATE SEQUENCE s;
 ALTER TABLE s ORDER BY cache_size;
 SELECT NEXTVAL(s);
 DROP SEQUENCE s;
+
+--echo #
+--echo # MDEV-31607 ER_DUP_KEY in mysql.table_stats upon REANME on sequence
+--echo #
+
+CREATE SEQUENCE s1 ENGINE=InnoDB;
+CREATE SEQUENCE s2 ENGINE=InnoDB;
+SHOW CREATE SEQUENCE s1;
+SHOW CREATE SEQUENCE s2;
+DROP SEQUENCE s2;
+RENAME TABLE s1 TO s2;
+DROP SEQUENCE s2;