diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt
index caaa2aaf45d..95b013a0c90 100644
--- a/libmysqld/CMakeLists.txt
+++ b/libmysqld/CMakeLists.txt
@@ -71,6 +71,7 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc
            ../sql/log_event.cc ../sql/log_event_server.cc 
            ../sql/mf_iocache.cc ../sql/my_decimal.cc 
            ../sql/net_serv.cc ../sql/opt_range.cc
+           ../sql/opt_group_by_cardinality.cc
            ../sql/opt_rewrite_date_cmp.cc
            ../sql/opt_rewrite_remove_casefold.cc
            ../sql/opt_sargable_left.cc
diff --git a/mysql-test/include/sp-cursor-pkg-01.inc b/mysql-test/include/sp-cursor-pkg-01.inc
new file mode 100644
index 00000000000..78f2848e221
--- /dev/null
+++ b/mysql-test/include/sp-cursor-pkg-01.inc
@@ -0,0 +1,24 @@
+DELIMITER $$;
+CREATE PACKAGE pkg
+  FUNCTION f1() RETURNS INT;
+END;
+$$
+CREATE PACKAGE BODY pkg
+  DECLARE vc INT DEFAULT 0;
+  FUNCTION f1() RETURNS INT
+  BEGIN
+    DECLARE cur CURSOR FOR SELECT 1 AS c FROM DUAL;
+    OPEN cur;
+    FETCH cur INTO vc; -- SHOW CODE should display vc with a "PACKAGE_BODY" prefix
+    CLOSE cur;
+    RETURN vc;
+  END;
+  BEGIN
+    DECLARE cur CURSOR FOR SELECT 1 AS c FROM DUAL;
+    OPEN cur;
+    FETCH cur INTO vc; -- SHOW CODE should display vc without a prefix
+    CLOSE cur;
+  END;
+END;
+$$
+DELIMITER ;$$
diff --git a/mysql-test/include/sp-cursor-pkg-02.inc b/mysql-test/include/sp-cursor-pkg-02.inc
new file mode 100644
index 00000000000..d84bbac9209
--- /dev/null
+++ b/mysql-test/include/sp-cursor-pkg-02.inc
@@ -0,0 +1,20 @@
+# Mixing a package body variable and a local variable in the same FETCH.
+DELIMITER $$;
+CREATE PACKAGE pkg
+  FUNCTION f1() RETURNS TEXT;
+END;
+$$
+CREATE PACKAGE BODY pkg
+  DECLARE vc1 INT DEFAULT 0;
+  FUNCTION f1() RETURNS TEXT
+  BEGIN
+    DECLARE vc2 INT DEFAULT 0;
+    DECLARE cur CURSOR FOR SELECT 1 AS c1, 2 AS c2 FROM DUAL;
+    OPEN cur;
+    FETCH cur INTO vc1, vc2;
+    CLOSE cur;
+    RETURN CONCAT(vc1, ' ', vc2);
+  END;
+END;
+$$
+DELIMITER ;$$
diff --git a/mysql-test/include/sp-cursor-pkg-03.inc b/mysql-test/include/sp-cursor-pkg-03.inc
new file mode 100644
index 00000000000..900b515ad5f
--- /dev/null
+++ b/mysql-test/include/sp-cursor-pkg-03.inc
@@ -0,0 +1,19 @@
+# Fetching into a PACKAGE BODY variable of the ROW type
+DELIMITER $$;
+CREATE PACKAGE pkg
+  FUNCTION f1() RETURNS TEXT;
+END;
+$$
+CREATE PACKAGE BODY pkg
+  DECLARE vc ROW(p1 INT, p2 INT);
+  FUNCTION f1() RETURNS TEXT
+  BEGIN
+    DECLARE cur CURSOR FOR SELECT 1 AS c1, 2 AS c2 FROM DUAL;
+    OPEN cur;
+    FETCH cur INTO vc;
+    CLOSE cur;
+    RETURN CONCAT(vc.p1, ' ', vc.p2);
+  END;
+END;
+$$
+DELIMITER ;$$
diff --git a/mysql-test/main/comment_database.result b/mysql-test/main/comment_database.result
index b0b58680866..2b18385b50c 100644
--- a/mysql-test/main/comment_database.result
+++ b/mysql-test/main/comment_database.result
@@ -76,3 +76,16 @@ WHERE schema_name='comment';
 CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
 def	comment	latin2	latin2_general_ci	NULL	comment
 DROP DATABASE comment;
+CREATE DATABASE db1;
+# restart
+SHOW CREATE DATABASE db1;
+Database	Create Database
+db1	CREATE DATABASE `db1` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci */
+Warnings:
+Note	1105	Database 'db1' does not have a db.opt file. You can create one with ALTER DATABASE if needed
+SHOW CREATE DATABASE db1;
+Database	Create Database
+db1	CREATE DATABASE `db1` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci */
+Warnings:
+Note	1105	Database 'db1' does not have a db.opt file. You can create one with ALTER DATABASE if needed
+DROP DATABASE db1;
diff --git a/mysql-test/main/comment_database.test b/mysql-test/main/comment_database.test
index bf89a57c7b2..a6f43a91e5d 100644
--- a/mysql-test/main/comment_database.test
+++ b/mysql-test/main/comment_database.test
@@ -63,3 +63,11 @@ SELECT * FROM information_schema.schemata
 WHERE schema_name='comment';
 DROP DATABASE comment;
 --enable_service_connection
+
+CREATE DATABASE db1;
+--remove_file $MARIADB_DATADIR/db1/db.opt
+--source include/restart_mysqld.inc
+# We need to call this two times to ensure all code paths are used
+SHOW CREATE DATABASE db1;
+SHOW CREATE DATABASE db1;
+DROP DATABASE db1;
diff --git a/mysql-test/main/ctype_utf8_def_upgrade.result b/mysql-test/main/ctype_utf8_def_upgrade.result
index 1abf0f90b01..90aeab212b7 100644
--- a/mysql-test/main/ctype_utf8_def_upgrade.result
+++ b/mysql-test/main/ctype_utf8_def_upgrade.result
@@ -68,6 +68,8 @@ SET @@collation_database=DEFAULT;
 SHOW CREATE DATABASE db1;
 Database	Create Database
 db1	CREATE DATABASE `db1` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci */
+Warnings:
+Note	1105	Database 'db1' does not have a db.opt file. You can create one with ALTER DATABASE if needed
 USE db1;
 SELECT @@collation_database, 'taken from defaults' AS comment;
 @@collation_database	comment
diff --git a/mysql-test/main/derived.result b/mysql-test/main/derived.result
index 34a9ce724ad..4d8bb4968c0 100644
--- a/mysql-test/main/derived.result
+++ b/mysql-test/main/derived.result
@@ -318,7 +318,7 @@ a	7.0000
 b	3.5000
 explain SELECT s.name, AVG(s.val) AS median FROM (SELECT x.name, x.val FROM t1 x, t1 y WHERE x.name=y.name GROUP BY x.name, x.val HAVING SUM(y.val <= x.val) >= COUNT(*)/2 AND SUM(y.val >= x.val) >= COUNT(*)/2) AS s GROUP BY s.name;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	289	Using temporary; Using filesort
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	17	Using temporary; Using filesort
 2	DERIVED	x	ALL	NULL	NULL	NULL	NULL	17	Using temporary; Using filesort
 2	DERIVED	y	ALL	NULL	NULL	NULL	NULL	17	Using where; Using join buffer (flat, BNL join)
 drop table t1;
@@ -1999,8 +1999,8 @@ group by ic1
 ) dt1 (oc1, oc2, oc3)
 join t3 on t3.c1 = dt1.oc1+9;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	t3	ALL	NULL	NULL	NULL	NULL	2	
-1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	4	Using where; Using join buffer (flat, BNL join)
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	2	
+1	PRIMARY	t3	ALL	NULL	NULL	NULL	NULL	2	Using where; Using join buffer (flat, BNL join)
 2	DERIVED	<derived3>	ALL	NULL	NULL	NULL	NULL	2	Using temporary; Using filesort
 2	DERIVED	t2	ALL	NULL	NULL	NULL	NULL	2	Using where; Using join buffer (flat, BNL join)
 3	DERIVED	t1	ALL	NULL	NULL	NULL	NULL	2	Using temporary; Using filesort
diff --git a/mysql-test/main/derived_cond_pushdown.result b/mysql-test/main/derived_cond_pushdown.result
index dd88e1cd1f5..5e05924489a 100644
--- a/mysql-test/main/derived_cond_pushdown.result
+++ b/mysql-test/main/derived_cond_pushdown.result
@@ -20183,7 +20183,7 @@ where t2.b < 40 and t2.a=t3.a and t3.c=t.c;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	90	60.00	Using where
 1	PRIMARY	t3	ref	idx_a	idx_a	5	test.t2.a	1	100.00	Using where
-1	PRIMARY	<derived2>	ref	key0	key0	128	test.t3.c	10	100.00	
+1	PRIMARY	<derived2>	ref	key0	key0	128	test.t3.c	5	100.00	
 2	DERIVED	t4	ALL	idx_c	NULL	NULL	NULL	160	100.00	Using temporary; Using filesort
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,`test`.`t2`.`c` AS `c`,`t`.`c` AS `t_c`,`t`.`max` AS `max`,`t`.`min` AS `min` from `test`.`t2` join `test`.`t3` join (/* select#2 */ select `test`.`t4`.`c` AS `c`,max(`test`.`t4`.`b`) AS `max`,min(`test`.`t4`.`b`) AS `min` from `test`.`t4` group by `test`.`t4`.`c`) `t` where `test`.`t3`.`a` = `test`.`t2`.`a` and `t`.`c` = `test`.`t3`.`c` and `test`.`t2`.`b` < 40
@@ -20233,7 +20233,7 @@ EXPLAIN
           "used_key_parts": ["c"],
           "ref": ["test.t3.c"],
           "loops": 80.99999987,
-          "rows": 10,
+          "rows": 5,
           "cost": "COST_REPLACED",
           "filtered": 100,
           "materialized": {
@@ -22798,7 +22798,7 @@ from t1 limit 5;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	1000	
 2	DEPENDENT SUBQUERY	t3	ALL	NULL	NULL	NULL	NULL	2	Using where
-2	DEPENDENT SUBQUERY	<derived3>	ref	key0	key0	5	test.t1.a	100	
+2	DEPENDENT SUBQUERY	<derived3>	ref	key0	key0	5	test.t1.a	1	
 3	DERIVED	t2	ALL	a	NULL	NULL	NULL	1000	Using temporary; Using filesort
 select
 a,
diff --git a/mysql-test/main/derived_split_innodb.result b/mysql-test/main/derived_split_innodb.result
index c0bb6736cd1..7bb79b3c7b8 100644
--- a/mysql-test/main/derived_split_innodb.result
+++ b/mysql-test/main/derived_split_innodb.result
@@ -283,7 +283,7 @@ on t3.a=t.a and t3.c=t.c
 where t3.b > 15;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t3	range	idx_b	idx_b	5	NULL	2	Using index condition; Using where
-1	PRIMARY	<derived2>	ref	key0	key0	133	test.t3.a,test.t3.c	4	
+1	PRIMARY	<derived2>	ref	key0	key0	133	test.t3.a,test.t3.c	2	
 2	DERIVED	t4	ALL	NULL	NULL	NULL	NULL	40	Using filesort
 drop table t3, t4;
 # End of 10.3 tests
@@ -815,7 +815,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	5	
 1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	50	Using where; Using join buffer (flat, BNL join)
 1	PRIMARY	t3	ALL	NULL	NULL	NULL	NULL	15	Using where; Using join buffer (incremental, BNL join)
-1	PRIMARY	<derived2>	ref	key0	key0	5	test.t1.b	1000	Using where
+1	PRIMARY	<derived2>	ref	key0	key0	5	test.t1.b	10	Using where
 2	DERIVED	t10	ALL	grp_id	NULL	NULL	NULL	10000	Using temporary; Using filesort
 2	DERIVED	t11	ALL	NULL	NULL	NULL	NULL	10	Using where; Using join buffer (flat, BNL join)
 select *
diff --git a/mysql-test/main/explain.result b/mysql-test/main/explain.result
index 62ed085debe..f970f95b147 100644
--- a/mysql-test/main/explain.result
+++ b/mysql-test/main/explain.result
@@ -154,7 +154,7 @@ INSERT INTO t2 VALUES (1),(2);
 EXPLAIN EXTENDED SELECT 1
 FROM (SELECT COUNT(DISTINCT t1.a) FROM t1,t2 GROUP BY t1.a) AS s1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	4	100.00	
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	2	100.00	
 2	DERIVED	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	Using temporary; Using filesort
 2	DERIVED	t2	ALL	NULL	NULL	NULL	NULL	2	100.00	Using join buffer (flat, BNL join)
 Warnings:
@@ -162,7 +162,7 @@ Note	1003	/* select#1 */ select 1 AS `1` from (/* select#2 */ select count(disti
 EXPLAIN EXTENDED SELECT 1
 FROM (SELECT COUNT(DISTINCT t1.a) FROM t1,t2 GROUP BY t1.a) AS s1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	4	100.00	
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	2	100.00	
 2	DERIVED	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	Using temporary; Using filesort
 2	DERIVED	t2	ALL	NULL	NULL	NULL	NULL	2	100.00	Using join buffer (flat, BNL join)
 Warnings:
@@ -172,7 +172,7 @@ prepare s1 from
  FROM (SELECT COUNT(DISTINCT t1.a) FROM t1,t2 GROUP BY t1.a) AS s1';
 execute s1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	4	100.00	
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	2	100.00	
 2	DERIVED	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	Using temporary; Using filesort
 2	DERIVED	t2	ALL	NULL	NULL	NULL	NULL	2	100.00	Using join buffer (flat, BNL join)
 Warnings:
@@ -182,14 +182,14 @@ prepare s1 from
  FROM (SELECT COUNT(DISTINCT t1.a) FROM t1,t2 GROUP BY t1.a) AS s1';
 execute s1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	4	100.00	
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	2	100.00	
 2	DERIVED	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	Using temporary; Using filesort
 2	DERIVED	t2	ALL	NULL	NULL	NULL	NULL	2	100.00	Using join buffer (flat, BNL join)
 Warnings:
 Note	1003	/* select#1 */ select 1 AS `1` from (/* select#2 */ select count(distinct `test`.`t1`.`a`) AS `COUNT(DISTINCT t1.a)` from `test`.`t1` join `test`.`t2` group by `test`.`t1`.`a`) `s1`
 execute s1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	4	100.00	
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	2	100.00	
 2	DERIVED	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	Using temporary; Using filesort
 2	DERIVED	t2	ALL	NULL	NULL	NULL	NULL	2	100.00	Using join buffer (flat, BNL join)
 Warnings:
diff --git a/mysql-test/main/func_gconcat.result b/mysql-test/main/func_gconcat.result
index 1809eb1ddeb..4964addbdb5 100644
--- a/mysql-test/main/func_gconcat.result
+++ b/mysql-test/main/func_gconcat.result
@@ -990,8 +990,8 @@ INSERT INTO t1 VALUES (),();
 EXPLAIN EXTENDED SELECT 1 FROM
 (SELECT DISTINCT GROUP_CONCAT(td.f1) FROM t1,t1 AS td GROUP BY td.f1) AS d,t1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	
-1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	4	100.00	Using join buffer (flat, BNL join)
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	2	100.00	
+1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	Using join buffer (flat, BNL join)
 2	DERIVED	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	Using temporary; Using filesort
 2	DERIVED	td	ALL	NULL	NULL	NULL	NULL	2	100.00	Using join buffer (flat, BNL join)
 Warnings:
@@ -1012,7 +1012,7 @@ EXPLAIN EXTENDED SELECT 1 FROM
 (SELECT GROUP_CONCAT(t1.a ORDER BY t1.a ASC) FROM 
 t1 t2, t1 GROUP BY t1.a) AS d;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	4	100.00	
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	2	100.00	
 2	DERIVED	t2	ALL	NULL	NULL	NULL	NULL	2	100.00	Using temporary; Using filesort
 2	DERIVED	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	Using join buffer (flat, BNL join)
 Warnings:
diff --git a/mysql-test/main/gis.result b/mysql-test/main/gis.result
index 7da4494ac18..e4f44f573ff 100644
--- a/mysql-test/main/gis.result
+++ b/mysql-test/main/gis.result
@@ -5465,6 +5465,33 @@ INSERT INTO t VALUES (1,POINT(0,0)),(2,POINT(0,0));
 SELECT NTH_VALUE(a,b) OVER () FROM t;
 ERROR HY000: Illegal parameter data types point and bigint for operation '-'
 DROP TABLE t;
+#
+# MDEV-32619 Settng SRID on geometry with ST_*FromWKKB(g, srid)
+#
+SELECT
+ST_SRID(g1),
+ST_SRID(ST_GeomFromWKB(g1, 4326)),
+ST_SRID(ST_GeomFromWKB(g1)),
+ST_AsText(g1),
+ST_SRID(ST_PointFromWKB(g2, 4326)),
+ST_SRID(g2),
+ST_SRID(ST_LineStringFromWKB(g3, 3)),
+ST_SRID(ST_PolygonFromWKB(g4, 4)),
+ST_SRID(ST_MultiPointFromWKB(g5, 5)),
+ST_SRID(ST_MultiLineStringFromWKB(g6, 6)),
+ST_SRID(ST_MultiPolygonFromWKB(g7, 7))
+FROM (
+SELECT
+POINT(1, 2) AS g1,
+POINT(4, 3) AS g2,
+LINESTRING(POINT(4, 3), POINT(4, 4)) AS g3,
+POLYGON(LINESTRING(POINT(4, 3), POINT(4, 4), POINT(3, 4), POINT(4, 3))) AS g4,
+MULTIPOINT(POINT(4, 3)) AS g5,
+MULTILINESTRING(LINESTRING(POINT(4, 3), POINT(4, 4))) AS g6,
+MULTIPOLYGON(POLYGON(LINESTRING(POINT(4, 3), POINT(4, 4), POINT(3, 4), POINT(4, 3)))) AS g7
+) AS t;
+ST_SRID(g1)	ST_SRID(ST_GeomFromWKB(g1, 4326))	ST_SRID(ST_GeomFromWKB(g1))	ST_AsText(g1)	ST_SRID(ST_PointFromWKB(g2, 4326))	ST_SRID(g2)	ST_SRID(ST_LineStringFromWKB(g3, 3))	ST_SRID(ST_PolygonFromWKB(g4, 4))	ST_SRID(ST_MultiPointFromWKB(g5, 5))	ST_SRID(ST_MultiLineStringFromWKB(g6, 6))	ST_SRID(ST_MultiPolygonFromWKB(g7, 7))
+0	4326	0	POINT(1 2)	4326	0	3	4	5	6	7
 # End of 10.5 tests
 #
 # Start of 11.5 tests
diff --git a/mysql-test/main/gis.test b/mysql-test/main/gis.test
index d4f7dced3d8..e41fab5402f 100644
--- a/mysql-test/main/gis.test
+++ b/mysql-test/main/gis.test
@@ -3471,6 +3471,32 @@ INSERT INTO t VALUES (1,POINT(0,0)),(2,POINT(0,0));
 SELECT NTH_VALUE(a,b) OVER () FROM t;
 DROP TABLE t;
 
+--echo #
+--echo # MDEV-32619 Settng SRID on geometry with ST_*FromWKKB(g, srid)
+--echo #
+SELECT
+  ST_SRID(g1),
+  ST_SRID(ST_GeomFromWKB(g1, 4326)),
+  ST_SRID(ST_GeomFromWKB(g1)),
+  ST_AsText(g1),
+  ST_SRID(ST_PointFromWKB(g2, 4326)),
+  ST_SRID(g2),
+  ST_SRID(ST_LineStringFromWKB(g3, 3)),
+  ST_SRID(ST_PolygonFromWKB(g4, 4)),
+  ST_SRID(ST_MultiPointFromWKB(g5, 5)),
+  ST_SRID(ST_MultiLineStringFromWKB(g6, 6)),
+  ST_SRID(ST_MultiPolygonFromWKB(g7, 7))
+FROM (
+  SELECT
+    POINT(1, 2) AS g1,
+    POINT(4, 3) AS g2,
+    LINESTRING(POINT(4, 3), POINT(4, 4)) AS g3,
+    POLYGON(LINESTRING(POINT(4, 3), POINT(4, 4), POINT(3, 4), POINT(4, 3))) AS g4,
+    MULTIPOINT(POINT(4, 3)) AS g5,
+    MULTILINESTRING(LINESTRING(POINT(4, 3), POINT(4, 4))) AS g6,
+    MULTIPOLYGON(POLYGON(LINESTRING(POINT(4, 3), POINT(4, 4), POINT(3, 4), POINT(4, 3)))) AS g7
+) AS t;
+
 --echo # End of 10.5 tests
 
 --echo #
diff --git a/mysql-test/main/group_by_cardinality.result b/mysql-test/main/group_by_cardinality.result
new file mode 100644
index 00000000000..e68af93d47c
--- /dev/null
+++ b/mysql-test/main/group_by_cardinality.result
@@ -0,0 +1,213 @@
+#
+# MDEV-30877: Output cardinality for derived table ignores GROUP BY
+#
+create table t1 (
+groups_20 int,
+groups_20_2 int,
+b int,
+index (groups_20)
+);
+insert into t1 select seq/1000, seq/1000, seq from seq_1_to_20000;
+create table t2 (a int, b int, index(a));
+insert into t2 select seq, seq from seq_1_to_10;
+analyze table t1 persistent for all;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	Engine-independent statistics collected
+test.t1	analyze	status	Table is already up to date
+set optimizer_trace=1;
+# Case 1: one indexed column
+explain
+select *
+from
+t2,
+(select count(*) cnt, groups_20 from t1
+group by groups_20) TBL
+where
+1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	10	
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	20	Using join buffer (flat, BNL join)
+2	DERIVED	t1	index	NULL	groups_20	5	NULL	20000	Using index
+select
+json_detailed(json_extract(trace, '$**.materialized_output_cardinality'))
+from
+information_schema.optimizer_trace;
+json_detailed(json_extract(trace, '$**.materialized_output_cardinality'))
+[
+    {
+        "join_output_cardinality": 20000,
+        "estimation": 
+        [
+            {
+                "table": "t1",
+                "steps": 
+                [
+                    {
+                        "index_name": "groups_20",
+                        "cardinality": 20.99999895
+                    }
+                ],
+                "cardinality": 20.99999895
+            }
+        ],
+        "post_group_cardinality": 20.99999895
+    }
+]
+# Case 2: one non- indexed column
+explain
+select *
+from
+t2,
+(select count(*) cnt, groups_20_2 from t1
+group by groups_20_2) TBL
+where
+1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	10	
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	20	Using join buffer (flat, BNL join)
+2	DERIVED	t1	ALL	NULL	NULL	NULL	NULL	20000	Using temporary; Using filesort
+select
+json_detailed(json_extract(trace, '$**.materialized_output_cardinality'))
+from
+information_schema.optimizer_trace;
+json_detailed(json_extract(trace, '$**.materialized_output_cardinality'))
+[
+    {
+        "join_output_cardinality": 20000,
+        "estimation": 
+        [
+            {
+                "table": "t1",
+                "steps": 
+                [
+                    {
+                        "column": "groups_20_2",
+                        "cardinality": 20.99999895
+                    }
+                ],
+                "cardinality": 20.99999895
+            }
+        ],
+        "post_group_cardinality": 20.99999895
+    }
+]
+# Case 4: one indexed column, multiple tables
+create table t3(c int);
+insert into t3 select seq from seq_1_to_10;
+explain
+select *
+from
+t2,
+(select count(*) cnt, groups_20 from t1,t3
+group by groups_20) TBL;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	10	
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	20	Using join buffer (flat, BNL join)
+2	DERIVED	t3	ALL	NULL	NULL	NULL	NULL	10	Using temporary; Using filesort
+2	DERIVED	t1	index	NULL	groups_20	5	NULL	20000	Using index; Using join buffer (flat, BNL join)
+select
+json_detailed(json_extract(trace, '$**.materialized_output_cardinality'))
+from
+information_schema.optimizer_trace;
+json_detailed(json_extract(trace, '$**.materialized_output_cardinality'))
+[
+    {
+        "join_output_cardinality": 200000,
+        "estimation": 
+        [
+            {
+                "table": "t1",
+                "steps": 
+                [
+                    {
+                        "index_name": "groups_20",
+                        "cardinality": 20.99999895
+                    }
+                ],
+                "cardinality": 20.99999895
+            }
+        ],
+        "post_group_cardinality": 20.99999895
+    }
+]
+# Case 5: group by two tables
+explain
+select *
+from
+t2,
+(select count(*) cnt, groups_20 from t1,t3
+group by groups_20, t3.c) TBL;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	10	
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	209	Using join buffer (flat, BNL join)
+2	DERIVED	t3	ALL	NULL	NULL	NULL	NULL	10	Using temporary; Using filesort
+2	DERIVED	t1	index	NULL	groups_20	5	NULL	20000	Using index; Using join buffer (flat, BNL join)
+select
+json_detailed(json_extract(trace, '$**.materialized_output_cardinality'))
+from
+information_schema.optimizer_trace;
+json_detailed(json_extract(trace, '$**.materialized_output_cardinality'))
+[
+    {
+        "join_output_cardinality": 200000,
+        "estimation": 
+        [
+            {
+                "table": "t1",
+                "steps": 
+                [
+                    {
+                        "index_name": "groups_20",
+                        "cardinality": 20.99999895
+                    }
+                ],
+                "cardinality": 20.99999895
+            },
+            {
+                "table": "t3",
+                "steps": 
+                [],
+                "cardinality": 10
+            }
+        ],
+        "post_group_cardinality": 209.9999895
+    }
+]
+# Now, without an index
+explain
+select *
+from
+t2,
+(select count(*) cnt, groups_20 from t1 use index(),t3 group by groups_20) TBL;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	10	
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	20	Using join buffer (flat, BNL join)
+2	DERIVED	t3	ALL	NULL	NULL	NULL	NULL	10	Using temporary; Using filesort
+2	DERIVED	t1	ALL	NULL	NULL	NULL	NULL	20000	Using join buffer (flat, BNL join)
+select
+json_detailed(json_extract(trace, '$**.materialized_output_cardinality'))
+from
+information_schema.optimizer_trace;
+json_detailed(json_extract(trace, '$**.materialized_output_cardinality'))
+[
+    {
+        "join_output_cardinality": 200000,
+        "estimation": 
+        [
+            {
+                "table": "t1",
+                "steps": 
+                [
+                    {
+                        "column": "groups_20",
+                        "cardinality": 20.99999895
+                    }
+                ],
+                "cardinality": 20.99999895
+            }
+        ],
+        "post_group_cardinality": 20.99999895
+    }
+]
+set optimizer_trace=default;
+drop table t1, t2, t3;
diff --git a/mysql-test/main/group_by_cardinality.test b/mysql-test/main/group_by_cardinality.test
new file mode 100644
index 00000000000..a2fecf40b9f
--- /dev/null
+++ b/mysql-test/main/group_by_cardinality.test
@@ -0,0 +1,108 @@
+--echo #
+--echo # MDEV-30877: Output cardinality for derived table ignores GROUP BY
+--echo #
+
+--source include/have_sequence.inc
+--source include/not_embedded.inc
+
+create table t1 (
+  groups_20 int,
+  groups_20_2 int,
+  b int,
+  index (groups_20)
+);
+
+insert into t1 select seq/1000, seq/1000, seq from seq_1_to_20000;
+
+create table t2 (a int, b int, index(a));
+insert into t2 select seq, seq from seq_1_to_10;
+
+analyze table t1 persistent for all;
+
+set optimizer_trace=1;
+--echo # Case 1: one indexed column
+explain
+select *
+from
+  t2,
+  (select count(*) cnt, groups_20 from t1
+   group by groups_20) TBL
+where
+  1;
+
+--disable_view_protocol
+select
+  json_detailed(json_extract(trace, '$**.materialized_output_cardinality'))
+from
+  information_schema.optimizer_trace;
+--enable_view_protocol
+
+
+--echo # Case 2: one non- indexed column
+explain
+select *
+from
+  t2,
+  (select count(*) cnt, groups_20_2 from t1
+   group by groups_20_2) TBL
+where
+  1;
+
+--disable_view_protocol
+select
+  json_detailed(json_extract(trace, '$**.materialized_output_cardinality'))
+from
+  information_schema.optimizer_trace;
+--enable_view_protocol
+
+--echo # Case 4: one indexed column, multiple tables
+create table t3(c int);
+insert into t3 select seq from seq_1_to_10;
+explain
+select *
+from
+  t2,
+  (select count(*) cnt, groups_20 from t1,t3
+   group by groups_20) TBL;
+
+--disable_view_protocol
+select
+  json_detailed(json_extract(trace, '$**.materialized_output_cardinality'))
+from
+  information_schema.optimizer_trace;
+--enable_view_protocol
+
+
+--echo # Case 5: group by two tables
+explain
+select *
+from
+  t2,
+  (select count(*) cnt, groups_20 from t1,t3
+   group by groups_20, t3.c) TBL;
+
+--disable_view_protocol
+select
+  json_detailed(json_extract(trace, '$**.materialized_output_cardinality'))
+from
+  information_schema.optimizer_trace;
+--enable_view_protocol
+
+--echo # Now, without an index
+explain
+select *
+from
+  t2,
+  (select count(*) cnt, groups_20 from t1 use index(),t3 group by groups_20) TBL;
+
+--disable_view_protocol
+select
+  json_detailed(json_extract(trace, '$**.materialized_output_cardinality'))
+from
+  information_schema.optimizer_trace;
+--enable_view_protocol
+
+
+set optimizer_trace=default;
+drop table t1, t2, t3;
+
diff --git a/mysql-test/main/join_cache.result b/mysql-test/main/join_cache.result
index c7cc21b31c5..6350e2e87a7 100644
--- a/mysql-test/main/join_cache.result
+++ b/mysql-test/main/join_cache.result
@@ -6507,4 +6507,30 @@ DROP TABLE t1, t2;
 #
 # End of 10.5 tests
 #
+#
+# MDEV-36165: BKA join cache buffer is employed despite join_cache_level=3 (flat BNLH)
+#
+CREATE TABLE t1(a INT);
+INSERT INTO t1 VALUES (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
+CREATE TABLE t2(a INT, b INT);
+INSERT INTO t2 SELECT a, a from t1;
+CREATE TABLE t3(a INT, b INT, c INT, key (a,b));
+INSERT INTO t3 select a, a, a FROM t1;
+SET optimizer_switch = 'join_cache_hashed=off,join_cache_bka=on,mrr=on';
+SET join_cache_level = 3;
+EXPLAIN SELECT * FROM t2, t3 WHERE t2.a=t3.a AND (t3.b+1 <= t2.b+1);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	10	Using where
+1	SIMPLE	t3	ref	a	a	5	test.t2.a	1	Using index condition
+SET join_cache_level = 4;
+EXPLAIN SELECT * FROM t2, t3 WHERE t2.a=t3.a AND (t3.b+1 <= t2.b+1);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	10	Using where
+1	SIMPLE	t3	ref	a	a	5	test.t2.a	1	Using index condition
+SET join_cache_level = default;
+SET optimizer_switch = default;
+DROP TABLE t1, t2, t3;
+#
+# End of 10.11 tests
+#
 ALTER DATABASE test CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci;
diff --git a/mysql-test/main/join_cache.test b/mysql-test/main/join_cache.test
index d7945ea0914..4c01b752b2c 100644
--- a/mysql-test/main/join_cache.test
+++ b/mysql-test/main/join_cache.test
@@ -4383,4 +4383,31 @@ DROP TABLE t1, t2;
 --echo # End of 10.5 tests
 --echo #
 
+--echo #
+--echo # MDEV-36165: BKA join cache buffer is employed despite join_cache_level=3 (flat BNLH)
+--echo #
+--source include/have_sequence.inc
+CREATE TABLE t1(a INT);
+INSERT INTO t1 VALUES (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
+CREATE TABLE t2(a INT, b INT);
+INSERT INTO t2 SELECT a, a from t1;
+CREATE TABLE t3(a INT, b INT, c INT, key (a,b));
+INSERT INTO t3 select a, a, a FROM t1;
+
+SET optimizer_switch = 'join_cache_hashed=off,join_cache_bka=on,mrr=on';
+
+SET join_cache_level = 3;
+EXPLAIN SELECT * FROM t2, t3 WHERE t2.a=t3.a AND (t3.b+1 <= t2.b+1);
+
+SET join_cache_level = 4;
+EXPLAIN SELECT * FROM t2, t3 WHERE t2.a=t3.a AND (t3.b+1 <= t2.b+1);
+
+SET join_cache_level = default;
+SET optimizer_switch = default;
+DROP TABLE t1, t2, t3;
+
+--echo #
+--echo # End of 10.11 tests
+--echo #
+
 --source include/test_db_charset_restore.inc
diff --git a/mysql-test/main/mariadb-import.result b/mysql-test/main/mariadb-import.result
index 8fe1c57fd63..5d1dda07591 100644
--- a/mysql-test/main/mariadb-import.result
+++ b/mysql-test/main/mariadb-import.result
@@ -296,11 +296,11 @@ db2.locations: Records: 1  Deleted: 0  Skipped: 0  Warnings: 0
 Adding secondary indexes to table `locations`
 show index from vec;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment	Ignored
-vec	0	PRIMARY	1	id	A	10	NULL	NULL		BTREE			NO
+vec	0	PRIMARY	1	id	A	1	NULL	NULL		BTREE			NO
 vec	1	v	1	v	A	NULL	NULL	NULL		VECTOR			NO
 show index from locations;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment	Ignored
-locations	0	PRIMARY	1	id	A	0	NULL	NULL		BTREE			NO
+locations	0	PRIMARY	1	id	A	1	NULL	NULL		BTREE			NO
 locations	1	idx_geom	1	geom	A	NULL	32	NULL		SPATIAL			NO
 show index from ft;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment	Ignored
diff --git a/mysql-test/main/mysql_upgrade-34014.result b/mysql-test/main/mysql_upgrade-34014.result
index 6e899ea1a7a..51478aec7c8 100644
--- a/mysql-test/main/mysql_upgrade-34014.result
+++ b/mysql-test/main/mysql_upgrade-34014.result
@@ -12,6 +12,8 @@ FLUSH TABLES;
 SHOW CREATE DATABASE sys;
 Database	Create Database
 sys	CREATE DATABASE `sys` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci */
+Warnings:
+Note	1105	Database 'sys' does not have a db.opt file. You can create one with ALTER DATABASE if needed
 Phase 1/8: Checking and upgrading mysql database
 Processing databases
 mysql
diff --git a/mysql-test/main/opt_trace.result b/mysql-test/main/opt_trace.result
index 240a05dcbb2..e3099480f33 100644
--- a/mysql-test/main/opt_trace.result
+++ b/mysql-test/main/opt_trace.result
@@ -514,6 +514,23 @@ select * from v2	{
                     }
                   ]
                 },
+                {
+                  "materialized_output_cardinality": {
+                    "join_output_cardinality": 1,
+                    "estimation": [
+                      {
+                        "table": "t1",
+                        "steps": [
+                          {
+                            "column": "b",
+                            "cardinality": 2
+                          }
+                        ],
+                        "cardinality": 2
+                      }
+                    ]
+                  }
+                },
                 {
                   "check_split_materialized": {
                     "not_applicable": "no candidate field can be accessed through ref"
@@ -803,7 +820,7 @@ explain select * from v2	{
 # Non-Mergeable view
 explain select * from v1 ;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	10	
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	4	
 2	DERIVED	t1	ALL	NULL	NULL	NULL	NULL	10	Using temporary; Using filesort
 QUERY	TRACE	MISSING_BYTES_BEYOND_MAX_MEM_SIZE	INSUFFICIENT_PRIVILEGES
 explain select * from v1	{
@@ -908,6 +925,24 @@ explain select * from v1	{
                     }
                   ]
                 },
+                {
+                  "materialized_output_cardinality": {
+                    "join_output_cardinality": 10,
+                    "estimation": [
+                      {
+                        "table": "t1",
+                        "steps": [
+                          {
+                            "column": "b",
+                            "cardinality": 4
+                          }
+                        ],
+                        "cardinality": 4
+                      }
+                    ],
+                    "post_group_cardinality": 4
+                  }
+                },
                 {
                   "check_split_materialized": {
                     "not_applicable": "group list has no candidates"
@@ -953,9 +988,9 @@ explain select * from v1	{
               {
                 "table": "<derived2>",
                 "table_scan": {
-                  "rows": 10,
-                  "read_cost": 0.010103506,
-                  "read_and_compare_cost": 0.010446846
+                  "rows": 4,
+                  "read_cost": 0.010041402,
+                  "read_and_compare_cost": 0.010178738
                 }
               }
             ]
@@ -974,19 +1009,19 @@ explain select * from v1	{
                       "considered_access_paths": [
                         {
                           "access_type": "scan",
-                          "rows": 10,
-                          "rows_after_filter": 10,
-                          "rows_out": 10,
-                          "cost": 0.010446846,
+                          "rows": 4,
+                          "rows_after_filter": 4,
+                          "rows_out": 4,
+                          "cost": 0.010178738,
                           "index_only": false,
                           "chosen": true
                         }
                       ],
                       "chosen_access_method": {
                         "type": "scan",
-                        "rows_read": 10,
-                        "rows_out": 10,
-                        "cost": 0.010446846,
+                        "rows_read": 4,
+                        "rows_out": 4,
+                        "cost": 0.010178738,
                         "uses_join_buffering": false
                       }
                     }
@@ -996,15 +1031,15 @@ explain select * from v1	{
               {
                 "plan_prefix": "",
                 "table": "<derived2>",
-                "rows_for_plan": 10,
-                "cost_for_plan": 0.010446846
+                "rows_for_plan": 4,
+                "cost_for_plan": 0.010178738
               }
             ]
           },
           {
             "best_join_order": ["<derived2>"],
-            "rows": 10,
-            "cost": 0.010446846
+            "rows": 4,
+            "cost": 0.010178738
           },
           {
             "attaching_conditions_to_tables": {
diff --git a/mysql-test/main/range_notembedded.result b/mysql-test/main/range_notembedded.result
index 7834418bd2b..9cd93903184 100644
--- a/mysql-test/main/range_notembedded.result
+++ b/mysql-test/main/range_notembedded.result
@@ -248,3 +248,63 @@ SELECT id FROM t1 WHERE id IS NULL OR id NOT BETWEEN 1 AND 4;
 id
 5
 DROP TABLE t1;
+#
+# MDEV-34620: Many index_merge variants made and discarded for a big OR
+#
+CREATE TABLE t1 (
+a1 int NOT NULL,
+a2 int NOT NULL,
+filler char(100),
+KEY key1 (a1,a2),
+KEY key2 (a2,a1)
+);
+insert into t1 (a1,a2) values (1,1),(2,2),(3,3);
+set @query= concat(
+"explain select * from t1 where\n",
+(select
+group_concat(concat("a1=", seq, " and a2=", seq, " ") separator "\nor " )
+from seq_1_to_30)
+);
+set optimizer_trace=1;
+prepare s from @query;
+execute s;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	ALL	key1,key2	NULL	NULL	NULL	3	Using where
+set @trace=json_extract((select trace from information_schema.optimizer_trace), '$**.range_analysis');
+# Observe that "key1" is a a part of several index_merge_union:
+select json_pretty(json_search(@trace, 'all', 'key1'));
+json_pretty(json_search(@trace, 'all', 'key1'))
+[
+    "$[0].potential_range_indexes[0].index",
+    "$[0].analyzing_range_alternatives.range_scan_alternatives[0].index",
+    "$[0].analyzing_range_alternatives.analyzing_index_merge_union[0].indexes_to_merge[0].range_scan_alternatives[0].index",
+    "$[0].analyzing_range_alternatives.analyzing_index_merge_union[0].indexes_to_merge[1].range_scan_alternatives[0].index",
+    "$[0].analyzing_range_alternatives.analyzing_index_merge_union[1].indexes_to_merge[0].range_scan_alternatives[0].index",
+    "$[0].analyzing_range_alternatives.analyzing_index_merge_union[1].indexes_to_merge[1].range_scan_alternatives[0].index",
+    "$[0].analyzing_range_alternatives.analyzing_index_merge_union[1].indexes_to_merge[2].range_scan_alternatives[0].index",
+    "$[0].analyzing_range_alternatives.analyzing_index_merge_union[2].indexes_to_merge[0].range_scan_alternatives[0].index",
+    "$[0].analyzing_range_alternatives.analyzing_index_merge_union[2].indexes_to_merge[1].range_scan_alternatives[0].index"
+]
+#
+# Now, same as above but for a long IN-list
+#
+set @query= concat(
+"explain select * from t1 where\n",
+(select
+group_concat(concat("a1=", seq, " and a2=", seq, " ") separator "\nor " )
+from seq_1_to_120)
+);
+set optimizer_trace=1;
+prepare s from @query;
+execute s;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	ALL	key1,key2	NULL	NULL	NULL	3	Using where
+set @trace=json_extract((select trace from information_schema.optimizer_trace), '$**.range_analysis');
+# Observe that there are NO index_merge_union candidates. Only one potential range scan:
+select json_pretty(json_search(@trace, 'all', 'key1'));
+json_pretty(json_search(@trace, 'all', 'key1'))
+[
+    "$[0].potential_range_indexes[0].index",
+    "$[0].analyzing_range_alternatives.range_scan_alternatives[0].index"
+]
+drop table t1;
diff --git a/mysql-test/main/range_notembedded.test b/mysql-test/main/range_notembedded.test
index cd19bb98248..a13bb1d95c7 100644
--- a/mysql-test/main/range_notembedded.test
+++ b/mysql-test/main/range_notembedded.test
@@ -163,3 +163,51 @@ INSERT INTO t1 VALUES (1),(5);
 SELECT id FROM t1 WHERE id IS NULL OR id NOT BETWEEN 1 AND 4;
 DROP TABLE t1;
 
+--echo #
+--echo # MDEV-34620: Many index_merge variants made and discarded for a big OR
+--echo #
+
+CREATE TABLE t1 (
+  a1 int NOT NULL,
+  a2 int NOT NULL,
+  filler char(100),
+  KEY key1 (a1,a2),
+  KEY key2 (a2,a1)
+);
+insert into t1 (a1,a2) values (1,1),(2,2),(3,3);
+
+
+set @query= concat(
+  "explain select * from t1 where\n",
+  (select
+     group_concat(concat("a1=", seq, " and a2=", seq, " ") separator "\nor " )
+   from seq_1_to_30)
+  );
+
+set optimizer_trace=1;
+prepare s from @query;
+execute s;
+set @trace=json_extract((select trace from information_schema.optimizer_trace), '$**.range_analysis');
+
+--echo # Observe that "key1" is a a part of several index_merge_union:
+select json_pretty(json_search(@trace, 'all', 'key1'));
+
+--echo #
+--echo # Now, same as above but for a long IN-list
+--echo #
+set @query= concat(
+  "explain select * from t1 where\n",
+  (select
+     group_concat(concat("a1=", seq, " and a2=", seq, " ") separator "\nor " )
+   from seq_1_to_120)
+  );
+
+set optimizer_trace=1;
+prepare s from @query;
+execute s;
+set @trace=json_extract((select trace from information_schema.optimizer_trace), '$**.range_analysis');
+
+--echo # Observe that there are NO index_merge_union candidates. Only one potential range scan:
+select json_pretty(json_search(@trace, 'all', 'key1'));
+drop table t1;
+
diff --git a/mysql-test/main/selectivity.result b/mysql-test/main/selectivity.result
index 45aeb636347..dc20c610639 100644
--- a/mysql-test/main/selectivity.result
+++ b/mysql-test/main/selectivity.result
@@ -144,9 +144,9 @@ and total_revenue = (select max(total_revenue) from revenue0)
 order by s_suppkey;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	supplier	ALL	PRIMARY	NULL	NULL	NULL	10	100.00	Using filesort
-1	PRIMARY	<derived3>	ref	key0	key0	5	dbt3_s001.supplier.s_suppkey	10	100.00	Using where
+1	PRIMARY	<derived3>	ref	key0	key0	5	dbt3_s001.supplier.s_suppkey	1	100.00	Using where
 3	DERIVED	lineitem	range	i_l_shipdate,i_l_suppkey	i_l_shipdate	4	NULL	269	100.00	Using where; Using temporary; Using filesort
-2	SUBQUERY	<derived4>	ALL	NULL	NULL	NULL	NULL	269	100.00	
+2	SUBQUERY	<derived4>	ALL	NULL	NULL	NULL	NULL	10	100.00	
 4	DERIVED	lineitem	range	i_l_shipdate	i_l_shipdate	4	NULL	269	100.00	Using where; Using temporary; Using filesort
 Warnings:
 Note	1003	/* select#1 */ select `dbt3_s001`.`supplier`.`s_suppkey` AS `s_suppkey`,`dbt3_s001`.`supplier`.`s_name` AS `s_name`,`dbt3_s001`.`supplier`.`s_address` AS `s_address`,`dbt3_s001`.`supplier`.`s_phone` AS `s_phone`,`revenue0`.`total_revenue` AS `total_revenue` from `dbt3_s001`.`supplier` join `dbt3_s001`.`revenue0` where `revenue0`.`supplier_no` = `dbt3_s001`.`supplier`.`s_suppkey` and `revenue0`.`total_revenue` = (/* select#2 */ select max(`revenue0`.`total_revenue`) from `dbt3_s001`.`revenue0`) order by `dbt3_s001`.`supplier`.`s_suppkey`
@@ -165,9 +165,9 @@ and total_revenue = (select max(total_revenue) from revenue0)
 order by s_suppkey;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	supplier	ALL	PRIMARY	NULL	NULL	NULL	10	100.00	Using filesort
-1	PRIMARY	<derived3>	ref	key0	key0	5	dbt3_s001.supplier.s_suppkey	10	100.00	Using where
+1	PRIMARY	<derived3>	ref	key0	key0	5	dbt3_s001.supplier.s_suppkey	1	100.00	Using where
 3	DERIVED	lineitem	range	i_l_shipdate,i_l_suppkey	i_l_shipdate	4	NULL	269	100.00	Using where; Using temporary; Using filesort
-2	SUBQUERY	<derived4>	ALL	NULL	NULL	NULL	NULL	269	100.00	
+2	SUBQUERY	<derived4>	ALL	NULL	NULL	NULL	NULL	10	100.00	
 4	DERIVED	lineitem	range	i_l_shipdate	i_l_shipdate	4	NULL	269	100.00	Using where; Using temporary; Using filesort
 Warnings:
 Note	1003	/* select#1 */ select `dbt3_s001`.`supplier`.`s_suppkey` AS `s_suppkey`,`dbt3_s001`.`supplier`.`s_name` AS `s_name`,`dbt3_s001`.`supplier`.`s_address` AS `s_address`,`dbt3_s001`.`supplier`.`s_phone` AS `s_phone`,`revenue0`.`total_revenue` AS `total_revenue` from `dbt3_s001`.`supplier` join `dbt3_s001`.`revenue0` where `revenue0`.`supplier_no` = `dbt3_s001`.`supplier`.`s_suppkey` and `revenue0`.`total_revenue` = (/* select#2 */ select max(`revenue0`.`total_revenue`) from `dbt3_s001`.`revenue0`) order by `dbt3_s001`.`supplier`.`s_suppkey`
diff --git a/mysql-test/main/selectivity_innodb.result b/mysql-test/main/selectivity_innodb.result
index 2e343568afa..9434c5a6446 100644
--- a/mysql-test/main/selectivity_innodb.result
+++ b/mysql-test/main/selectivity_innodb.result
@@ -149,9 +149,9 @@ and total_revenue = (select max(total_revenue) from revenue0)
 order by s_suppkey;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	supplier	index	PRIMARY	PRIMARY	4	NULL	10	100.00	
-1	PRIMARY	<derived3>	ref	key0	key0	5	dbt3_s001.supplier.s_suppkey	10	100.00	Using where
+1	PRIMARY	<derived3>	ref	key0	key0	5	dbt3_s001.supplier.s_suppkey	1	100.00	Using where
 3	DERIVED	lineitem	range	i_l_shipdate,i_l_suppkey	i_l_shipdate	4	NULL	229	100.00	Using where; Using temporary; Using filesort
-2	SUBQUERY	<derived4>	ALL	NULL	NULL	NULL	NULL	229	100.00	
+2	SUBQUERY	<derived4>	ALL	NULL	NULL	NULL	NULL	10	100.00	
 4	DERIVED	lineitem	range	i_l_shipdate	i_l_shipdate	4	NULL	229	100.00	Using where; Using temporary; Using filesort
 Warnings:
 Note	1003	/* select#1 */ select `dbt3_s001`.`supplier`.`s_suppkey` AS `s_suppkey`,`dbt3_s001`.`supplier`.`s_name` AS `s_name`,`dbt3_s001`.`supplier`.`s_address` AS `s_address`,`dbt3_s001`.`supplier`.`s_phone` AS `s_phone`,`revenue0`.`total_revenue` AS `total_revenue` from `dbt3_s001`.`supplier` join `dbt3_s001`.`revenue0` where `revenue0`.`supplier_no` = `dbt3_s001`.`supplier`.`s_suppkey` and `revenue0`.`total_revenue` = (/* select#2 */ select max(`revenue0`.`total_revenue`) from `dbt3_s001`.`revenue0`) order by `dbt3_s001`.`supplier`.`s_suppkey`
@@ -170,9 +170,9 @@ and total_revenue = (select max(total_revenue) from revenue0)
 order by s_suppkey;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	supplier	index	PRIMARY	PRIMARY	4	NULL	10	100.00	
-1	PRIMARY	<derived3>	ref	key0	key0	5	dbt3_s001.supplier.s_suppkey	10	100.00	Using where
+1	PRIMARY	<derived3>	ref	key0	key0	5	dbt3_s001.supplier.s_suppkey	1	100.00	Using where
 3	DERIVED	lineitem	range	i_l_shipdate,i_l_suppkey	i_l_shipdate	4	NULL	229	100.00	Using where; Using temporary; Using filesort
-2	SUBQUERY	<derived4>	ALL	NULL	NULL	NULL	NULL	229	100.00	
+2	SUBQUERY	<derived4>	ALL	NULL	NULL	NULL	NULL	10	100.00	
 4	DERIVED	lineitem	range	i_l_shipdate	i_l_shipdate	4	NULL	229	100.00	Using where; Using temporary; Using filesort
 Warnings:
 Note	1003	/* select#1 */ select `dbt3_s001`.`supplier`.`s_suppkey` AS `s_suppkey`,`dbt3_s001`.`supplier`.`s_name` AS `s_name`,`dbt3_s001`.`supplier`.`s_address` AS `s_address`,`dbt3_s001`.`supplier`.`s_phone` AS `s_phone`,`revenue0`.`total_revenue` AS `total_revenue` from `dbt3_s001`.`supplier` join `dbt3_s001`.`revenue0` where `revenue0`.`supplier_no` = `dbt3_s001`.`supplier`.`s_suppkey` and `revenue0`.`total_revenue` = (/* select#2 */ select max(`revenue0`.`total_revenue`) from `dbt3_s001`.`revenue0`) order by `dbt3_s001`.`supplier`.`s_suppkey`
diff --git a/mysql-test/main/sp-cursor.result b/mysql-test/main/sp-cursor.result
index 83b05264339..7afd4c33aef 100644
--- a/mysql-test/main/sp-cursor.result
+++ b/mysql-test/main/sp-cursor.result
@@ -852,3 +852,75 @@ ERROR 42000: This version of MariaDB doesn't yet support 'OUT/INOUT cursor param
 #
 # End of 10.8 tests
 #
+# Start of 11.4 tests
+#
+# MDEV-36047 Package body variables are not allowed as FETCH targets
+#
+CREATE PACKAGE pkg
+FUNCTION f1() RETURNS INT;
+END;
+$$
+CREATE PACKAGE BODY pkg
+DECLARE vc INT DEFAULT 0;
+FUNCTION f1() RETURNS INT
+BEGIN
+DECLARE cur CURSOR FOR SELECT 1 AS c FROM DUAL;
+OPEN cur;
+FETCH cur INTO vc; -- SHOW CODE should display vc with a "PACKAGE_BODY" prefix
+CLOSE cur;
+RETURN vc;
+END;
+BEGIN
+DECLARE cur CURSOR FOR SELECT 1 AS c FROM DUAL;
+OPEN cur;
+FETCH cur INTO vc; -- SHOW CODE should display vc without a prefix
+CLOSE cur;
+END;
+END;
+$$
+SELECT pkg.f1();
+pkg.f1()
+1
+DROP PACKAGE pkg;
+CREATE PACKAGE pkg
+FUNCTION f1() RETURNS TEXT;
+END;
+$$
+CREATE PACKAGE BODY pkg
+DECLARE vc1 INT DEFAULT 0;
+FUNCTION f1() RETURNS TEXT
+BEGIN
+DECLARE vc2 INT DEFAULT 0;
+DECLARE cur CURSOR FOR SELECT 1 AS c1, 2 AS c2 FROM DUAL;
+OPEN cur;
+FETCH cur INTO vc1, vc2;
+CLOSE cur;
+RETURN CONCAT(vc1, ' ', vc2);
+END;
+END;
+$$
+SELECT pkg.f1();
+pkg.f1()
+1 2
+DROP PACKAGE pkg;
+CREATE PACKAGE pkg
+FUNCTION f1() RETURNS TEXT;
+END;
+$$
+CREATE PACKAGE BODY pkg
+DECLARE vc ROW(p1 INT, p2 INT);
+FUNCTION f1() RETURNS TEXT
+BEGIN
+DECLARE cur CURSOR FOR SELECT 1 AS c1, 2 AS c2 FROM DUAL;
+OPEN cur;
+FETCH cur INTO vc;
+CLOSE cur;
+RETURN CONCAT(vc.p1, ' ', vc.p2);
+END;
+END;
+$$
+SELECT pkg.f1();
+pkg.f1()
+1 2
+DROP PACKAGE pkg;
+# End of 11.4 tests
diff --git a/mysql-test/main/sp-cursor.test b/mysql-test/main/sp-cursor.test
index feb681201a2..d15a0c80a6f 100644
--- a/mysql-test/main/sp-cursor.test
+++ b/mysql-test/main/sp-cursor.test
@@ -872,3 +872,23 @@ DELIMITER ;$$
 --echo #
 --echo # End of 10.8 tests
 --echo #
+
+--echo # Start of 11.4 tests
+
+--echo #
+--echo # MDEV-36047 Package body variables are not allowed as FETCH targets
+--echo #
+
+--source include/sp-cursor-pkg-01.inc
+SELECT pkg.f1();
+DROP PACKAGE pkg;
+
+--source include/sp-cursor-pkg-02.inc
+SELECT pkg.f1();
+DROP PACKAGE pkg;
+
+--source include/sp-cursor-pkg-03.inc
+SELECT pkg.f1();
+DROP PACKAGE pkg;
+
+--echo # End of 11.4 tests
diff --git a/mysql-test/main/sp-package-code.result b/mysql-test/main/sp-package-code.result
index f69cb7ec671..290c939749f 100644
--- a/mysql-test/main/sp-package-code.result
+++ b/mysql-test/main/sp-package-code.result
@@ -258,3 +258,105 @@ Pos	Instruction
 6	set a.a@0["a"] b.a@1["a"] + 1
 DROP PACKAGE pkg1;
 DROP TABLE t1;
+# Start of 11.4 tests
+#
+# MDEV-36047 Package body variables are not allowed as FETCH targets
+#
+CREATE PACKAGE pkg
+FUNCTION f1() RETURNS INT;
+END;
+$$
+CREATE PACKAGE BODY pkg
+DECLARE vc INT DEFAULT 0;
+FUNCTION f1() RETURNS INT
+BEGIN
+DECLARE cur CURSOR FOR SELECT 1 AS c FROM DUAL;
+OPEN cur;
+FETCH cur INTO vc; -- SHOW CODE should display vc with a "PACKAGE_BODY" prefix
+CLOSE cur;
+RETURN vc;
+END;
+BEGIN
+DECLARE cur CURSOR FOR SELECT 1 AS c FROM DUAL;
+OPEN cur;
+FETCH cur INTO vc; -- SHOW CODE should display vc without a prefix
+CLOSE cur;
+END;
+END;
+$$
+SELECT pkg.f1() FROM DUAL;
+pkg.f1()
+1
+SHOW FUNCTION CODE pkg.f1;
+Pos	Instruction
+0	cpush cur@0
+1	copen cur@0
+2	cfetch cur@0 PACKAGE_BODY.vc@0
+3	cclose cur@0
+4	freturn int PACKAGE_BODY.vc@0
+SHOW PACKAGE BODY CODE pkg;
+Pos	Instruction
+0	set vc@0 0
+1	cpush cur@0
+2	copen cur@0
+3	cfetch cur@0 vc@0
+4	cclose cur@0
+5	cpop 1
+DROP PACKAGE pkg;
+CREATE PACKAGE pkg
+FUNCTION f1() RETURNS TEXT;
+END;
+$$
+CREATE PACKAGE BODY pkg
+DECLARE vc1 INT DEFAULT 0;
+FUNCTION f1() RETURNS TEXT
+BEGIN
+DECLARE vc2 INT DEFAULT 0;
+DECLARE cur CURSOR FOR SELECT 1 AS c1, 2 AS c2 FROM DUAL;
+OPEN cur;
+FETCH cur INTO vc1, vc2;
+CLOSE cur;
+RETURN CONCAT(vc1, ' ', vc2);
+END;
+END;
+$$
+SELECT pkg.f1() FROM DUAL;
+pkg.f1()
+1 2
+SHOW FUNCTION CODE pkg.f1;
+Pos	Instruction
+0	set vc2@0 0
+1	cpush cur@0
+2	copen cur@0
+3	cfetch cur@0 PACKAGE_BODY.vc1@0 vc2@0
+4	cclose cur@0
+5	freturn blob concat(PACKAGE_BODY.vc1@0,' ',vc2@0)
+DROP PACKAGE pkg;
+CREATE PACKAGE pkg
+FUNCTION f1() RETURNS TEXT;
+END;
+$$
+CREATE PACKAGE BODY pkg
+DECLARE vc ROW(p1 INT, p2 INT);
+FUNCTION f1() RETURNS TEXT
+BEGIN
+DECLARE cur CURSOR FOR SELECT 1 AS c1, 2 AS c2 FROM DUAL;
+OPEN cur;
+FETCH cur INTO vc;
+CLOSE cur;
+RETURN CONCAT(vc.p1, ' ', vc.p2);
+END;
+END;
+$$
+SELECT pkg.f1() FROM DUAL;
+pkg.f1()
+1 2
+SHOW FUNCTION CODE pkg.f1;
+Pos	Instruction
+0	cpush cur@0
+1	copen cur@0
+2	cfetch cur@0 PACKAGE_BODY.vc@0
+3	cclose cur@0
+4	freturn blob concat(PACKAGE_BODY.vc.p1@0[0],' ',PACKAGE_BODY.vc.p2@0[1])
+DROP PACKAGE pkg;
+# End of 11.4 tests
diff --git a/mysql-test/main/sp-package-code.test b/mysql-test/main/sp-package-code.test
index e99c25e7aa2..740a3eeb8af 100644
--- a/mysql-test/main/sp-package-code.test
+++ b/mysql-test/main/sp-package-code.test
@@ -198,3 +198,26 @@ DROP PACKAGE pkg1;
 DROP TABLE t1;
 
 
+--echo # Start of 11.4 tests
+
+--echo #
+--echo # MDEV-36047 Package body variables are not allowed as FETCH targets
+--echo #
+
+--source include/sp-cursor-pkg-01.inc
+SELECT pkg.f1() FROM DUAL;
+SHOW FUNCTION CODE pkg.f1;
+SHOW PACKAGE BODY CODE pkg;
+DROP PACKAGE pkg;
+
+--source include/sp-cursor-pkg-02.inc
+SELECT pkg.f1() FROM DUAL;
+SHOW FUNCTION CODE pkg.f1;
+DROP PACKAGE pkg;
+
+--source include/sp-cursor-pkg-03.inc
+SELECT pkg.f1() FROM DUAL;
+SHOW FUNCTION CODE pkg.f1;
+DROP PACKAGE pkg;
+
+--echo # End of 11.4 tests
diff --git a/mysql-test/main/table_elim.result b/mysql-test/main/table_elim.result
index dc7030c1c9d..b095dc44cb1 100644
--- a/mysql-test/main/table_elim.result
+++ b/mysql-test/main/table_elim.result
@@ -772,7 +772,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 explain select t1.* from t1 left join v2b on t1.a=v2b.b;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	10	
-1	PRIMARY	<derived2>	ref	key0	key0	8	test.t1.a	10	Using where
+1	PRIMARY	<derived2>	ref	key0	key0	8	test.t1.a	1	Using where
 2	DERIVED	t11	ALL	NULL	NULL	NULL	NULL	1000	Using temporary; Using filesort
 # Check format JSON as well
 explain format=JSON select t1.* from t1 left join v2b on t1.a=v2b.b;
@@ -803,7 +803,7 @@ EXPLAIN
           "used_key_parts": ["b"],
           "ref": ["test.t1.a"],
           "loops": 10,
-          "rows": 10,
+          "rows": 1,
           "cost": "COST_REPLACED",
           "filtered": 100,
           "attached_condition": "trigcond(t1.a = v2b.b and trigcond(t1.a is not null))",
@@ -870,7 +870,7 @@ EXPLAIN
 explain select t1.* from t1 left join v2c on t1.a=v2c.b;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	10	
-1	PRIMARY	<derived2>	ref	key0	key0	5	test.t1.a	10	Using where
+1	PRIMARY	<derived2>	ref	key0	key0	5	test.t1.a	1	Using where
 2	DERIVED	t11	ALL	NULL	NULL	NULL	NULL	1000	Using temporary; Using filesort
 2	DERIVED	t12	eq_ref	PRIMARY	PRIMARY	4	test.t11.b	1	Using where
 # Check format JSON as well
@@ -902,7 +902,7 @@ EXPLAIN
           "used_key_parts": ["b"],
           "ref": ["test.t1.a"],
           "loops": 10,
-          "rows": 10,
+          "rows": 1,
           "cost": "COST_REPLACED",
           "filtered": 100,
           "attached_condition": "trigcond(trigcond(t1.a is not null))",
diff --git a/mysql-test/main/type_num_innodb.result b/mysql-test/main/type_num_innodb.result
index 76ab147ea7e..72e7752b3d1 100644
--- a/mysql-test/main/type_num_innodb.result
+++ b/mysql-test/main/type_num_innodb.result
@@ -46,23 +46,70 @@ ALTER TABLE t1 MODIFY a DECIMAL(10,0);
 SELECT * FROM t1,t2 WHERE a=d;
 a	b	c	pk	d	e
 Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: 'd'
-Warning	1292	Truncated incorrect DECIMAL value: 'd'
-Warning	1292	Truncated incorrect DECIMAL value: 'f'
-Warning	1292	Truncated incorrect DECIMAL value: 'f'
-Warning	1292	Truncated incorrect DECIMAL value: 'g'
-Warning	1292	Truncated incorrect DECIMAL value: 'k'
-Warning	1292	Truncated incorrect DECIMAL value: 'm'
-Warning	1292	Truncated incorrect DECIMAL value: 'm'
-Warning	1292	Truncated incorrect DECIMAL value: 'm'
-Warning	1292	Truncated incorrect DECIMAL value: 'o'
-Warning	1292	Truncated incorrect DECIMAL value: 'q'
-Warning	1292	Truncated incorrect DECIMAL value: 'r'
-Warning	1292	Truncated incorrect DECIMAL value: 'u'
-Warning	1292	Truncated incorrect DECIMAL value: 'w'
-Warning	1292	Truncated incorrect DECIMAL value: 'x'
-Warning	1292	Truncated incorrect DECIMAL value: 'x'
-Warning	1292	Truncated incorrect DECIMAL value: 'y'
+Warning	1292	Truncated incorrect DOUBLE value: 'd'
+Warning	1292	Truncated incorrect DOUBLE value: 'd'
+Warning	1292	Truncated incorrect DOUBLE value: 'f'
+Warning	1292	Truncated incorrect DOUBLE value: 'f'
+Warning	1292	Truncated incorrect DOUBLE value: 'g'
+Warning	1292	Truncated incorrect DOUBLE value: 'k'
+Warning	1292	Truncated incorrect DOUBLE value: 'm'
+Warning	1292	Truncated incorrect DOUBLE value: 'm'
+Warning	1292	Truncated incorrect DOUBLE value: 'm'
+Warning	1292	Truncated incorrect DOUBLE value: 'o'
+Warning	1292	Truncated incorrect DOUBLE value: 'q'
+Warning	1292	Truncated incorrect DOUBLE value: 'r'
+Warning	1292	Truncated incorrect DOUBLE value: 'u'
+Warning	1292	Truncated incorrect DOUBLE value: 'w'
+Warning	1292	Truncated incorrect DOUBLE value: 'x'
+Warning	1292	Truncated incorrect DOUBLE value: 'x'
+Warning	1292	Truncated incorrect DOUBLE value: 'y'
+Warning	1292	Truncated incorrect DOUBLE value: 'd'
+Warning	1292	Truncated incorrect DOUBLE value: 'd'
+Warning	1292	Truncated incorrect DOUBLE value: 'f'
+Warning	1292	Truncated incorrect DOUBLE value: 'f'
+Warning	1292	Truncated incorrect DOUBLE value: 'g'
+Warning	1292	Truncated incorrect DOUBLE value: 'k'
+Warning	1292	Truncated incorrect DOUBLE value: 'm'
+Warning	1292	Truncated incorrect DOUBLE value: 'm'
+Warning	1292	Truncated incorrect DOUBLE value: 'm'
+Warning	1292	Truncated incorrect DOUBLE value: 'o'
+Warning	1292	Truncated incorrect DOUBLE value: 'q'
+Warning	1292	Truncated incorrect DOUBLE value: 'r'
+Warning	1292	Truncated incorrect DOUBLE value: 'u'
+Warning	1292	Truncated incorrect DOUBLE value: 'w'
+Warning	1292	Truncated incorrect DOUBLE value: 'x'
+Warning	1292	Truncated incorrect DOUBLE value: 'x'
+Warning	1292	Truncated incorrect DOUBLE value: 'y'
+Warning	1292	Truncated incorrect DOUBLE value: 'd'
+Warning	1292	Truncated incorrect DOUBLE value: 'd'
+Warning	1292	Truncated incorrect DOUBLE value: 'f'
+Warning	1292	Truncated incorrect DOUBLE value: 'f'
+Warning	1292	Truncated incorrect DOUBLE value: 'g'
+Warning	1292	Truncated incorrect DOUBLE value: 'k'
+Warning	1292	Truncated incorrect DOUBLE value: 'm'
+Warning	1292	Truncated incorrect DOUBLE value: 'm'
+Warning	1292	Truncated incorrect DOUBLE value: 'm'
+Warning	1292	Truncated incorrect DOUBLE value: 'o'
+Warning	1292	Truncated incorrect DOUBLE value: 'q'
+Warning	1292	Truncated incorrect DOUBLE value: 'r'
+Warning	1292	Truncated incorrect DOUBLE value: 'u'
+Warning	1292	Truncated incorrect DOUBLE value: 'w'
+Warning	1292	Truncated incorrect DOUBLE value: 'x'
+Warning	1292	Truncated incorrect DOUBLE value: 'x'
+Warning	1292	Truncated incorrect DOUBLE value: 'y'
+Warning	1292	Truncated incorrect DOUBLE value: 'd'
+Warning	1292	Truncated incorrect DOUBLE value: 'd'
+Warning	1292	Truncated incorrect DOUBLE value: 'f'
+Warning	1292	Truncated incorrect DOUBLE value: 'f'
+Warning	1292	Truncated incorrect DOUBLE value: 'g'
+Warning	1292	Truncated incorrect DOUBLE value: 'k'
+Warning	1292	Truncated incorrect DOUBLE value: 'm'
+Warning	1292	Truncated incorrect DOUBLE value: 'm'
+Warning	1292	Truncated incorrect DOUBLE value: 'm'
+Warning	1292	Truncated incorrect DOUBLE value: 'o'
+Warning	1292	Truncated incorrect DOUBLE value: 'q'
+Warning	1292	Truncated incorrect DOUBLE value: 'r'
+Warning	1292	Truncated incorrect DOUBLE value: 'u'
 ALTER TABLE t1 MODIFY a DOUBLE;
 SELECT * FROM t1,t2 WHERE a=d;
 a	b	c	pk	d	e
@@ -84,6 +131,53 @@ Warning	1292	Truncated incorrect DOUBLE value: 'w'
 Warning	1292	Truncated incorrect DOUBLE value: 'x'
 Warning	1292	Truncated incorrect DOUBLE value: 'x'
 Warning	1292	Truncated incorrect DOUBLE value: 'y'
+Warning	1292	Truncated incorrect DOUBLE value: 'd'
+Warning	1292	Truncated incorrect DOUBLE value: 'd'
+Warning	1292	Truncated incorrect DOUBLE value: 'f'
+Warning	1292	Truncated incorrect DOUBLE value: 'f'
+Warning	1292	Truncated incorrect DOUBLE value: 'g'
+Warning	1292	Truncated incorrect DOUBLE value: 'k'
+Warning	1292	Truncated incorrect DOUBLE value: 'm'
+Warning	1292	Truncated incorrect DOUBLE value: 'm'
+Warning	1292	Truncated incorrect DOUBLE value: 'm'
+Warning	1292	Truncated incorrect DOUBLE value: 'o'
+Warning	1292	Truncated incorrect DOUBLE value: 'q'
+Warning	1292	Truncated incorrect DOUBLE value: 'r'
+Warning	1292	Truncated incorrect DOUBLE value: 'u'
+Warning	1292	Truncated incorrect DOUBLE value: 'w'
+Warning	1292	Truncated incorrect DOUBLE value: 'x'
+Warning	1292	Truncated incorrect DOUBLE value: 'x'
+Warning	1292	Truncated incorrect DOUBLE value: 'y'
+Warning	1292	Truncated incorrect DOUBLE value: 'd'
+Warning	1292	Truncated incorrect DOUBLE value: 'd'
+Warning	1292	Truncated incorrect DOUBLE value: 'f'
+Warning	1292	Truncated incorrect DOUBLE value: 'f'
+Warning	1292	Truncated incorrect DOUBLE value: 'g'
+Warning	1292	Truncated incorrect DOUBLE value: 'k'
+Warning	1292	Truncated incorrect DOUBLE value: 'm'
+Warning	1292	Truncated incorrect DOUBLE value: 'm'
+Warning	1292	Truncated incorrect DOUBLE value: 'm'
+Warning	1292	Truncated incorrect DOUBLE value: 'o'
+Warning	1292	Truncated incorrect DOUBLE value: 'q'
+Warning	1292	Truncated incorrect DOUBLE value: 'r'
+Warning	1292	Truncated incorrect DOUBLE value: 'u'
+Warning	1292	Truncated incorrect DOUBLE value: 'w'
+Warning	1292	Truncated incorrect DOUBLE value: 'x'
+Warning	1292	Truncated incorrect DOUBLE value: 'x'
+Warning	1292	Truncated incorrect DOUBLE value: 'y'
+Warning	1292	Truncated incorrect DOUBLE value: 'd'
+Warning	1292	Truncated incorrect DOUBLE value: 'd'
+Warning	1292	Truncated incorrect DOUBLE value: 'f'
+Warning	1292	Truncated incorrect DOUBLE value: 'f'
+Warning	1292	Truncated incorrect DOUBLE value: 'g'
+Warning	1292	Truncated incorrect DOUBLE value: 'k'
+Warning	1292	Truncated incorrect DOUBLE value: 'm'
+Warning	1292	Truncated incorrect DOUBLE value: 'm'
+Warning	1292	Truncated incorrect DOUBLE value: 'm'
+Warning	1292	Truncated incorrect DOUBLE value: 'o'
+Warning	1292	Truncated incorrect DOUBLE value: 'q'
+Warning	1292	Truncated incorrect DOUBLE value: 'r'
+Warning	1292	Truncated incorrect DOUBLE value: 'u'
 DROP TABLE t1,t2;
 #
 # End of 10.2 tests
diff --git a/mysql-test/main/update.result b/mysql-test/main/update.result
index d75e57b9e71..9bc65db934d 100644
--- a/mysql-test/main/update.result
+++ b/mysql-test/main/update.result
@@ -767,6 +767,86 @@ u	xxb
 drop table t1;
 # End of MariaDB 10.4 tests
 #
+# MDEV-35955 Wrong result for UPDATE ... ORDER BY LIMIT which uses tmp.table
+#
+create table t1 (id int primary key, v int);
+create table t2 (id int primary key, v int);
+insert into t1 (id, v) values (2,3),(1,4);
+insert into t2 (id, v) values (5,5),(6,6);
+select t1.*, t2.* from t1, t2 order by t1.id, t2.id limit 2;
+id	v	id	v
+1	4	5	5
+1	4	6	6
+UPDATE t1, t2 SET t1.v=-1, t2.v=-1 ORDER BY t1.id, t2.id LIMIT 2;
+select * from t1;
+id	v
+2	3
+1	-1
+select * from t2;
+id	v
+5	-1
+6	-1
+drop table t1, t2;
+create table t1 (id int primary key, v text) engine=myisam;
+create table t2 (id int primary key, v text) engine=myisam;
+insert into t1 (id, v) values (1,'b'),(2,'fo'),(3,'bar'),(4,'barr'),(5,'bazzz');
+insert into t2 (id, v) values (6,'quxqux'),(7,'foofoof'),(8,'barbarba'),(9,'quxquxqux'),(10,'bazbazbazb');
+select t1.*, t2.* from t1, t2 order by t1.id, t2.id limit 2;
+id	v	id	v
+1	b	6	quxqux
+1	b	7	foofoof
+update t1, t2 set t1.v='DELETED', t2.v='DELETED' order by t1.id, t2.id limit 2;
+select * from t1;
+id	v
+1	DELETED
+2	fo
+3	bar
+4	barr
+5	bazzz
+select * from t2;
+id	v
+6	DELETED
+7	DELETED
+8	barbarba
+9	quxquxqux
+10	bazbazbazb
+drop table t1, t2;
+create table t1 (id int primary key, v int);
+create table t2 (id int primary key, v int);
+create table t3 (id int primary key, v int);
+insert into t1 (id, v) values (1, 1000), (2, 2000), (3, 3000), (4, 4000), (5, 5000);
+insert into t2 (id, v) values (10, 100), (20, 200), (30, 300), (40, 400), (50, 500);
+insert into t3 (id, v) values (11, 111), (22, 222), (33, 333), (44, 444), (55, 555);
+select t1.*, t2.*, t3.* from t1, t2, t3 order by t1.id, t2.id, t3.id limit 3;
+id	v	id	v	id	v
+1	1000	10	100	11	111
+1	1000	10	100	22	222
+1	1000	10	100	33	333
+UPDATE t1, t2, t3 SET t1.v=-1, t2.v=-2, t3.v=-3 ORDER BY t1.id, t2.id, t3.id LIMIT 3;
+select * from t1;
+id	v
+1	-1
+2	2000
+3	3000
+4	4000
+5	5000
+select * from t2;
+id	v
+10	-2
+20	200
+30	300
+40	400
+50	500
+select * from t3;
+id	v
+11	-3
+22	-3
+33	-3
+44	444
+55	555
+drop table t1, t2, t3;
+# End of MariaDB 10.11 tests
+#
 # MDEV-29189: Second execution of SF using UPDATE?DELETE
 #             after reported error by the first execution
 #
@@ -803,7 +883,7 @@ c
 DROP FUNCTION f1;
 DROP FUNCTION f2;
 DROP TABLE t1;
-# End of MariaDB 10.10 tests
+# End of MariaDB 11.1 tests
 #
 # MDEV-25008: Delete query gets stuck on mariadb, same query works
 #             on MySQL 8.0.21
@@ -916,4 +996,4 @@ id	v
 44	444
 55	555
 drop table t1, t2, t3;
-# End of MariaDB 10.11 tests
+# End of MariaDB 11.8 tests
diff --git a/mysql-test/main/update.test b/mysql-test/main/update.test
index 46458db6320..7be920129b1 100644
--- a/mysql-test/main/update.test
+++ b/mysql-test/main/update.test
@@ -710,6 +710,46 @@ drop table t1;
 
 --echo # End of MariaDB 10.4 tests
 
+--echo #
+--echo # MDEV-35955 Wrong result for UPDATE ... ORDER BY LIMIT which uses tmp.table
+--echo #
+
+create table t1 (id int primary key, v int);
+create table t2 (id int primary key, v int);
+insert into t1 (id, v) values (2,3),(1,4);
+insert into t2 (id, v) values (5,5),(6,6);
+select t1.*, t2.* from t1, t2 order by t1.id, t2.id limit 2;
+UPDATE t1, t2 SET t1.v=-1, t2.v=-1 ORDER BY t1.id, t2.id LIMIT 2;
+select * from t1;
+select * from t2;
+
+drop table t1, t2;
+create table t1 (id int primary key, v text) engine=myisam;
+create table t2 (id int primary key, v text) engine=myisam;
+insert into t1 (id, v) values (1,'b'),(2,'fo'),(3,'bar'),(4,'barr'),(5,'bazzz');
+insert into t2 (id, v) values (6,'quxqux'),(7,'foofoof'),(8,'barbarba'),(9,'quxquxqux'),(10,'bazbazbazb');
+select t1.*, t2.* from t1, t2 order by t1.id, t2.id limit 2;
+update t1, t2 set t1.v='DELETED', t2.v='DELETED' order by t1.id, t2.id limit 2;
+select * from t1;
+select * from t2;
+
+drop table t1, t2;
+create table t1 (id int primary key, v int);
+create table t2 (id int primary key, v int);
+create table t3 (id int primary key, v int);
+insert into t1 (id, v) values (1, 1000), (2, 2000), (3, 3000), (4, 4000), (5, 5000);
+insert into t2 (id, v) values (10, 100), (20, 200), (30, 300), (40, 400), (50, 500);
+insert into t3 (id, v) values (11, 111), (22, 222), (33, 333), (44, 444), (55, 555);
+select t1.*, t2.*, t3.* from t1, t2, t3 order by t1.id, t2.id, t3.id limit 3;
+UPDATE t1, t2, t3 SET t1.v=-1, t2.v=-2, t3.v=-3 ORDER BY t1.id, t2.id, t3.id LIMIT 3;
+select * from t1;
+select * from t2;
+select * from t3;
+
+drop table t1, t2, t3;
+
+--echo # End of MariaDB 10.11 tests
+
 --echo #
 --echo # MDEV-29189: Second execution of SF using UPDATE?DELETE
 --echo #             after reported error by the first execution
@@ -748,7 +788,7 @@ DROP FUNCTION f2;
 DROP TABLE t1;
 --enable_ps2_protocol
 
---echo # End of MariaDB 10.10 tests
+--echo # End of MariaDB 11.1 tests
 
 --echo #
 --echo # MDEV-25008: Delete query gets stuck on mariadb, same query works
@@ -824,4 +864,4 @@ select * from t3;
 
 drop table t1, t2, t3;
 
---echo # End of MariaDB 10.11 tests
+--echo # End of MariaDB 11.8 tests
diff --git a/mysql-test/mariadb-test-run.pl b/mysql-test/mariadb-test-run.pl
index afe13a81d35..54e02c18320 100755
--- a/mysql-test/mariadb-test-run.pl
+++ b/mysql-test/mariadb-test-run.pl
@@ -270,6 +270,9 @@ our $opt_force= 0;
 our $opt_skip_not_found= 0;
 our $opt_mem= $ENV{'MTR_MEM'};
 our $opt_clean_vardir= $ENV{'MTR_CLEAN_VARDIR'};
+our $opt_catalogs= 0;
+our $opt_catalog_name="";
+our $catalog_name="def";
 
 our $opt_gcov;
 our $opt_gprof;
@@ -3956,6 +3959,23 @@ sub run_testcase ($$) {
       }
     }
 
+    # Set up things for catalogs
+    # The values of MARIADB_TOPDIR and MARIAD_DATADIR should
+    # be taken from the values used by the default (first)
+    # connection that is used by mariadb-test.
+    my ($mysqld, @servers);
+    @servers= all_servers();
+    $mysqld= $servers[0];
+    $ENV{'MARIADB_TOPDIR'}= $mysqld->value('datadir');
+    if (!$opt_catalogs)
+    {
+      $ENV{'MARIADB_DATADIR'}= $mysqld->value('datadir');
+    }
+    else
+    {
+      $ENV{'MARIADB_DATADIR'}= $mysqld->value('datadir') . "/" . $catalog_name;
+    }
+
     # Write start of testcase to log
     mark_log($path_current_testlog, $tinfo);
 
@@ -4469,14 +4489,12 @@ sub extract_warning_lines ($$) {
     (
      @global_suppressions,
      qr/error .*connecting to master/,
-     qr/InnoDB: Error: in ALTER TABLE `test`.`t[12]`/,
-     qr/InnoDB: Error: table `test`.`t[12]` .*does not exist in the InnoDB internal/,
-     qr/InnoDB: Warning: a long semaphore wait:/,
      qr/InnoDB: Dumping buffer pool.*/,
      qr/InnoDB: Buffer pool.*/,
      qr/InnoDB: Could not free any blocks in the buffer pool!/,
-     qr/InnoDB: Warning: Writer thread is waiting this semaphore:/,
      qr/InnoDB: innodb_open_files .* should not be greater than/,
+     qr/InnoDB: Trying to delete tablespace.*but there are.*pending/,
+     qr/InnoDB: Tablespace 1[0-9]* was not found at .*, and innodb_force_recovery was set/,
      qr/Slave: Unknown table 't1' .* 1051/,
      qr/Slave SQL:.*(Internal MariaDB error code: [[:digit:]]+|Query:.*)/,
      qr/slave SQL thread aborted/,
diff --git a/mysql-test/suite/atomic/alter_table.opt b/mysql-test/suite/atomic/alter_table.opt
index 61f3ce08d27..df19ac60a2a 100644
--- a/mysql-test/suite/atomic/alter_table.opt
+++ b/mysql-test/suite/atomic/alter_table.opt
@@ -1 +1,2 @@
 --innodb-max-dirty-pages-pct=0
+--skip-ssl
diff --git a/mysql-test/suite/atomic/alter_table.result b/mysql-test/suite/atomic/alter_table.result
index cf4fd2fcc99..acbe81b3ed4 100644
--- a/mysql-test/suite/atomic/alter_table.result
+++ b/mysql-test/suite/atomic/alter_table.result
@@ -1,3 +1,4 @@
+ALTER DATABASE test CHARACTER SET latin1 COLLATE latin1_swedish_ci;
 create database test2;
 RESET MASTER;
 
@@ -15,7 +16,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -27,7 +28,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -41,7 +42,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -54,7 +55,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new"
@@ -68,7 +69,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new"
@@ -82,7 +83,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new"
@@ -98,7 +99,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new"
@@ -116,7 +117,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new"
@@ -130,7 +131,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new"
@@ -146,7 +147,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -160,7 +161,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_copy
@@ -172,7 +173,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new"
@@ -185,7 +186,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new"
@@ -217,7 +218,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -231,7 +232,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_copy
@@ -243,7 +244,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new"
@@ -256,7 +257,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new"
@@ -288,7 +289,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -300,7 +301,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -314,7 +315,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -327,7 +328,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2
@@ -341,7 +342,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2
@@ -355,7 +356,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2
@@ -371,7 +372,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2
@@ -385,7 +386,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2
@@ -399,7 +400,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2
@@ -413,7 +414,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2
@@ -427,7 +428,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2
@@ -472,7 +473,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -484,7 +485,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -498,7 +499,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -511,7 +512,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, ALGORITHM=copy, COMMENT "new"
@@ -525,7 +526,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, ALGORITHM=copy, COMMENT "new"
@@ -539,7 +540,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, ALGORITHM=copy, COMMENT "new"
@@ -555,7 +556,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, ALGORITHM=copy, COMMENT "new"
@@ -573,7 +574,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, ALGORITHM=copy, COMMENT "new"
@@ -587,7 +588,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, ALGORITHM=copy, COMMENT "new"
@@ -621,7 +622,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_rename_triggers
@@ -633,7 +634,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_delete_backup
@@ -652,7 +653,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -666,7 +667,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_copy
@@ -678,7 +679,7 @@ t2	CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename t2
@@ -691,7 +692,7 @@ t2	CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename t2
@@ -712,7 +713,7 @@ t2	CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename t2
@@ -725,7 +726,7 @@ t2	CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename t2
@@ -745,7 +746,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -759,7 +760,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_copy
@@ -771,7 +772,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", rename t2
@@ -784,7 +785,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", rename t2
@@ -805,7 +806,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", rename t2
@@ -818,7 +819,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", rename t2
@@ -838,7 +839,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -850,7 +851,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -864,7 +865,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -876,7 +877,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ENGINE=aria, COMMENT "new"
@@ -889,7 +890,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ENGINE=aria, COMMENT "new"
@@ -902,7 +903,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ENGINE=aria, COMMENT "new"
@@ -917,7 +918,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ENGINE=aria, COMMENT "new"
@@ -934,7 +935,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ENGINE=aria, COMMENT "new"
@@ -947,7 +948,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ENGINE=aria, COMMENT "new"
@@ -963,7 +964,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -975,7 +976,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -989,7 +990,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -1001,7 +1002,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", engine=aria
@@ -1014,7 +1015,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", engine=aria
@@ -1027,7 +1028,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", engine=aria
@@ -1042,7 +1043,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", engine=aria
@@ -1059,7 +1060,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", engine=aria
@@ -1072,7 +1073,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", engine=aria
@@ -1088,7 +1089,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -1100,7 +1101,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -1114,7 +1115,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -1127,7 +1128,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=aria
@@ -1141,7 +1142,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=aria
@@ -1155,7 +1156,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=aria
@@ -1171,7 +1172,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=aria
@@ -1185,7 +1186,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=aria
@@ -1199,7 +1200,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=aria
@@ -1213,7 +1214,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=aria
@@ -1227,7 +1228,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=aria
@@ -1243,7 +1244,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -1255,7 +1256,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -1269,7 +1270,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -1283,7 +1284,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename test2.t2
@@ -1298,7 +1299,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename test2.t2
@@ -1313,7 +1314,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename test2.t2
@@ -1330,7 +1331,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename test2.t2
@@ -1345,7 +1346,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename test2.t2
@@ -1360,7 +1361,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename test2.t2
@@ -1375,7 +1376,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename test2.t2
@@ -1390,7 +1391,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename test2.t2
@@ -1406,7 +1407,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -1420,7 +1421,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_copy
@@ -1432,7 +1433,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename test2.t2
@@ -1445,7 +1446,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename test2.t2
@@ -1467,7 +1468,7 @@ t2	CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename test2.t2
@@ -1481,7 +1482,7 @@ t2	CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename test2.t2
@@ -1501,7 +1502,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -1513,7 +1514,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -1527,7 +1528,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -1540,7 +1541,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   KEY `b` (`b`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD key(b), COMMENT "new"
@@ -1554,7 +1555,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   KEY `b` (`b`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD key(b), COMMENT "new"
@@ -1568,7 +1569,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   KEY `b` (`b`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD key(b), COMMENT "new"
@@ -1584,7 +1585,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   KEY `b` (`b`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD key(b), COMMENT "new"
@@ -1602,7 +1603,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   KEY `b` (`b`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD key(b), COMMENT "new"
@@ -1616,7 +1617,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   KEY `b` (`b`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD key(b), COMMENT "new"
@@ -1632,7 +1633,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -1644,7 +1645,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -1658,7 +1659,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -1669,7 +1670,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 DROP INDEX a
@@ -1681,7 +1682,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 DROP INDEX a
@@ -1693,7 +1694,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 DROP INDEX a
@@ -1707,7 +1708,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 DROP INDEX a
@@ -1723,7 +1724,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 DROP INDEX a
@@ -1735,7 +1736,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 DROP INDEX a
@@ -1751,7 +1752,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -1763,7 +1764,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -1777,7 +1778,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -1793,7 +1794,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v)
@@ -1810,7 +1811,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v)
@@ -1827,7 +1828,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v)
@@ -1846,7 +1847,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v)
@@ -1867,7 +1868,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v)
@@ -1884,7 +1885,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v)
@@ -1900,7 +1901,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -1912,7 +1913,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -1926,7 +1927,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -1942,7 +1943,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2
@@ -1959,7 +1960,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2
@@ -1976,7 +1977,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2
@@ -1995,7 +1996,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2
@@ -2012,7 +2013,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2
@@ -2029,7 +2030,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2
@@ -2046,7 +2047,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2
@@ -2063,7 +2064,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2
@@ -2079,7 +2080,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -2091,7 +2092,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -2105,7 +2106,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -2121,7 +2122,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), ENGINE=aria
@@ -2138,7 +2139,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), ENGINE=aria
@@ -2155,7 +2156,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), ENGINE=aria
@@ -2174,7 +2175,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), ENGINE=aria
@@ -2195,7 +2196,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), ENGINE=aria
@@ -2212,7 +2213,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), ENGINE=aria
@@ -2228,7 +2229,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -2240,7 +2241,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -2254,7 +2255,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -2270,7 +2271,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2, ENGINE=aria
@@ -2287,7 +2288,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2, ENGINE=aria
@@ -2304,7 +2305,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2, ENGINE=aria
@@ -2323,7 +2324,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2, ENGINE=aria
@@ -2340,7 +2341,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2, ENGINE=aria
@@ -2357,7 +2358,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2, ENGINE=aria
@@ -2374,7 +2375,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2, ENGINE=aria
@@ -2391,7 +2392,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2, ENGINE=aria
@@ -2407,7 +2408,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -2419,7 +2420,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -2433,7 +2434,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -2450,7 +2451,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME test2.t2
@@ -2468,7 +2469,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME test2.t2
@@ -2486,7 +2487,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME test2.t2
@@ -2506,7 +2507,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME test2.t2
@@ -2524,7 +2525,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME test2.t2
@@ -2542,7 +2543,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME test2.t2
@@ -2560,7 +2561,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME test2.t2
@@ -2578,7 +2579,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME test2.t2
@@ -2596,7 +2597,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -2609,7 +2610,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_copy
@@ -2620,7 +2621,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -2632,7 +2633,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new"
@@ -2663,7 +2664,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -2676,7 +2677,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_copy
@@ -2687,7 +2688,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -2698,7 +2699,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new"
@@ -2729,7 +2730,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -2742,7 +2743,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_copy
@@ -2753,7 +2754,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -2764,7 +2765,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new"
@@ -2795,7 +2796,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -2808,7 +2809,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_copy
@@ -2819,7 +2820,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -2831,7 +2832,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2
@@ -2852,7 +2853,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2
@@ -2865,7 +2866,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2
@@ -2939,7 +2940,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -2950,7 +2951,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -2963,7 +2964,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -2975,7 +2976,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, ALGORITHM=copy, COMMENT "new"
@@ -2988,7 +2989,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, ALGORITHM=copy, COMMENT "new"
@@ -3001,7 +3002,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, ALGORITHM=copy, COMMENT "new"
@@ -3016,7 +3017,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, ALGORITHM=copy, COMMENT "new"
@@ -3033,7 +3034,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, ALGORITHM=copy, COMMENT "new"
@@ -3046,7 +3047,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, ALGORITHM=copy, COMMENT "new"
@@ -3079,7 +3080,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_rename_triggers
@@ -3090,7 +3091,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_delete_backup
@@ -3108,7 +3109,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -3121,7 +3122,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_copy
@@ -3132,7 +3133,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -3143,7 +3144,7 @@ t2	CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename t2
@@ -3163,7 +3164,7 @@ t2	CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename t2
@@ -3175,7 +3176,7 @@ t2	CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename t2
@@ -3194,7 +3195,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -3207,7 +3208,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_copy
@@ -3218,7 +3219,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -3229,7 +3230,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", rename t2
@@ -3249,7 +3250,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", rename t2
@@ -3261,7 +3262,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", rename t2
@@ -3280,7 +3281,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -3291,7 +3292,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -3304,7 +3305,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -3316,7 +3317,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ENGINE=aria, COMMENT "new"
@@ -3329,7 +3330,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ENGINE=aria, COMMENT "new"
@@ -3342,7 +3343,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ENGINE=aria, COMMENT "new"
@@ -3357,7 +3358,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ENGINE=aria, COMMENT "new"
@@ -3374,7 +3375,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ENGINE=aria, COMMENT "new"
@@ -3387,7 +3388,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ENGINE=aria, COMMENT "new"
@@ -3402,7 +3403,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -3413,7 +3414,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -3426,7 +3427,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -3438,7 +3439,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", engine=aria
@@ -3451,7 +3452,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", engine=aria
@@ -3464,7 +3465,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", engine=aria
@@ -3479,7 +3480,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", engine=aria
@@ -3496,7 +3497,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", engine=aria
@@ -3509,7 +3510,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", engine=aria
@@ -3524,7 +3525,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -3535,7 +3536,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -3548,7 +3549,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -3561,7 +3562,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=aria
@@ -3575,7 +3576,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=aria
@@ -3589,7 +3590,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=aria
@@ -3605,7 +3606,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=aria
@@ -3619,7 +3620,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=aria
@@ -3633,7 +3634,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=aria
@@ -3647,7 +3648,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=aria
@@ -3661,7 +3662,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=aria
@@ -3676,7 +3677,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -3689,7 +3690,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_copy
@@ -3700,7 +3701,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -3712,7 +3713,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename test2.t2
@@ -3734,7 +3735,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename test2.t2
@@ -3748,7 +3749,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename test2.t2
@@ -3767,7 +3768,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -3780,7 +3781,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_copy
@@ -3791,7 +3792,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -3802,7 +3803,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename test2.t2
@@ -3823,7 +3824,7 @@ t2	CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename test2.t2
@@ -3836,7 +3837,7 @@ t2	CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename test2.t2
@@ -3855,7 +3856,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -3868,7 +3869,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_copy
@@ -3879,7 +3880,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -3891,7 +3892,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   KEY `b` (`b`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD key(b), COMMENT "new"
@@ -3922,7 +3923,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -3935,7 +3936,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_copy
@@ -3946,7 +3947,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -3956,7 +3957,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 DROP INDEX a
@@ -3987,7 +3988,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -3998,7 +3999,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -4011,7 +4012,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -4025,7 +4026,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v)
@@ -4040,7 +4041,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v)
@@ -4055,7 +4056,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v)
@@ -4072,7 +4073,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v)
@@ -4091,7 +4092,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v)
@@ -4106,7 +4107,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v)
@@ -4121,7 +4122,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -4132,7 +4133,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -4145,7 +4146,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -4159,7 +4160,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2
@@ -4174,7 +4175,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2
@@ -4189,7 +4190,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2
@@ -4206,7 +4207,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2
@@ -4221,7 +4222,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2
@@ -4236,7 +4237,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2
@@ -4251,7 +4252,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2
@@ -4266,7 +4267,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2
@@ -4281,7 +4282,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -4292,7 +4293,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -4305,7 +4306,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -4321,7 +4322,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), ENGINE=aria
@@ -4338,7 +4339,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), ENGINE=aria
@@ -4355,7 +4356,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), ENGINE=aria
@@ -4374,7 +4375,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), ENGINE=aria
@@ -4395,7 +4396,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), ENGINE=aria
@@ -4412,7 +4413,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), ENGINE=aria
@@ -4427,7 +4428,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -4438,7 +4439,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -4451,7 +4452,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -4467,7 +4468,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2, ENGINE=aria
@@ -4484,7 +4485,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2, ENGINE=aria
@@ -4501,7 +4502,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2, ENGINE=aria
@@ -4520,7 +4521,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2, ENGINE=aria
@@ -4537,7 +4538,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2, ENGINE=aria
@@ -4554,7 +4555,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2, ENGINE=aria
@@ -4571,7 +4572,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2, ENGINE=aria
@@ -4588,7 +4589,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2, ENGINE=aria
@@ -4603,7 +4604,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -4614,7 +4615,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -4627,7 +4628,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -4642,7 +4643,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME test2.t2
@@ -4658,7 +4659,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME test2.t2
@@ -4674,7 +4675,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME test2.t2
@@ -4692,7 +4693,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME test2.t2
@@ -4708,7 +4709,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME test2.t2
@@ -4724,7 +4725,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME test2.t2
@@ -4740,7 +4741,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME test2.t2
@@ -4756,7 +4757,8 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME test2.t2
+ALTER DATABASE test CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci;
diff --git a/mysql-test/suite/atomic/alter_table.test b/mysql-test/suite/atomic/alter_table.test
index b229a554112..8f590e59175 100644
--- a/mysql-test/suite/atomic/alter_table.test
+++ b/mysql-test/suite/atomic/alter_table.test
@@ -1,6 +1,8 @@
 --source include/have_debug.inc
 --source include/have_innodb.inc
 --source include/have_log_bin.inc
+--source include/default_charset.inc
+--source include/test_db_charset_latin1.inc
 
 if (!$BIG_TEST)
 {
@@ -9,6 +11,7 @@ if (!$BIG_TEST)
 
 # Starting with 11.7, this will hit the 900-second timeout on WITH_MSAN=ON CMAKE_BUILD_TYPE=Debug
 --source include/not_msan.inc
+
 #
 # Testing of atomic create table with crashes in a lot of different places
 #
@@ -207,3 +210,4 @@ while ($e < $engine_count)
 }
 drop database test2;
 --enable_query_log
+--source include/test_db_charset_restore.inc
diff --git a/mysql-test/suite/atomic/alter_table_aria.result b/mysql-test/suite/atomic/alter_table_aria.result
index e7e99371abc..61eb92ab374 100644
--- a/mysql-test/suite/atomic/alter_table_aria.result
+++ b/mysql-test/suite/atomic/alter_table_aria.result
@@ -1,3 +1,4 @@
+ALTER DATABASE test CHARACTER SET latin1 COLLATE latin1_swedish_ci;
 create database test2;
 RESET MASTER;
 
@@ -15,7 +16,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -27,7 +28,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -41,7 +42,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -54,7 +55,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new"
@@ -68,7 +69,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new"
@@ -82,7 +83,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new"
@@ -98,7 +99,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new"
@@ -116,7 +117,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new"
@@ -130,7 +131,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new"
@@ -146,7 +147,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -160,7 +161,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_copy
@@ -172,7 +173,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new"
@@ -185,7 +186,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new"
@@ -217,7 +218,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -231,7 +232,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_copy
@@ -243,7 +244,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new"
@@ -256,7 +257,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new"
@@ -288,7 +289,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -300,7 +301,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -314,7 +315,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -327,7 +328,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2
@@ -341,7 +342,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2
@@ -355,7 +356,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2
@@ -371,7 +372,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2
@@ -385,7 +386,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2
@@ -399,7 +400,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2
@@ -413,7 +414,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2
@@ -427,7 +428,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2
@@ -472,7 +473,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -484,7 +485,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -498,7 +499,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -511,7 +512,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, ALGORITHM=copy, COMMENT "new"
@@ -525,7 +526,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, ALGORITHM=copy, COMMENT "new"
@@ -539,7 +540,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, ALGORITHM=copy, COMMENT "new"
@@ -555,7 +556,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, ALGORITHM=copy, COMMENT "new"
@@ -573,7 +574,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, ALGORITHM=copy, COMMENT "new"
@@ -587,7 +588,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, ALGORITHM=copy, COMMENT "new"
@@ -621,7 +622,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_rename_triggers
@@ -633,7 +634,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_delete_backup
@@ -652,7 +653,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -666,7 +667,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_copy
@@ -678,7 +679,7 @@ t2	CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename t2
@@ -691,7 +692,7 @@ t2	CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename t2
@@ -712,7 +713,7 @@ t2	CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename t2
@@ -725,7 +726,7 @@ t2	CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename t2
@@ -745,7 +746,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -759,7 +760,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_copy
@@ -771,7 +772,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", rename t2
@@ -784,7 +785,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", rename t2
@@ -805,7 +806,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", rename t2
@@ -818,7 +819,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", rename t2
@@ -838,7 +839,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -850,7 +851,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -864,7 +865,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -876,7 +877,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ENGINE=myisam, COMMENT "new"
@@ -889,7 +890,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ENGINE=myisam, COMMENT "new"
@@ -902,7 +903,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ENGINE=myisam, COMMENT "new"
@@ -917,7 +918,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ENGINE=myisam, COMMENT "new"
@@ -934,7 +935,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ENGINE=myisam, COMMENT "new"
@@ -947,7 +948,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ENGINE=myisam, COMMENT "new"
@@ -963,7 +964,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -975,7 +976,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -989,7 +990,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -1001,7 +1002,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", engine=myisam
@@ -1014,7 +1015,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", engine=myisam
@@ -1027,7 +1028,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", engine=myisam
@@ -1042,7 +1043,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", engine=myisam
@@ -1059,7 +1060,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", engine=myisam
@@ -1072,7 +1073,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", engine=myisam
@@ -1088,7 +1089,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -1100,7 +1101,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -1114,7 +1115,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -1127,7 +1128,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=myisam
@@ -1141,7 +1142,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=myisam
@@ -1155,7 +1156,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=myisam
@@ -1171,7 +1172,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=myisam
@@ -1185,7 +1186,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=myisam
@@ -1199,7 +1200,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=myisam
@@ -1213,7 +1214,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=myisam
@@ -1227,7 +1228,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=myisam
@@ -1243,7 +1244,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -1255,7 +1256,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -1269,7 +1270,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -1283,7 +1284,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename test2.t2
@@ -1298,7 +1299,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename test2.t2
@@ -1313,7 +1314,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename test2.t2
@@ -1330,7 +1331,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename test2.t2
@@ -1345,7 +1346,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename test2.t2
@@ -1360,7 +1361,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename test2.t2
@@ -1375,7 +1376,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename test2.t2
@@ -1390,7 +1391,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename test2.t2
@@ -1406,7 +1407,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -1420,7 +1421,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_copy
@@ -1432,7 +1433,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename test2.t2
@@ -1445,7 +1446,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename test2.t2
@@ -1467,7 +1468,7 @@ t2	CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename test2.t2
@@ -1481,7 +1482,7 @@ t2	CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename test2.t2
@@ -1501,7 +1502,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -1513,7 +1514,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -1527,7 +1528,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -1540,7 +1541,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   KEY `b` (`b`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD key(b), COMMENT "new"
@@ -1554,7 +1555,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   KEY `b` (`b`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD key(b), COMMENT "new"
@@ -1568,7 +1569,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   KEY `b` (`b`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD key(b), COMMENT "new"
@@ -1584,7 +1585,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   KEY `b` (`b`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD key(b), COMMENT "new"
@@ -1602,7 +1603,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   KEY `b` (`b`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD key(b), COMMENT "new"
@@ -1616,7 +1617,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   KEY `b` (`b`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD key(b), COMMENT "new"
@@ -1632,7 +1633,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -1644,7 +1645,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -1658,7 +1659,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -1669,7 +1670,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 DROP INDEX a
@@ -1681,7 +1682,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 DROP INDEX a
@@ -1693,7 +1694,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 DROP INDEX a
@@ -1707,7 +1708,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 DROP INDEX a
@@ -1723,7 +1724,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 DROP INDEX a
@@ -1735,7 +1736,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 DROP INDEX a
@@ -1751,7 +1752,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -1763,7 +1764,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -1777,7 +1778,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -1793,7 +1794,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v)
@@ -1810,7 +1811,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v)
@@ -1827,7 +1828,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v)
@@ -1846,7 +1847,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v)
@@ -1867,7 +1868,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v)
@@ -1884,7 +1885,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v)
@@ -1900,7 +1901,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -1912,7 +1913,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -1926,7 +1927,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -1942,7 +1943,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2
@@ -1959,7 +1960,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2
@@ -1976,7 +1977,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2
@@ -1995,7 +1996,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2
@@ -2012,7 +2013,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2
@@ -2029,7 +2030,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2
@@ -2046,7 +2047,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2
@@ -2063,7 +2064,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2
@@ -2079,7 +2080,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -2091,7 +2092,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -2105,7 +2106,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -2121,7 +2122,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), ENGINE=myisam
@@ -2138,7 +2139,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), ENGINE=myisam
@@ -2155,7 +2156,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), ENGINE=myisam
@@ -2174,7 +2175,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), ENGINE=myisam
@@ -2195,7 +2196,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), ENGINE=myisam
@@ -2212,7 +2213,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), ENGINE=myisam
@@ -2228,7 +2229,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -2240,7 +2241,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -2254,7 +2255,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -2270,7 +2271,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2, ENGINE=myisam
@@ -2287,7 +2288,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2, ENGINE=myisam
@@ -2304,7 +2305,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2, ENGINE=myisam
@@ -2323,7 +2324,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2, ENGINE=myisam
@@ -2340,7 +2341,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2, ENGINE=myisam
@@ -2357,7 +2358,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2, ENGINE=myisam
@@ -2374,7 +2375,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2, ENGINE=myisam
@@ -2391,7 +2392,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME t2, ENGINE=myisam
@@ -2407,7 +2408,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -2419,7 +2420,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -2433,7 +2434,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -2450,7 +2451,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME test2.t2
@@ -2468,7 +2469,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME test2.t2
@@ -2486,7 +2487,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME test2.t2
@@ -2506,7 +2507,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME test2.t2
@@ -2524,7 +2525,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME test2.t2
@@ -2542,7 +2543,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME test2.t2
@@ -2560,7 +2561,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME test2.t2
@@ -2578,7 +2579,8 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN v VECTOR(5) NOT NULL, ADD VECTOR INDEX(v), RENAME test2.t2
+ALTER DATABASE test CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci;
diff --git a/mysql-test/suite/atomic/alter_table_rocksdb.result b/mysql-test/suite/atomic/alter_table_rocksdb.result
index 741372ab3f0..bbaa6ca6d2f 100644
--- a/mysql-test/suite/atomic/alter_table_rocksdb.result
+++ b/mysql-test/suite/atomic/alter_table_rocksdb.result
@@ -1,4 +1,5 @@
 set global rocksdb_flush_log_at_trx_commit=1;
+ALTER DATABASE test CHARACTER SET latin1 COLLATE latin1_swedish_ci;
 create database test2;
 RESET MASTER;
 
@@ -14,7 +15,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -24,7 +25,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -36,7 +37,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -47,7 +48,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new"
@@ -59,7 +60,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new"
@@ -71,7 +72,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new"
@@ -85,7 +86,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new"
@@ -101,7 +102,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new"
@@ -113,7 +114,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new"
@@ -127,7 +128,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -137,7 +138,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -149,7 +150,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -159,7 +160,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new"
@@ -170,7 +171,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new"
@@ -181,7 +182,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new"
@@ -194,7 +195,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new"
@@ -209,7 +210,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new"
@@ -220,7 +221,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new"
@@ -234,7 +235,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -244,7 +245,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -256,7 +257,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -266,7 +267,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new"
@@ -277,7 +278,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new"
@@ -288,7 +289,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new"
@@ -301,7 +302,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new"
@@ -316,7 +317,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new"
@@ -327,7 +328,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new"
@@ -341,7 +342,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -351,7 +352,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -363,7 +364,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -374,7 +375,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2
@@ -386,7 +387,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2
@@ -398,7 +399,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2
@@ -412,7 +413,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2
@@ -424,7 +425,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2
@@ -436,7 +437,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2
@@ -448,7 +449,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2
@@ -460,7 +461,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2
@@ -529,7 +530,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -539,7 +540,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -551,7 +552,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -562,7 +563,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, ALGORITHM=copy, COMMENT "new"
@@ -574,7 +575,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, ALGORITHM=copy, COMMENT "new"
@@ -586,7 +587,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, ALGORITHM=copy, COMMENT "new"
@@ -600,7 +601,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, ALGORITHM=copy, COMMENT "new"
@@ -616,7 +617,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, ALGORITHM=copy, COMMENT "new"
@@ -628,7 +629,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, ALGORITHM=copy, COMMENT "new"
@@ -660,7 +661,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_rename_triggers
@@ -670,7 +671,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_delete_backup
@@ -687,7 +688,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -697,7 +698,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -709,7 +710,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -719,7 +720,7 @@ t2	CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename t2
@@ -730,7 +731,7 @@ t2	CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename t2
@@ -741,7 +742,7 @@ t2	CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename t2
@@ -754,7 +755,7 @@ t2	CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename t2
@@ -765,7 +766,7 @@ t2	CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename t2
@@ -776,7 +777,7 @@ t2	CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename t2
@@ -787,7 +788,7 @@ t2	CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename t2
@@ -798,7 +799,7 @@ t2	CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename t2
@@ -812,7 +813,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -822,7 +823,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -834,7 +835,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -844,7 +845,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", rename t2
@@ -855,7 +856,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", rename t2
@@ -866,7 +867,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", rename t2
@@ -879,7 +880,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", rename t2
@@ -890,7 +891,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", rename t2
@@ -901,7 +902,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", rename t2
@@ -912,7 +913,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", rename t2
@@ -923,7 +924,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", rename t2
@@ -937,7 +938,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -947,7 +948,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -959,7 +960,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -971,7 +972,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ENGINE=aria, COMMENT "new"
@@ -984,7 +985,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ENGINE=aria, COMMENT "new"
@@ -997,7 +998,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ENGINE=aria, COMMENT "new"
@@ -1012,7 +1013,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ENGINE=aria, COMMENT "new"
@@ -1029,7 +1030,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ENGINE=aria, COMMENT "new"
@@ -1042,7 +1043,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ENGINE=aria, COMMENT "new"
@@ -1056,7 +1057,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -1066,7 +1067,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -1078,7 +1079,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -1090,7 +1091,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", engine=aria
@@ -1103,7 +1104,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", engine=aria
@@ -1116,7 +1117,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", engine=aria
@@ -1131,7 +1132,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", engine=aria
@@ -1148,7 +1149,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", engine=aria
@@ -1161,7 +1162,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL COMMENT 'new',
   `b` int(11) DEFAULT NULL,
   KEY `a` (`c`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", engine=aria
@@ -1175,7 +1176,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -1185,7 +1186,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -1197,7 +1198,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -1210,7 +1211,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=aria
@@ -1224,7 +1225,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=aria
@@ -1238,7 +1239,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=aria
@@ -1254,7 +1255,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=aria
@@ -1268,7 +1269,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=aria
@@ -1282,7 +1283,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=aria
@@ -1296,7 +1297,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=aria
@@ -1310,7 +1311,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=aria
@@ -1324,7 +1325,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -1334,7 +1335,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -1346,7 +1347,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -1358,7 +1359,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename test2.t2
@@ -1371,7 +1372,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename test2.t2
@@ -1384,7 +1385,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename test2.t2
@@ -1399,7 +1400,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename test2.t2
@@ -1412,7 +1413,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename test2.t2
@@ -1425,7 +1426,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename test2.t2
@@ -1438,7 +1439,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename test2.t2
@@ -1451,7 +1452,7 @@ t2	CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename test2.t2
@@ -1465,7 +1466,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -1475,7 +1476,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -1487,7 +1488,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -1498,7 +1499,7 @@ t2	CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename test2.t2
@@ -1510,7 +1511,7 @@ t2	CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename test2.t2
@@ -1522,7 +1523,7 @@ t2	CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename test2.t2
@@ -1536,7 +1537,7 @@ t2	CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename test2.t2
@@ -1548,7 +1549,7 @@ t2	CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename test2.t2
@@ -1560,7 +1561,7 @@ t2	CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename test2.t2
@@ -1572,7 +1573,7 @@ t2	CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename test2.t2
@@ -1584,7 +1585,7 @@ t2	CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename test2.t2
@@ -1598,7 +1599,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -1608,7 +1609,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -1620,7 +1621,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -1631,7 +1632,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   KEY `b` (`b`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD key(b), COMMENT "new"
@@ -1643,7 +1644,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   KEY `b` (`b`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD key(b), COMMENT "new"
@@ -1655,7 +1656,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   KEY `b` (`b`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD key(b), COMMENT "new"
@@ -1669,7 +1670,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   KEY `b` (`b`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD key(b), COMMENT "new"
@@ -1685,7 +1686,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   KEY `b` (`b`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD key(b), COMMENT "new"
@@ -1697,7 +1698,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   KEY `b` (`b`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD key(b), COMMENT "new"
@@ -1711,7 +1712,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -1723,7 +1724,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_copy
@@ -1733,7 +1734,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -1742,7 +1743,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
-) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 DROP INDEX a
@@ -1762,3 +1763,4 @@ crash point: ddl_log_alter_after_delete_backup
 "No crash!"
 crash point: ddl_log_alter_after_drop_original_table
 "No crash!"
+ALTER DATABASE test CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci;
diff --git a/mysql-test/suite/atomic/vector.result b/mysql-test/suite/atomic/vector.result
index 9915bfac0b7..5f80aae9b5d 100644
--- a/mysql-test/suite/atomic/vector.result
+++ b/mysql-test/suite/atomic/vector.result
@@ -1,3 +1,4 @@
+ALTER DATABASE test CHARACTER SET latin1 COLLATE latin1_swedish_ci;
 create database test2;
 RESET MASTER;
 
@@ -19,7 +20,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -35,7 +36,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -53,7 +54,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -70,7 +71,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new"
@@ -88,7 +89,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new"
@@ -106,7 +107,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new"
@@ -126,7 +127,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new"
@@ -148,7 +149,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new"
@@ -166,7 +167,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new"
@@ -186,7 +187,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -204,7 +205,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_copy
@@ -220,7 +221,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new"
@@ -237,7 +238,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new"
@@ -273,7 +274,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -291,7 +292,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_copy
@@ -307,7 +308,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`c`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new"
@@ -324,7 +325,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`c`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new"
@@ -360,7 +361,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -376,7 +377,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -394,7 +395,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -411,7 +412,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2
@@ -429,7 +430,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2
@@ -447,7 +448,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2
@@ -467,7 +468,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2
@@ -485,7 +486,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2
@@ -503,7 +504,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2
@@ -521,7 +522,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2
@@ -539,7 +540,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2
@@ -588,7 +589,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -604,7 +605,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -622,7 +623,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -639,7 +640,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, ALGORITHM=copy, COMMENT "new"
@@ -657,7 +658,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, ALGORITHM=copy, COMMENT "new"
@@ -675,7 +676,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, ALGORITHM=copy, COMMENT "new"
@@ -695,7 +696,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, ALGORITHM=copy, COMMENT "new"
@@ -717,7 +718,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, ALGORITHM=copy, COMMENT "new"
@@ -735,7 +736,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, ALGORITHM=copy, COMMENT "new"
@@ -773,7 +774,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_rename_triggers
@@ -789,7 +790,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_delete_backup
@@ -812,7 +813,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -830,7 +831,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_copy
@@ -846,7 +847,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename t2
@@ -863,7 +864,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename t2
@@ -888,7 +889,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename t2
@@ -905,7 +906,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename t2
@@ -929,7 +930,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -947,7 +948,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_copy
@@ -963,7 +964,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`c`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", rename t2
@@ -980,7 +981,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`c`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", rename t2
@@ -1005,7 +1006,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`c`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", rename t2
@@ -1022,7 +1023,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`c`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", rename t2
@@ -1046,7 +1047,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -1062,7 +1063,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -1080,7 +1081,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -1096,7 +1097,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ENGINE=aria, COMMENT "new"
@@ -1113,7 +1114,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ENGINE=aria, COMMENT "new"
@@ -1130,7 +1131,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ENGINE=aria, COMMENT "new"
@@ -1149,7 +1150,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ENGINE=aria, COMMENT "new"
@@ -1170,7 +1171,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ENGINE=aria, COMMENT "new"
@@ -1187,7 +1188,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ENGINE=aria, COMMENT "new"
@@ -1207,7 +1208,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -1223,7 +1224,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -1241,7 +1242,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -1257,7 +1258,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`c`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", engine=aria
@@ -1274,7 +1275,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`c`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", engine=aria
@@ -1291,7 +1292,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`c`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", engine=aria
@@ -1310,7 +1311,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`c`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", engine=aria
@@ -1331,7 +1332,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`c`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", engine=aria
@@ -1348,7 +1349,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`c`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", engine=aria
@@ -1368,7 +1369,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -1384,7 +1385,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -1402,7 +1403,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -1419,7 +1420,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=aria
@@ -1437,7 +1438,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=aria
@@ -1455,7 +1456,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=aria
@@ -1475,7 +1476,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=aria
@@ -1493,7 +1494,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=aria
@@ -1511,7 +1512,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=aria
@@ -1529,7 +1530,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=aria
@@ -1547,7 +1548,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=aria
@@ -1567,7 +1568,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -1583,7 +1584,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -1601,7 +1602,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -1619,7 +1620,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename test2.t2
@@ -1638,7 +1639,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename test2.t2
@@ -1657,7 +1658,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename test2.t2
@@ -1678,7 +1679,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename test2.t2
@@ -1697,7 +1698,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename test2.t2
@@ -1716,7 +1717,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename test2.t2
@@ -1735,7 +1736,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename test2.t2
@@ -1754,7 +1755,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename test2.t2
@@ -1774,7 +1775,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -1792,7 +1793,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_copy
@@ -1808,7 +1809,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename test2.t2
@@ -1825,7 +1826,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename test2.t2
@@ -1851,7 +1852,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename test2.t2
@@ -1869,7 +1870,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename test2.t2
@@ -1893,7 +1894,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -1909,7 +1910,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -1927,7 +1928,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -1944,7 +1945,7 @@ t1	CREATE TABLE `t1` (
   KEY `a` (`a`),
   KEY `b` (`b`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD key(b), COMMENT "new"
@@ -1962,7 +1963,7 @@ t1	CREATE TABLE `t1` (
   KEY `a` (`a`),
   KEY `b` (`b`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD key(b), COMMENT "new"
@@ -1980,7 +1981,7 @@ t1	CREATE TABLE `t1` (
   KEY `a` (`a`),
   KEY `b` (`b`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD key(b), COMMENT "new"
@@ -2000,7 +2001,7 @@ t1	CREATE TABLE `t1` (
   KEY `a` (`a`),
   KEY `b` (`b`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD key(b), COMMENT "new"
@@ -2022,7 +2023,7 @@ t1	CREATE TABLE `t1` (
   KEY `a` (`a`),
   KEY `b` (`b`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD key(b), COMMENT "new"
@@ -2040,7 +2041,7 @@ t1	CREATE TABLE `t1` (
   KEY `a` (`a`),
   KEY `b` (`b`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD key(b), COMMENT "new"
@@ -2060,7 +2061,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -2076,7 +2077,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -2094,7 +2095,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -2109,7 +2110,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 DROP INDEX a
@@ -2125,7 +2126,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 DROP INDEX a
@@ -2141,7 +2142,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 DROP INDEX a
@@ -2159,7 +2160,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 DROP INDEX a
@@ -2179,7 +2180,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 DROP INDEX a
@@ -2195,7 +2196,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   VECTOR KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 DROP INDEX a
@@ -2216,7 +2217,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -2232,7 +2233,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_copy
@@ -2246,7 +2247,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -2261,7 +2262,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new"
@@ -2295,7 +2296,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -2311,7 +2312,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_copy
@@ -2325,7 +2326,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -2339,7 +2340,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new"
@@ -2373,7 +2374,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -2389,7 +2390,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_copy
@@ -2403,7 +2404,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -2417,7 +2418,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`c`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new"
@@ -2451,7 +2452,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -2467,7 +2468,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_copy
@@ -2481,7 +2482,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -2496,7 +2497,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2
@@ -2520,7 +2521,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2
@@ -2536,7 +2537,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2
@@ -2613,7 +2614,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -2627,7 +2628,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -2643,7 +2644,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -2658,7 +2659,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, ALGORITHM=copy, COMMENT "new"
@@ -2674,7 +2675,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, ALGORITHM=copy, COMMENT "new"
@@ -2690,7 +2691,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, ALGORITHM=copy, COMMENT "new"
@@ -2708,7 +2709,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, ALGORITHM=copy, COMMENT "new"
@@ -2728,7 +2729,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, ALGORITHM=copy, COMMENT "new"
@@ -2744,7 +2745,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, ALGORITHM=copy, COMMENT "new"
@@ -2780,7 +2781,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_rename_triggers
@@ -2794,7 +2795,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_delete_backup
@@ -2815,7 +2816,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -2831,7 +2832,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_copy
@@ -2845,7 +2846,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -2859,7 +2860,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename t2
@@ -2882,7 +2883,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename t2
@@ -2897,7 +2898,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename t2
@@ -2919,7 +2920,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -2935,7 +2936,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_copy
@@ -2949,7 +2950,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -2963,7 +2964,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`c`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", rename t2
@@ -2986,7 +2987,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`c`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", rename t2
@@ -3001,7 +3002,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`c`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", rename t2
@@ -3023,7 +3024,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -3037,7 +3038,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -3053,7 +3054,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -3069,7 +3070,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ENGINE=aria, COMMENT "new"
@@ -3086,7 +3087,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ENGINE=aria, COMMENT "new"
@@ -3103,7 +3104,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ENGINE=aria, COMMENT "new"
@@ -3122,7 +3123,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ENGINE=aria, COMMENT "new"
@@ -3143,7 +3144,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ENGINE=aria, COMMENT "new"
@@ -3160,7 +3161,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ENGINE=aria, COMMENT "new"
@@ -3178,7 +3179,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -3192,7 +3193,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -3208,7 +3209,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -3224,7 +3225,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`c`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", engine=aria
@@ -3241,7 +3242,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`c`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", engine=aria
@@ -3258,7 +3259,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`c`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", engine=aria
@@ -3277,7 +3278,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`c`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", engine=aria
@@ -3298,7 +3299,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`c`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", engine=aria
@@ -3315,7 +3316,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`c`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 change column a c int COMMENT "new", engine=aria
@@ -3333,7 +3334,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -3347,7 +3348,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -3363,7 +3364,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -3380,7 +3381,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=aria
@@ -3398,7 +3399,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=aria
@@ -3416,7 +3417,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=aria
@@ -3436,7 +3437,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=aria
@@ -3454,7 +3455,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=aria
@@ -3472,7 +3473,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=aria
@@ -3490,7 +3491,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=aria
@@ -3508,7 +3509,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=Aria DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci PAGE_CHECKSUM=1 COMMENT='new'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename t2, engine=aria
@@ -3526,7 +3527,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -3542,7 +3543,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_copy
@@ -3556,7 +3557,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -3571,7 +3572,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename test2.t2
@@ -3596,7 +3597,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename test2.t2
@@ -3613,7 +3614,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN c INT, COMMENT "new", rename test2.t2
@@ -3635,7 +3636,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -3651,7 +3652,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_copy
@@ -3665,7 +3666,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -3679,7 +3680,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename test2.t2
@@ -3703,7 +3704,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename test2.t2
@@ -3719,7 +3720,7 @@ t2	CREATE TABLE `t2` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 COMMENT "new", rename test2.t2
@@ -3741,7 +3742,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -3755,7 +3756,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -3771,7 +3772,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -3786,7 +3787,7 @@ t1	CREATE TABLE `t1` (
   KEY `a` (`a`),
   KEY `b` (`b`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD key(b), COMMENT "new"
@@ -3802,7 +3803,7 @@ t1	CREATE TABLE `t1` (
   KEY `a` (`a`),
   KEY `b` (`b`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD key(b), COMMENT "new"
@@ -3818,7 +3819,7 @@ t1	CREATE TABLE `t1` (
   KEY `a` (`a`),
   KEY `b` (`b`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD key(b), COMMENT "new"
@@ -3836,7 +3837,7 @@ t1	CREATE TABLE `t1` (
   KEY `a` (`a`),
   KEY `b` (`b`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD key(b), COMMENT "new"
@@ -3856,7 +3857,7 @@ t1	CREATE TABLE `t1` (
   KEY `a` (`a`),
   KEY `b` (`b`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD key(b), COMMENT "new"
@@ -3872,7 +3873,7 @@ t1	CREATE TABLE `t1` (
   KEY `a` (`a`),
   KEY `b` (`b`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='new'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='new'
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD key(b), COMMENT "new"
@@ -3890,7 +3891,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_create_table
@@ -3904,7 +3905,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_prepare_inplace
@@ -3920,7 +3921,7 @@ t1	CREATE TABLE `t1` (
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   KEY `a` (`a`),
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 crash point: ddl_log_alter_after_log
@@ -3933,7 +3934,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 DROP INDEX a
@@ -3947,7 +3948,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 DROP INDEX a
@@ -3961,7 +3962,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 DROP INDEX a
@@ -3977,7 +3978,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 DROP INDEX a
@@ -3995,7 +3996,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 DROP INDEX a
@@ -4009,7 +4010,8 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `v` vector(5) NOT NULL DEFAULT x'e360d63ebe554f3fcdbc523f4522193f5236083d',
   VECTOR KEY `v` (`v`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 count(*)
 2
 master-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 DROP INDEX a
+ALTER DATABASE test CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci;
diff --git a/mysql-test/suite/binlog_encryption/rpl_parallel_innodb_lock_conflict.result b/mysql-test/suite/binlog_encryption/rpl_parallel_innodb_lock_conflict.result
index 1411db16af6..a3d87641622 100644
--- a/mysql-test/suite/binlog_encryption/rpl_parallel_innodb_lock_conflict.result
+++ b/mysql-test/suite/binlog_encryption/rpl_parallel_innodb_lock_conflict.result
@@ -1,16 +1,15 @@
 ***MDEV-5914: Parallel replication deadlock due to InnoDB lock conflicts ***
 include/master-slave.inc
 [connection master]
-connection server_2;
-SET sql_log_bin=0;
+ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB;
+CALL mtr.add_suppression("InnoDB: Transaction was aborted due to ");
 CALL mtr.add_suppression("Commit failed due to failure of an earlier commit on which this one depends");
-SET sql_log_bin=1;
+connection server_2;
 SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads;
 include/stop_slave.inc
 SET GLOBAL slave_parallel_threads=10;
 CHANGE MASTER TO master_use_gtid=slave_pos;
 connection server_1;
-ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB;
 CREATE TABLE t4 (a INT PRIMARY KEY, b INT, KEY b_idx(b)) ENGINE=InnoDB;
 INSERT INTO t4 VALUES (1,NULL), (2,2), (3,NULL), (4,4), (5, NULL), (6, 6);
 connect  con1,127.0.0.1,root,,test,$SERVER_MYPORT_1,;
diff --git a/mysql-test/suite/compat/oracle/r/sp-cursor.result b/mysql-test/suite/compat/oracle/r/sp-cursor.result
index aa9c5de8bc9..285934a3e30 100644
--- a/mysql-test/suite/compat/oracle/r/sp-cursor.result
+++ b/mysql-test/suite/compat/oracle/r/sp-cursor.result
@@ -1020,3 +1020,77 @@ ERROR 42000: This version of MariaDB doesn't yet support 'OUT/INOUT cursor param
 #
 # End of 10.8 tests
 #
+# Start of 11.4 tests
+#
+# MDEV-36047 Package body variables are not allowed as FETCH targets
+#
+CREATE PACKAGE pkg AS
+FUNCTION f1 RETURN INT;
+END;
+$$
+CREATE PACKAGE BODY pkg AS
+vc INT := 0;
+FUNCTION f1 RETURN INT AS
+CURSOR cur IS SELECT 1 AS c FROM DUAL;
+BEGIN
+OPEN cur;
+FETCH cur INTO vc; -- SHOW CODE should display vc with a "PACKAGE_BODY" prefix
+CLOSE cur;
+RETURN vc;
+END;
+BEGIN
+DECLARE
+CURSOR cur IS SELECT 1 AS c FROM DUAL;
+BEGIN
+OPEN cur;
+FETCH cur INTO vc; -- SHOW CODE should display vc without a prefix
+CLOSE cur;
+END;
+END;
+$$
+SELECT pkg.f1() FROM DUAL;
+pkg.f1()
+1
+DROP PACKAGE pkg;
+CREATE PACKAGE pkg AS
+FUNCTION f1 RETURN TEXT;
+END;
+$$
+CREATE PACKAGE BODY pkg AS
+vc1 INT := 0;
+FUNCTION f1 RETURN TEXT AS
+CURSOR cur IS SELECT 1 AS c1, 2 AS c2 FROM DUAL;
+vc2 INT := 0;
+BEGIN
+OPEN cur;
+FETCH cur INTO vc1, vc2;
+CLOSE cur;
+RETURN vc1 || ' ' || vc2;
+END;
+END;
+$$
+SELECT pkg.f1() FROM DUAL;
+pkg.f1()
+1 2
+DROP PACKAGE pkg;
+CREATE PACKAGE pkg AS
+FUNCTION f1 RETURN TEXT;
+END;
+$$
+CREATE PACKAGE BODY pkg AS
+vc ROW(p1 INT, p2 INT);
+FUNCTION f1 RETURN TEXT AS
+CURSOR cur IS SELECT 1 AS c1, 2 AS c2 FROM DUAL;
+BEGIN
+OPEN cur;
+FETCH cur INTO vc;
+CLOSE cur;
+RETURN vc.p1 || ' ' || vc.p2;
+END;
+END;
+$$
+SELECT pkg.f1() FROM DUAL;
+pkg.f1()
+1 2
+DROP PACKAGE pkg;
+# End of 11.4 tests
diff --git a/mysql-test/suite/compat/oracle/r/sp-package-code.result b/mysql-test/suite/compat/oracle/r/sp-package-code.result
index 0dea72dba89..52b41a3c64e 100644
--- a/mysql-test/suite/compat/oracle/r/sp-package-code.result
+++ b/mysql-test/suite/compat/oracle/r/sp-package-code.result
@@ -243,3 +243,107 @@ Pos	Instruction
 7	jump 11
 DROP PACKAGE pkg1;
 DROP TABLE t1;
+# Start of 11.4 tests
+#
+# MDEV-36047 Package body variables are not allowed as FETCH targets
+#
+CREATE PACKAGE pkg AS
+FUNCTION f1 RETURN INT;
+END;
+$$
+CREATE PACKAGE BODY pkg AS
+vc INT := 0;
+FUNCTION f1 RETURN INT AS
+CURSOR cur IS SELECT 1 AS c FROM DUAL;
+BEGIN
+OPEN cur;
+FETCH cur INTO vc; -- SHOW CODE should display vc with a "PACKAGE_BODY" prefix
+CLOSE cur;
+RETURN vc;
+END;
+BEGIN
+DECLARE
+CURSOR cur IS SELECT 1 AS c FROM DUAL;
+BEGIN
+OPEN cur;
+FETCH cur INTO vc; -- SHOW CODE should display vc without a prefix
+CLOSE cur;
+END;
+END;
+$$
+SELECT pkg.f1() FROM DUAL;
+pkg.f1()
+1
+SHOW FUNCTION CODE pkg.f1;
+Pos	Instruction
+0	cpush cur@0
+1	copen cur@0
+2	cfetch cur@0 PACKAGE_BODY.vc@0
+3	cclose cur@0
+4	freturn int PACKAGE_BODY.vc@0
+SHOW PACKAGE BODY CODE pkg;
+Pos	Instruction
+0	set vc@0 0
+1	cpush cur@0
+2	copen cur@0
+3	cfetch cur@0 vc@0
+4	cclose cur@0
+5	cpop 1
+DROP PACKAGE pkg;
+CREATE PACKAGE pkg AS
+FUNCTION f1 RETURN TEXT;
+END;
+$$
+CREATE PACKAGE BODY pkg AS
+vc1 INT := 0;
+FUNCTION f1 RETURN TEXT AS
+CURSOR cur IS SELECT 1 AS c1, 2 AS c2 FROM DUAL;
+vc2 INT := 0;
+BEGIN
+OPEN cur;
+FETCH cur INTO vc1, vc2;
+CLOSE cur;
+RETURN vc1 || ' ' || vc2;
+END;
+END;
+$$
+SELECT pkg.f1() FROM DUAL;
+pkg.f1()
+1 2
+SHOW FUNCTION CODE pkg.f1;
+Pos	Instruction
+0	set vc2@0 0
+1	cpush cur@0
+2	copen cur@0
+3	cfetch cur@0 PACKAGE_BODY.vc1@0 vc2@0
+4	cclose cur@0
+5	freturn blob concat(concat(PACKAGE_BODY.vc1@0,' '),vc2@0)
+DROP PACKAGE pkg;
+CREATE PACKAGE pkg AS
+FUNCTION f1 RETURN TEXT;
+END;
+$$
+CREATE PACKAGE BODY pkg AS
+vc ROW(p1 INT, p2 INT);
+FUNCTION f1 RETURN TEXT AS
+CURSOR cur IS SELECT 1 AS c1, 2 AS c2 FROM DUAL;
+BEGIN
+OPEN cur;
+FETCH cur INTO vc;
+CLOSE cur;
+RETURN vc.p1 || ' ' || vc.p2;
+END;
+END;
+$$
+SELECT pkg.f1() FROM DUAL;
+pkg.f1()
+1 2
+SHOW FUNCTION CODE pkg.f1;
+Pos	Instruction
+0	cpush cur@0
+1	copen cur@0
+2	cfetch cur@0 PACKAGE_BODY.vc@0
+3	cclose cur@0
+4	freturn blob concat(concat(PACKAGE_BODY.vc.p1@0[0],' '),PACKAGE_BODY.vc.p2@0[1])
+DROP PACKAGE pkg;
+# End of 11.4 tests
diff --git a/mysql-test/suite/compat/oracle/t/sp-cursor-pkg-01.inc b/mysql-test/suite/compat/oracle/t/sp-cursor-pkg-01.inc
new file mode 100644
index 00000000000..6e5aac0b254
--- /dev/null
+++ b/mysql-test/suite/compat/oracle/t/sp-cursor-pkg-01.inc
@@ -0,0 +1,26 @@
+DELIMITER $$;
+CREATE PACKAGE pkg AS
+  FUNCTION f1 RETURN INT;
+END;
+$$
+CREATE PACKAGE BODY pkg AS
+  vc INT := 0;
+  FUNCTION f1 RETURN INT AS
+    CURSOR cur IS SELECT 1 AS c FROM DUAL;
+  BEGIN
+    OPEN cur;
+    FETCH cur INTO vc; -- SHOW CODE should display vc with a "PACKAGE_BODY" prefix
+    CLOSE cur;
+    RETURN vc;
+  END;
+BEGIN
+  DECLARE
+    CURSOR cur IS SELECT 1 AS c FROM DUAL;
+  BEGIN
+    OPEN cur;
+    FETCH cur INTO vc; -- SHOW CODE should display vc without a prefix
+    CLOSE cur;
+  END;
+END;
+$$
+DELIMITER ;$$
diff --git a/mysql-test/suite/compat/oracle/t/sp-cursor-pkg-02.inc b/mysql-test/suite/compat/oracle/t/sp-cursor-pkg-02.inc
new file mode 100644
index 00000000000..7a1eacee037
--- /dev/null
+++ b/mysql-test/suite/compat/oracle/t/sp-cursor-pkg-02.inc
@@ -0,0 +1,20 @@
+# Mixing a package body variable and a local variable in the same FETCH.
+DELIMITER $$;
+CREATE PACKAGE pkg AS
+  FUNCTION f1 RETURN TEXT;
+END;
+$$
+CREATE PACKAGE BODY pkg AS
+  vc1 INT := 0;
+  FUNCTION f1 RETURN TEXT AS
+    CURSOR cur IS SELECT 1 AS c1, 2 AS c2 FROM DUAL;
+    vc2 INT := 0;
+  BEGIN
+    OPEN cur;
+    FETCH cur INTO vc1, vc2;
+    CLOSE cur;
+    RETURN vc1 || ' ' || vc2;
+  END;
+END;
+$$
+DELIMITER ;$$
diff --git a/mysql-test/suite/compat/oracle/t/sp-cursor-pkg-03.inc b/mysql-test/suite/compat/oracle/t/sp-cursor-pkg-03.inc
new file mode 100644
index 00000000000..e1c9fd6e8c5
--- /dev/null
+++ b/mysql-test/suite/compat/oracle/t/sp-cursor-pkg-03.inc
@@ -0,0 +1,19 @@
+# Fetching into a PACKAGE BODY variable of the ROW type
+DELIMITER $$;
+CREATE PACKAGE pkg AS
+  FUNCTION f1 RETURN TEXT;
+END;
+$$
+CREATE PACKAGE BODY pkg AS
+  vc ROW(p1 INT, p2 INT);
+  FUNCTION f1 RETURN TEXT AS
+    CURSOR cur IS SELECT 1 AS c1, 2 AS c2 FROM DUAL;
+  BEGIN
+    OPEN cur;
+    FETCH cur INTO vc;
+    CLOSE cur;
+    RETURN vc.p1 || ' ' || vc.p2;
+  END;
+END;
+$$
+DELIMITER ;$$
diff --git a/mysql-test/suite/compat/oracle/t/sp-cursor.test b/mysql-test/suite/compat/oracle/t/sp-cursor.test
index d7e2a5dee68..eba00d24b8e 100644
--- a/mysql-test/suite/compat/oracle/t/sp-cursor.test
+++ b/mysql-test/suite/compat/oracle/t/sp-cursor.test
@@ -1042,3 +1042,24 @@ DELIMITER ;$$
 --echo #
 --echo # End of 10.8 tests
 --echo #
+
+
+--echo # Start of 11.4 tests
+
+--echo #
+--echo # MDEV-36047 Package body variables are not allowed as FETCH targets
+--echo #
+
+--source sp-cursor-pkg-01.inc
+SELECT pkg.f1() FROM DUAL;
+DROP PACKAGE pkg;
+
+--source sp-cursor-pkg-02.inc
+SELECT pkg.f1() FROM DUAL;
+DROP PACKAGE pkg;
+
+--source sp-cursor-pkg-03.inc
+SELECT pkg.f1() FROM DUAL;
+DROP PACKAGE pkg;
+
+--echo # End of 11.4 tests
diff --git a/mysql-test/suite/compat/oracle/t/sp-package-code.test b/mysql-test/suite/compat/oracle/t/sp-package-code.test
index 9cca53964ec..1aa2f7cba8b 100644
--- a/mysql-test/suite/compat/oracle/t/sp-package-code.test
+++ b/mysql-test/suite/compat/oracle/t/sp-package-code.test
@@ -180,3 +180,28 @@ SHOW PROCEDURE CODE pkg1.p1;
 SHOW PACKAGE BODY CODE pkg1;
 DROP PACKAGE pkg1;
 DROP TABLE t1;
+
+
+--echo # Start of 11.4 tests
+
+--echo #
+--echo # MDEV-36047 Package body variables are not allowed as FETCH targets
+--echo #
+
+--source sp-cursor-pkg-01.inc
+SELECT pkg.f1() FROM DUAL;
+SHOW FUNCTION CODE pkg.f1;
+SHOW PACKAGE BODY CODE pkg;
+DROP PACKAGE pkg;
+
+--source sp-cursor-pkg-02.inc
+SELECT pkg.f1() FROM DUAL;
+SHOW FUNCTION CODE pkg.f1;
+DROP PACKAGE pkg;
+
+--source sp-cursor-pkg-03.inc
+SELECT pkg.f1() FROM DUAL;
+SHOW FUNCTION CODE pkg.f1;
+DROP PACKAGE pkg;
+
+--echo # End of 11.4 tests
diff --git a/mysql-test/suite/federated/federatedx.result b/mysql-test/suite/federated/federatedx.result
index c4b152b107e..6469f0f19c2 100644
--- a/mysql-test/suite/federated/federatedx.result
+++ b/mysql-test/suite/federated/federatedx.result
@@ -79,7 +79,7 @@ CREATE TABLE federated.t1 (
 `name` varchar(32) NOT NULL default ''
     )
 ENGINE="FEDERATED" DEFAULT CHARSET=latin1
-CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/federated/t1';
+CONNECTION='mariadb://root@127.0.0.1:SLAVE_PORT/federated/t1';
 INSERT INTO federated.t1 (id, name) VALUES (1, 'foo');
 INSERT INTO federated.t1 (id, name) VALUES (2, 'fee');
 INSERT INTO federated.t1 (id, `group`) VALUES (3, 42);
diff --git a/mysql-test/suite/federated/federatedx.test b/mysql-test/suite/federated/federatedx.test
index 579316beed8..21283998829 100644
--- a/mysql-test/suite/federated/federatedx.test
+++ b/mysql-test/suite/federated/federatedx.test
@@ -92,7 +92,7 @@ eval CREATE TABLE federated.t1 (
     `name` varchar(32) NOT NULL default ''
     )
   ENGINE="FEDERATED" DEFAULT CHARSET=latin1
-  CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
+  CONNECTION='mariadb://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
 
 INSERT INTO federated.t1 (id, name) VALUES (1, 'foo');
 INSERT INTO federated.t1 (id, name) VALUES (2, 'fee');
diff --git a/mysql-test/suite/federated/federatedx_create_handlers.result b/mysql-test/suite/federated/federatedx_create_handlers.result
index 04f591c1298..3cda08c6590 100644
--- a/mysql-test/suite/federated/federatedx_create_handlers.result
+++ b/mysql-test/suite/federated/federatedx_create_handlers.result
@@ -497,12 +497,12 @@ CREATE TABLE federated.t3 (a INT);
 INSERT INTO federated.t3 VALUES (1),(2),(3);
 CREATE TABLE federated.t4 (a INT);
 connection master;
-CREATE SERVER fedlink FOREIGN DATA WRAPPER mysql 
+CREATE SERVER fedlink FOREIGN DATA WRAPPER mariadb
 OPTIONS (USER 'root', HOST '127.0.0.1', DATABASE 'federated',
 PORT SLAVE_PORT);
 CREATE TABLE federated.t3 (a INT)
 ENGINE=FEDERATED
-CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t3'
+CONNECTION='mariadb://root@127.0.0.1:$SLAVE_MYPORT/federated/t3'
   PARTITION BY list (a)
 (PARTITION p1 VALUES IN (1) CONNECTION='fedlink/t3',
 PARTITION p2 VALUES IN (2) CONNECTION='fedlink/t4');
diff --git a/mysql-test/suite/federated/federatedx_create_handlers.test b/mysql-test/suite/federated/federatedx_create_handlers.test
index 3b060d25c33..4cfc2fb17bc 100644
--- a/mysql-test/suite/federated/federatedx_create_handlers.test
+++ b/mysql-test/suite/federated/federatedx_create_handlers.test
@@ -310,13 +310,13 @@ CREATE TABLE federated.t4 (a INT);
 
 connection master;
 --replace_result $SLAVE_MYPORT SLAVE_PORT
-eval CREATE SERVER fedlink FOREIGN DATA WRAPPER mysql 
+eval CREATE SERVER fedlink FOREIGN DATA WRAPPER mariadb
   OPTIONS (USER 'root', HOST '127.0.0.1', DATABASE 'federated',
   PORT $SLAVE_MYPORT);
 
 CREATE TABLE federated.t3 (a INT)
   ENGINE=FEDERATED
-  CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t3'
+  CONNECTION='mariadb://root@127.0.0.1:$SLAVE_MYPORT/federated/t3'
   PARTITION BY list (a)
   (PARTITION p1 VALUES IN (1) CONNECTION='fedlink/t3',
    PARTITION p2 VALUES IN (2) CONNECTION='fedlink/t4');
diff --git a/mysql-test/suite/galera/include/wait_condition_with_debug_and_kill.inc b/mysql-test/suite/galera/include/wait_condition_with_debug_and_kill.inc
new file mode 100644
index 00000000000..184f75eb57c
--- /dev/null
+++ b/mysql-test/suite/galera/include/wait_condition_with_debug_and_kill.inc
@@ -0,0 +1,35 @@
+# include/wait_condition_with_debug_and_kill.inc
+#
+# SUMMARY
+#
+#    Waits until the passed statement returns true, or the operation
+#    times out.  If the operation times out, the additional error
+#    statement will be executed and server is killed.
+#
+# USAGE
+#
+#    let $wait_condition=
+#      SELECT c = 3 FROM t;
+#    let $wait_condition_on_error_output= select count(*) from t;
+#    [let $explicit_default_wait_timeout= N] # to override the default reset
+#    --source include/wait_condition_with_debug_and_kill.inc
+#
+#   OR
+#
+#    let $wait_timeout= 60; # Override default 30 seconds with 60.
+#    let $wait_condition=
+#      SELECT c = 3 FROM t;
+#    let $wait_condition_on_error_output= select count(*) from t;
+#    --source include/wait_condition_with_debug_and_kill.inc
+#    --echo Executed the test condition $wait_condition_reps times
+#
+#
+# EXAMPLE
+#    events_bugs.test, events_time_zone.test
+#
+
+--source include/wait_condition_with_debug.inc
+if (!$success)
+{
+  --source include/kill_galera.inc
+}
diff --git a/mysql-test/suite/galera/r/MDEV-35748.result b/mysql-test/suite/galera/r/MDEV-35748.result
new file mode 100644
index 00000000000..fca2ab3ad40
--- /dev/null
+++ b/mysql-test/suite/galera/r/MDEV-35748.result
@@ -0,0 +1,31 @@
+connection node_2;
+connection node_1;
+connection node_1;
+INSTALL PLUGIN IF NOT EXISTS connect SONAME 'ha_connect';
+CREATE TABLE t1 (f INT) ENGINE=CONNECT;
+Warnings:
+Warning	1105	No table_type. Will be set to DOS
+Warning	1105	No file name. Table will use t1.dos
+CREATE TABLE t2 (f INT) ENGINE=ROCKSDB;
+CREATE TABLE t3 (f INT) ENGINE=SEQUENCE;
+ERROR 42000: This version of MariaDB doesn't yet support 'non-InnoDB sequences in Galera cluster'
+show warnings;
+Level	Code	Message
+Error	1235	This version of MariaDB doesn't yet support 'non-InnoDB sequences in Galera cluster'
+Note	1235	ENGINE=SEQUENCE not supported by Galera
+connection node_2;
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `f` int(11) DEFAULT NULL
+) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+show create table t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `f` int(11) DEFAULT NULL
+) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+show create table t3;
+ERROR 42S02: Table 'test.t3' doesn't exist
+connection node_1;
+DROP TABLE t1, t2;
+UNINSTALL PLUGIN IF EXISTS connect;
diff --git a/mysql-test/suite/galera/r/MDEV-35946.result b/mysql-test/suite/galera/r/MDEV-35946.result
new file mode 100644
index 00000000000..1ebc88c1a48
--- /dev/null
+++ b/mysql-test/suite/galera/r/MDEV-35946.result
@@ -0,0 +1,16 @@
+connection node_2;
+connection node_1;
+connection node_1;
+connection node_2;
+SET GLOBAL wsrep_provider_options = 'gmcast.isolate=1';
+SET SESSION wsrep_sync_wait=0;
+SET SESSION wsrep_sync_wait=DEFAULT;
+DELETE FROM mysql.wsrep_streaming_log;
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
+SET SESSION wsrep_sync_wait=0;
+SET GLOBAL wsrep_provider_options = 'gmcast.isolate=0';
+SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status';
+VARIABLE_VALUE
+Primary
+SET SESSION wsrep_sync_wait=DEFAULT;
+CALL mtr.add_suppression("WSREP: Protocol violation\\. JOIN message sender (.*) is not in state transfer \\(SYNCED\\)\\. Message ignored\\.");
diff --git a/mysql-test/suite/galera/r/galera_bf_abort_lock_table.result b/mysql-test/suite/galera/r/galera_bf_abort_lock_table.result
index e7882e43b6a..6b6c45cbd29 100644
--- a/mysql-test/suite/galera/r/galera_bf_abort_lock_table.result
+++ b/mysql-test/suite/galera/r/galera_bf_abort_lock_table.result
@@ -7,6 +7,7 @@ LOCK TABLE t1 WRITE;
 connection node_1;
 INSERT INTO t1 VALUES (2);
 connection node_2;
+SET SESSION wsrep_sync_wait = 0;
 UNLOCK TABLES;
 COMMIT;
 SELECT COUNT(*) = 1 FROM t1;
diff --git a/mysql-test/suite/galera/r/galera_bf_kill_debug.result b/mysql-test/suite/galera/r/galera_bf_kill_debug.result
index 52bd1b0e370..1f5be6c4e0e 100644
--- a/mysql-test/suite/galera/r/galera_bf_kill_debug.result
+++ b/mysql-test/suite/galera/r/galera_bf_kill_debug.result
@@ -40,18 +40,19 @@ drop table t1;
 disconnect node_2a;
 connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2;
 connection node_2a;
-CREATE TABLE t1 (i int primary key);
+CREATE TABLE t1 (i int primary key) engine=innodb;
 SET DEBUG_SYNC = "before_wsrep_ordered_commit SIGNAL bwoc_reached WAIT_FOR bwoc_continue";
 INSERT INTO t1 VALUES (1);
 connection node_2;
 SET DEBUG_SYNC = "now WAIT_FOR bwoc_reached";
 SET DEBUG_SYNC = "now SIGNAL bwoc_continue";
-SET DEBUG_SYNC='RESET';
 connection node_2a;
 connection node_2;
+SET DEBUG_SYNC='RESET';
 select * from t1;
 i
 1
 disconnect node_2a;
+disconnect node_2b;
 connection node_1;
 drop table t1;
diff --git a/mysql-test/suite/galera/r/galera_partitioned_tables.result b/mysql-test/suite/galera/r/galera_partitioned_tables.result
new file mode 100644
index 00000000000..3f24cae1495
--- /dev/null
+++ b/mysql-test/suite/galera/r/galera_partitioned_tables.result
@@ -0,0 +1,176 @@
+connection node_2;
+connection node_1;
+call mtr.add_suppression("WSREP: wsrep_mode = STRICT_REPLICATION enabled. Storage engine partition for table.*");
+# wsrep-mode= DEFAULT
+SET GLOBAL wsrep_mode = "";
+SELECT @@wsrep_mode;
+@@wsrep_mode
+
+CREATE OR REPLACE TABLE t1 (v1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB
+PARTITION BY KEY (v1)
+PARTITIONS 2;
+CREATE OR REPLACE TABLE t2 (v1 INT NOT NULL PRIMARY KEY) ENGINE=MyISAM
+PARTITION BY KEY (v1)
+PARTITIONS 2;
+ALTER TABLE t1 ADD COLUMN v2 int;
+ALTER TABLE t2 ADD COLUMN v2 int;
+INSERT INTO t1 VALUES (1,1),(2,2);
+INSERT INTO t2 VALUES (1,1),(2,2);
+ALTER TABLE t1 ADD COLUMN v3 int, ENGINE=MyISAM;
+ALTER TABLE t2 ADD COLUMN v3 int, ENGINE=Aria;
+UPDATE t1 SET v3 = 3;
+UPDATE t2 SET v3 = 3;
+CREATE INDEX xx1 ON t1(v2);
+CREATE INDEX xx2 ON t2(v2);
+DROP INDEX xx1 ON t1;
+DROP INDEX xx2 ON t2;
+TRUNCATE TABLE t1;
+TRUNCATE TABLE t2;
+RENAME TABLE t1 TO t1_v2;
+RENAME TABLE t2 TO t2_v2;
+CREATE VIEW x1 AS SELECT * FROM t1_v2;
+CREATE VIEW x2 AS SELECT * FROM t2_v2;
+CREATE DEFINER=`root`@`localhost` TRIGGER increment_before_t1
+AFTER INSERT ON t1_v2 FOR EACH ROW
+UPDATE t1_v2 SET t1_v2.v3 = t1_v2.v3+1;
+CREATE DEFINER=`root`@`localhost` TRIGGER increment_before_t2
+AFTER INSERT ON t2_v2 FOR EACH ROW
+UPDATE t2_v2 SET t2_v2.v3 = t2_v2.v3+1;
+connection node_2;
+SHOW CREATE TABLE t1_v2;
+Table	Create Table
+t1_v2	CREATE TABLE `t1_v2` (
+  `v1` int(11) NOT NULL,
+  `v2` int(11) DEFAULT NULL,
+  `v3` int(11) DEFAULT NULL,
+  PRIMARY KEY (`v1`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+ PARTITION BY KEY (`v1`)
+PARTITIONS 2
+SHOW CREATE TABLE t2_v2;
+Table	Create Table
+t2_v2	CREATE TABLE `t2_v2` (
+  `v1` int(11) NOT NULL,
+  `v2` int(11) DEFAULT NULL,
+  `v3` int(11) DEFAULT NULL,
+  PRIMARY KEY (`v1`)
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+ PARTITION BY KEY (`v1`)
+PARTITIONS 2
+SHOW CREATE VIEW x1;
+View	Create View	character_set_client	collation_connection
+x1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `x1` AS select `t1_v2`.`v1` AS `v1`,`t1_v2`.`v2` AS `v2`,`t1_v2`.`v3` AS `v3` from `t1_v2`	latin1	latin1_swedish_ci
+SHOW CREATE VIEW x2;
+View	Create View	character_set_client	collation_connection
+x2	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `x2` AS select `t2_v2`.`v1` AS `v1`,`t2_v2`.`v2` AS `v2`,`t2_v2`.`v3` AS `v3` from `t2_v2`	latin1	latin1_swedish_ci
+SELECT * FROM t1_v2;
+v1	v2	v3
+SELECT * FROM t2_v2;
+v1	v2	v3
+connection node_1;
+DROP VIEW x1;
+DROP VIEW x2;
+DROP TRIGGER increment_before_t1;
+DROP TRIGGER increment_before_t2;
+DROP TABLE t1_v2;
+DROP TABLE t2_v2;
+SET GLOBAL wsrep_mode = "";
+CREATE OR REPLACE TABLE t2 (v1 INT NOT NULL PRIMARY KEY) ENGINE=MyISAM
+PARTITION BY KEY (v1)
+PARTITIONS 2;
+# wsrep-mode= STRICT_REPLICATION
+SET GLOBAL wsrep_mode = "STRICT_REPLICATION";
+SELECT @@wsrep_mode;
+@@wsrep_mode
+STRICT_REPLICATION
+CREATE OR REPLACE TABLE t1 (v1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB
+PARTITION BY KEY (v1)
+PARTITIONS 2;
+CREATE OR REPLACE TABLE t3 (v1 INT NOT NULL PRIMARY KEY) ENGINE=MyISAM
+PARTITION BY KEY (v1)
+PARTITIONS 2;
+ERROR HY000: Galera replication not supported
+ALTER TABLE t1 ADD COLUMN v2 int;
+ALTER TABLE t2 ADD COLUMN v2 int;
+ERROR HY000: Galera replication not supported
+INSERT INTO t1 VALUES (1,1),(2,2);
+Warnings:
+Warning	1290	WSREP: wsrep_mode = STRICT_REPLICATION enabled. Storage engine partition for table 'test'.'t1' is not supported in Galera
+INSERT INTO t2 VALUES (1),(2);
+Warnings:
+Warning	1290	WSREP: wsrep_mode = STRICT_REPLICATION enabled. Storage engine partition for table 'test'.'t2' is not supported in Galera
+ALTER TABLE t1 ADD COLUMN v3 int, ENGINE=MyISAM;
+ERROR HY000: Galera replication not supported
+ALTER TABLE t2 ADD COLUMN v3 int, ENGINE=Aria;
+ERROR HY000: Galera replication not supported
+UPDATE t1 SET v2 = v2 + 3;
+Warnings:
+Warning	1290	WSREP: wsrep_mode = STRICT_REPLICATION enabled. Storage engine partition for table 'test'.'t1' is not supported in Galera
+UPDATE t2 SET v1 = v1 + 3;
+Warnings:
+Warning	1290	WSREP: wsrep_mode = STRICT_REPLICATION enabled. Storage engine partition for table 'test'.'t2' is not supported in Galera
+CREATE INDEX xx1 ON t1(v2);
+CREATE INDEX xx2 ON t2(v2);
+ERROR HY000: Galera replication not supported
+DROP INDEX xx1 ON t1;
+DROP INDEX xx2 on t2;
+ERROR HY000: Galera replication not supported
+TRUNCATE TABLE t1;
+TRUNCATE TABLE t2;
+ERROR HY000: Galera replication not supported
+RENAME TABLE t1 TO t1_v2;
+RENAME TABLE t2 TO t2_v2;
+RENAME TABLE t2_v2 TO t2;
+CREATE VIEW x1 AS SELECT * FROM t1_v2;
+CREATE VIEW x2 AS SELECT * FROM t2;
+ERROR HY000: Galera replication not supported
+CREATE DEFINER=`root`@`localhost` TRIGGER increment_before_t1
+AFTER INSERT ON t1_v2 FOR EACH ROW
+UPDATE t1_v2 SET t1_v2.v2 = t1_v2.v2+1;
+CREATE DEFINER=`root`@`localhost` TRIGGER increment_before_t2
+AFTER INSERT ON t2 FOR EACH ROW
+UPDATE t2 SET t2.v1 = t2.v1+1;
+ERROR HY000: Galera replication not supported
+connection node_2;
+SHOW CREATE TABLE t1_v2;
+Table	Create Table
+t1_v2	CREATE TABLE `t1_v2` (
+  `v1` int(11) NOT NULL,
+  `v2` int(11) DEFAULT NULL,
+  PRIMARY KEY (`v1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+ PARTITION BY KEY (`v1`)
+PARTITIONS 2
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `v1` int(11) NOT NULL,
+  `v2` int(11) DEFAULT NULL,
+  PRIMARY KEY (`v1`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+ PARTITION BY KEY (`v1`)
+PARTITIONS 2
+SHOW CREATE VIEW x1;
+View	Create View	character_set_client	collation_connection
+x1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `x1` AS select `t1_v2`.`v1` AS `v1`,`t1_v2`.`v2` AS `v2` from `t1_v2`	latin1	latin1_swedish_ci
+SELECT * FROM t1_v2;
+v1	v2
+SELECT * FROM t2;
+v1	v2
+connection node_1;
+DROP VIEW x1;
+DROP TRIGGER increment_before_t1;
+DROP TABLE t1_v2;
+DROP TABLE t2;
+SET GLOBAL wsrep_mode = "";
+CREATE OR REPLACE TABLE t2 (v1 INT NOT NULL PRIMARY KEY) ENGINE=MyISAM
+PARTITION BY KEY (v1)
+PARTITIONS 2;
+# wsrep-mode= STRICT_REPLICATION
+SET GLOBAL wsrep_mode = "STRICT_REPLICATION";
+SELECT @@wsrep_mode;
+@@wsrep_mode
+STRICT_REPLICATION
+ALTER TABLE t2 ENGINE=InnoDB;
+DROP TABLE t2;
+SET GLOBAL wsrep_mode = DEFAULT;
diff --git a/mysql-test/suite/galera/r/galera_ssl_cipher.result b/mysql-test/suite/galera/r/galera_ssl_cipher.result
new file mode 100644
index 00000000000..76c459b9546
--- /dev/null
+++ b/mysql-test/suite/galera/r/galera_ssl_cipher.result
@@ -0,0 +1,30 @@
+connection node_2;
+connection node_1;
+# Correct Galera library found
+connection node_1;
+connection node_2;
+connection node_1;
+connection node_2;
+SELECT VARIABLE_VALUE = 'Synced' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_state_comment';
+VARIABLE_VALUE = 'Synced'
+1
+SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
+VARIABLE_VALUE = 2
+1
+connection node_1;
+SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
+VARIABLE_VALUE = 2
+1
+connection node_2;
+SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
+VARIABLE_VALUE = 2
+1
+connection node_1;
+SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
+VARIABLE_VALUE = 2
+1
+connection node_2;
+connection node_1;
+call mtr.add_suppression("WSREP: write_handler\\(\\)");
+connection node_2;
+call mtr.add_suppression("WSREP: write_handler\\(\\)");
diff --git a/mysql-test/suite/galera/r/mdev-29775.result b/mysql-test/suite/galera/r/mdev-29775.result
new file mode 100644
index 00000000000..e5b55d6ad16
--- /dev/null
+++ b/mysql-test/suite/galera/r/mdev-29775.result
@@ -0,0 +1,84 @@
+connection node_2;
+connection node_1;
+SET GLOBAL wsrep_mode=REPLICATE_MYISAM;
+CREATE TABLE t (f0 CHAR(0)) ENGINE=MyISAM;
+INSERT INTO t VALUES();
+SELECT * FROM t;
+f0
+NULL
+connection node_2;
+SELECT * FROM t;
+f0
+NULL
+DROP TABLE t;
+connection node_1;
+SET GLOBAL wsrep_mode=REPLICATE_MYISAM;
+SET GLOBAL wsrep_forced_binlog_format=ROW;
+CREATE TABLE t (f0 CHAR(0)) ENGINE=MyISAM;
+INSERT INTO t VALUES();
+SELECT * FROM t;
+f0
+NULL
+connection node_2;
+SELECT * FROM t;
+f0
+NULL
+DROP TABLE t;
+connection node_1;
+SET GLOBAL wsrep_mode=REPLICATE_ARIA;
+CREATE TABLE t (f0 CHAR(0)) ENGINE=Aria;
+INSERT INTO t VALUES();
+SELECT * FROM t;
+f0
+NULL
+connection node_2;
+SELECT * FROM t;
+f0
+NULL
+DROP TABLE t;
+connection node_1;
+SET GLOBAL wsrep_mode=REPLICATE_ARIA;
+SET GLOBAL wsrep_forced_binlog_format=ROW;
+CREATE TABLE t (f0 CHAR(0)) ENGINE=Aria;
+INSERT INTO t VALUES();
+SELECT * FROM t;
+f0
+NULL
+connection node_2;
+SELECT * FROM t;
+f0
+NULL
+DROP TABLE t;
+connection node_1;
+SET GLOBAL wsrep_mode=REPLICATE_MYISAM;
+SET GLOBAL wsrep_forced_binlog_format=MIXED;
+ERROR HY000: wsrep_forced_binlog_format=[MIXED|STATEMENT] can't be set if wsrep_mode=[REPLICATE_MYISAM|REPLICATE_ARIA]
+SET GLOBAL wsrep_forced_binlog_format=STATEMENT;
+ERROR HY000: wsrep_forced_binlog_format=[MIXED|STATEMENT] can't be set if wsrep_mode=[REPLICATE_MYISAM|REPLICATE_ARIA]
+SET GLOBAL wsrep_mode=REPLICATE_ARIA;
+SET GLOBAL wsrep_forced_binlog_format=MIXED;
+ERROR HY000: wsrep_forced_binlog_format=[MIXED|STATEMENT] can't be set if wsrep_mode=[REPLICATE_MYISAM|REPLICATE_ARIA]
+SET GLOBAL wsrep_forced_binlog_format=STATEMENT;
+ERROR HY000: wsrep_forced_binlog_format=[MIXED|STATEMENT] can't be set if wsrep_mode=[REPLICATE_MYISAM|REPLICATE_ARIA]
+SET GLOBAL wsrep_mode=DEFAULT;
+SET GLOBAL wsrep_forced_binlog_format=MIXED;
+SET GLOBAL wsrep_mode = REPLICATE_MYISAM;
+ERROR HY000: wsrep_mode=[REPLICATE_MYISAM|REPLICATE_ARIA] can't be enabled if wsrep_forced_binlog != [NONE|ROW]
+SET GLOBAL wsrep_mode = REPLICATE_ARIA;
+ERROR HY000: wsrep_mode=[REPLICATE_MYISAM|REPLICATE_ARIA] can't be enabled if wsrep_forced_binlog != [NONE|ROW]
+SET GLOBAL wsrep_mode=DEFAULT;
+SET GLOBAL wsrep_forced_binlog_format=STATEMENT;
+SET GLOBAL wsrep_mode = REPLICATE_MYISAM;
+ERROR HY000: wsrep_mode=[REPLICATE_MYISAM|REPLICATE_ARIA] can't be enabled if wsrep_forced_binlog != [NONE|ROW]
+SET GLOBAL wsrep_mode = REPLICATE_ARIA;
+ERROR HY000: wsrep_mode=[REPLICATE_MYISAM|REPLICATE_ARIA] can't be enabled if wsrep_forced_binlog != [NONE|ROW]
+SET GLOBAL wsrep_forced_binlog_format=DEFAULT;
+SET GLOBAL wsrep_mode=DEFAULT;
+SET GLOBAL wsrep_forced_binlog_format=MIXED;
+SET GLOBAL wsrep_mode=REPLICATE_MYISAM;
+ERROR HY000: wsrep_mode=[REPLICATE_MYISAM|REPLICATE_ARIA] can't be enabled if wsrep_forced_binlog != [NONE|ROW]
+SET GLOBAL wsrep_forced_binlog_format=STATEMENT;
+SET GLOBAL wsrep_mode=REPLICATE_MYISAM;
+ERROR HY000: wsrep_mode=[REPLICATE_MYISAM|REPLICATE_ARIA] can't be enabled if wsrep_forced_binlog != [NONE|ROW]
+SET GLOBAL wsrep_forced_binlog_format=DEFAULT;
+SET GLOBAL wsrep_mode=DEFAULT;
diff --git a/mysql-test/suite/galera/r/mysql-wsrep#198.result b/mysql-test/suite/galera/r/mysql-wsrep#198.result
index 392c3125211..bf58018ec76 100644
--- a/mysql-test/suite/galera/r/mysql-wsrep#198.result
+++ b/mysql-test/suite/galera/r/mysql-wsrep#198.result
@@ -31,3 +31,6 @@ test.t1	repair	status	OK
 test.t2	repair	status	OK
 DROP TABLE t1;
 DROP TABLE t2;
+connection node_1;
+disconnect node_2a;
+disconnect node_2b;
diff --git a/mysql-test/suite/galera/r/wsrep_mode_strict_replication.result b/mysql-test/suite/galera/r/wsrep_mode_strict_replication.result
index a036c4edd2f..2d390e885a9 100644
--- a/mysql-test/suite/galera/r/wsrep_mode_strict_replication.result
+++ b/mysql-test/suite/galera/r/wsrep_mode_strict_replication.result
@@ -32,6 +32,8 @@ SHOW WARNINGS;
 Level	Code	Message
 Error	4165	Galera replication not supported
 Warning	1031	WSREP: wsrep_mode = STRICT_REPLICATION enabled. Storage engine MyISAM not supported.
+Error	4165	Galera replication not supported
+Warning	1031	WSREP: wsrep_mode = STRICT_REPLICATION enabled. Storage engine MyISAM not supported.
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
diff --git a/mysql-test/suite/galera/t/MDEV-35748.opt b/mysql-test/suite/galera/t/MDEV-35748.opt
new file mode 100644
index 00000000000..df675545bf9
--- /dev/null
+++ b/mysql-test/suite/galera/t/MDEV-35748.opt
@@ -0,0 +1 @@
+--plugin-load=$HA_ROCKSDB_SO
diff --git a/mysql-test/suite/galera/t/MDEV-35748.test b/mysql-test/suite/galera/t/MDEV-35748.test
new file mode 100644
index 00000000000..0c0e83dcff7
--- /dev/null
+++ b/mysql-test/suite/galera/t/MDEV-35748.test
@@ -0,0 +1,22 @@
+--source include/galera_cluster.inc
+--source include/have_sequence.inc
+--source include/have_rocksdb.inc
+
+--connection node_1
+INSTALL PLUGIN IF NOT EXISTS connect SONAME 'ha_connect';
+
+CREATE TABLE t1 (f INT) ENGINE=CONNECT;
+CREATE TABLE t2 (f INT) ENGINE=ROCKSDB;
+--error ER_NOT_SUPPORTED_YET
+CREATE TABLE t3 (f INT) ENGINE=SEQUENCE;
+show warnings;
+
+--connection node_2
+show create table t1;
+show create table t2;
+--error ER_NO_SUCH_TABLE
+show create table t3;
+
+--connection node_1
+DROP TABLE t1, t2;
+UNINSTALL PLUGIN IF EXISTS connect;
diff --git a/mysql-test/suite/galera/t/MDEV-35946.test b/mysql-test/suite/galera/t/MDEV-35946.test
new file mode 100644
index 00000000000..23c3d463a48
--- /dev/null
+++ b/mysql-test/suite/galera/t/MDEV-35946.test
@@ -0,0 +1,41 @@
+#
+# MDEV-35946: Assertion `thd->is_error()' failed in Sql_cmd_dml::prepare
+#
+--source include/have_innodb.inc
+--source include/galera_cluster.inc
+
+# Save original auto_increment_offset values.
+--let $node_1=node_1
+--let $node_2=node_2
+--source include/auto_increment_offset_save.inc
+
+#
+# Disconnect from the cluster
+#
+SET GLOBAL wsrep_provider_options = 'gmcast.isolate=1';
+SET SESSION wsrep_sync_wait=0;
+--let $wait_condition = SELECT VARIABLE_VALUE = 'non-Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status';
+--source include/wait_condition.inc
+SET SESSION wsrep_sync_wait=DEFAULT;
+
+#
+# If bug is present, assertion will fire
+# during the execution of the following DELETE
+#
+--error ER_LOCK_WAIT_TIMEOUT
+DELETE FROM mysql.wsrep_streaming_log;
+
+
+#
+# Reconnect to the cluster
+#
+SET SESSION wsrep_sync_wait=0;
+SET GLOBAL wsrep_provider_options = 'gmcast.isolate=0';
+--let $wait_condition = SELECT VARIABLE_VALUE = 'Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status';
+--source include/wait_condition.inc
+SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status';
+SET SESSION wsrep_sync_wait=DEFAULT;
+
+
+--source include/auto_increment_offset_restore.inc
+CALL mtr.add_suppression("WSREP: Protocol violation\\. JOIN message sender (.*) is not in state transfer \\(SYNCED\\)\\. Message ignored\\.");
diff --git a/mysql-test/suite/galera/t/galera_bf_abort_lock_table.test b/mysql-test/suite/galera/t/galera_bf_abort_lock_table.test
index 4582f3f972d..71c3a7198f2 100644
--- a/mysql-test/suite/galera/t/galera_bf_abort_lock_table.test
+++ b/mysql-test/suite/galera/t/galera_bf_abort_lock_table.test
@@ -16,13 +16,16 @@ LOCK TABLE t1 WRITE;
 INSERT INTO t1 VALUES (2);
 
 --connection node_2
---let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE = 'Waiting for table metadata lock'
---source include/wait_condition.inc
+SET SESSION wsrep_sync_wait = 0;
+--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE LIKE 'Waiting for table metadata lock%' OR STATE LIKE 'Waiting to execute in isolation%');
+--let $wait_condition_on_error_output = SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+--source include/wait_condition_with_debug.inc
 
 UNLOCK TABLES;
 
---let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE = 'Waiting for table metadata lock'
---source include/wait_condition.inc
+--let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE LIKE 'Waiting for table metadata lock%' OR STATE LIKE 'Waiting to execute in isolation%');
+--let $wait_condition_on_error_output = SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+--source include/wait_condition_with_debug.inc
 
 COMMIT;
 SELECT COUNT(*) = 1 FROM t1;
diff --git a/mysql-test/suite/galera/t/galera_bf_kill_debug.test b/mysql-test/suite/galera/t/galera_bf_kill_debug.test
index b8978cea11d..ddf9522c12f 100644
--- a/mysql-test/suite/galera/t/galera_bf_kill_debug.test
+++ b/mysql-test/suite/galera/t/galera_bf_kill_debug.test
@@ -110,7 +110,7 @@ drop table t1;
 --connection node_2a
 --let $connection_id = `SELECT CONNECTION_ID()`
 
-CREATE TABLE t1 (i int primary key);
+CREATE TABLE t1 (i int primary key) engine=innodb;
 
 # Set up sync point
 SET DEBUG_SYNC = "before_wsrep_ordered_commit SIGNAL bwoc_reached WAIT_FOR bwoc_continue";
@@ -129,17 +129,17 @@ SET DEBUG_SYNC = "now WAIT_FOR bwoc_reached";
 --enable_query_log
 
 SET DEBUG_SYNC = "now SIGNAL bwoc_continue";
-SET DEBUG_SYNC='RESET';
 --connection node_2a
 --error 0,1213,2013,2026
 --reap
 
 --connection node_2
+SET DEBUG_SYNC='RESET';
 # victim was able to complete the INSERT
 select * from t1;
 
 --disconnect node_2a
+--disconnect node_2b
 
 --connection node_1
 drop table t1;
-
diff --git a/mysql-test/suite/galera/t/galera_partitioned_tables.test b/mysql-test/suite/galera/t/galera_partitioned_tables.test
new file mode 100644
index 00000000000..f29adcf1501
--- /dev/null
+++ b/mysql-test/suite/galera/t/galera_partitioned_tables.test
@@ -0,0 +1,133 @@
+--source include/galera_cluster.inc
+--source include/have_partition.inc
+--source include/have_innodb.inc
+--source include/have_aria.inc
+
+call mtr.add_suppression("WSREP: wsrep_mode = STRICT_REPLICATION enabled. Storage engine partition for table.*");
+
+--echo # wsrep-mode= DEFAULT
+SET GLOBAL wsrep_mode = "";
+SELECT @@wsrep_mode;
+CREATE OR REPLACE TABLE t1 (v1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB
+  PARTITION BY KEY (v1)
+  PARTITIONS 2;
+CREATE OR REPLACE TABLE t2 (v1 INT NOT NULL PRIMARY KEY) ENGINE=MyISAM
+  PARTITION BY KEY (v1)
+  PARTITIONS 2;
+ALTER TABLE t1 ADD COLUMN v2 int;
+ALTER TABLE t2 ADD COLUMN v2 int;
+INSERT INTO t1 VALUES (1,1),(2,2);
+INSERT INTO t2 VALUES (1,1),(2,2);
+ALTER TABLE t1 ADD COLUMN v3 int, ENGINE=MyISAM;
+ALTER TABLE t2 ADD COLUMN v3 int, ENGINE=Aria;
+UPDATE t1 SET v3 = 3;
+UPDATE t2 SET v3 = 3;
+CREATE INDEX xx1 ON t1(v2);
+CREATE INDEX xx2 ON t2(v2);
+DROP INDEX xx1 ON t1;
+DROP INDEX xx2 ON t2;
+TRUNCATE TABLE t1;
+TRUNCATE TABLE t2;
+RENAME TABLE t1 TO t1_v2;
+RENAME TABLE t2 TO t2_v2;
+CREATE VIEW x1 AS SELECT * FROM t1_v2;
+CREATE VIEW x2 AS SELECT * FROM t2_v2;
+CREATE DEFINER=`root`@`localhost` TRIGGER increment_before_t1
+  AFTER INSERT ON t1_v2 FOR EACH ROW
+   UPDATE t1_v2 SET t1_v2.v3 = t1_v2.v3+1;
+CREATE DEFINER=`root`@`localhost` TRIGGER increment_before_t2
+  AFTER INSERT ON t2_v2 FOR EACH ROW
+   UPDATE t2_v2 SET t2_v2.v3 = t2_v2.v3+1;
+
+--connection node_2
+SHOW CREATE TABLE t1_v2;
+SHOW CREATE TABLE t2_v2;
+SHOW CREATE VIEW x1;
+SHOW CREATE VIEW x2;
+
+SELECT * FROM t1_v2;
+SELECT * FROM t2_v2;
+
+--connection node_1
+DROP VIEW x1;
+DROP VIEW x2;
+DROP TRIGGER increment_before_t1;
+DROP TRIGGER increment_before_t2;
+DROP TABLE t1_v2;
+DROP TABLE t2_v2;
+
+SET GLOBAL wsrep_mode = "";
+CREATE OR REPLACE TABLE t2 (v1 INT NOT NULL PRIMARY KEY) ENGINE=MyISAM
+  PARTITION BY KEY (v1)
+  PARTITIONS 2;
+--echo # wsrep-mode= STRICT_REPLICATION
+SET GLOBAL wsrep_mode = "STRICT_REPLICATION";
+SELECT @@wsrep_mode;
+CREATE OR REPLACE TABLE t1 (v1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB
+  PARTITION BY KEY (v1)
+  PARTITIONS 2;
+--error ER_GALERA_REPLICATION_NOT_SUPPORTED
+CREATE OR REPLACE TABLE t3 (v1 INT NOT NULL PRIMARY KEY) ENGINE=MyISAM
+  PARTITION BY KEY (v1)
+  PARTITIONS 2;
+ALTER TABLE t1 ADD COLUMN v2 int;
+--error ER_GALERA_REPLICATION_NOT_SUPPORTED
+ALTER TABLE t2 ADD COLUMN v2 int;
+INSERT INTO t1 VALUES (1,1),(2,2);
+INSERT INTO t2 VALUES (1),(2);
+--error ER_GALERA_REPLICATION_NOT_SUPPORTED
+ALTER TABLE t1 ADD COLUMN v3 int, ENGINE=MyISAM;
+--error ER_GALERA_REPLICATION_NOT_SUPPORTED
+ALTER TABLE t2 ADD COLUMN v3 int, ENGINE=Aria;
+UPDATE t1 SET v2 = v2 + 3;
+UPDATE t2 SET v1 = v1 + 3;
+CREATE INDEX xx1 ON t1(v2);
+--error ER_GALERA_REPLICATION_NOT_SUPPORTED
+CREATE INDEX xx2 ON t2(v2);
+DROP INDEX xx1 ON t1;
+--error ER_GALERA_REPLICATION_NOT_SUPPORTED
+DROP INDEX xx2 on t2;
+TRUNCATE TABLE t1;
+--error ER_GALERA_REPLICATION_NOT_SUPPORTED
+TRUNCATE TABLE t2;
+# At the moment can't restrict rename
+RENAME TABLE t1 TO t1_v2;
+RENAME TABLE t2 TO t2_v2;
+RENAME TABLE t2_v2 TO t2;
+CREATE VIEW x1 AS SELECT * FROM t1_v2;
+--error ER_GALERA_REPLICATION_NOT_SUPPORTED
+CREATE VIEW x2 AS SELECT * FROM t2;
+CREATE DEFINER=`root`@`localhost` TRIGGER increment_before_t1
+  AFTER INSERT ON t1_v2 FOR EACH ROW
+   UPDATE t1_v2 SET t1_v2.v2 = t1_v2.v2+1;
+--error ER_GALERA_REPLICATION_NOT_SUPPORTED
+CREATE DEFINER=`root`@`localhost` TRIGGER increment_before_t2
+  AFTER INSERT ON t2 FOR EACH ROW
+   UPDATE t2 SET t2.v1 = t2.v1+1;
+
+--connection node_2
+SHOW CREATE TABLE t1_v2;
+SHOW CREATE TABLE t2;
+SHOW CREATE VIEW x1;
+
+SELECT * FROM t1_v2;
+SELECT * FROM t2;
+
+--connection node_1
+DROP VIEW x1;
+DROP TRIGGER increment_before_t1;
+DROP TABLE t1_v2;
+# We allow dropping table
+DROP TABLE t2;
+SET GLOBAL wsrep_mode = "";
+
+CREATE OR REPLACE TABLE t2 (v1 INT NOT NULL PRIMARY KEY) ENGINE=MyISAM
+  PARTITION BY KEY (v1)
+  PARTITIONS 2;
+--echo # wsrep-mode= STRICT_REPLICATION
+SET GLOBAL wsrep_mode = "STRICT_REPLICATION";
+SELECT @@wsrep_mode;
+ALTER TABLE t2 ENGINE=InnoDB;
+DROP TABLE t2;
+
+SET GLOBAL wsrep_mode = DEFAULT;
diff --git a/mysql-test/suite/galera/t/galera_ssl_cipher.cnf b/mysql-test/suite/galera/t/galera_ssl_cipher.cnf
new file mode 100644
index 00000000000..dff9c96afbb
--- /dev/null
+++ b/mysql-test/suite/galera/t/galera_ssl_cipher.cnf
@@ -0,0 +1,11 @@
+!include ../galera_2nodes.cnf
+
+[mysqld]
+loose-galera-ssl-cipher=1
+wsrep-debug=1
+
+[mysqld.1]
+wsrep_provider_options='base_port=@mysqld.1.#galera_port;socket.ssl=yes;socket.ssl_cert=@ENV.MYSQL_TEST_DIR/std_data/galera-cert.pem;socket.ssl_key=@ENV.MYSQL_TEST_DIR/std_data/galera-key.pem;cert.log_conflicts=YES'
+
+[mysqld.2]
+wsrep_provider_options='base_port=@mysqld.2.#galera_port;socket.ssl=yes;socket.ssl_cert=@ENV.MYSQL_TEST_DIR/std_data/galera-cert.pem;socket.ssl_key=@ENV.MYSQL_TEST_DIR/std_data/galera-key.pem;cert.log_conflicts=YES'
diff --git a/mysql-test/suite/galera/t/galera_ssl_cipher.test b/mysql-test/suite/galera/t/galera_ssl_cipher.test
new file mode 100644
index 00000000000..b2cd6188079
--- /dev/null
+++ b/mysql-test/suite/galera/t/galera_ssl_cipher.test
@@ -0,0 +1,82 @@
+#
+# Test upgrading the SSL chipher
+#
+
+--source include/galera_cluster.inc
+--source include/have_ssl_communication.inc
+--source include/have_openssl.inc
+--source include/force_restart.inc
+
+#
+# Lowest supported Galera library version
+#
+--let $galera_version=26.4.21
+source ../wsrep/include/check_galera_version.inc;
+
+# Save original auto_increment_offset values.
+--let $node_1=node_1
+--let $node_2=node_2
+--source include/auto_increment_offset_save.inc
+
+# Setup galera ports
+--connection node_1
+--source suite/galera/include/galera_base_port.inc
+--let $NODE_GALERAPORT_1 = $_NODE_GALERAPORT
+
+--connection node_2
+--source suite/galera/include/galera_base_port.inc
+--let $NODE_GALERAPORT_2 = $_NODE_GALERAPORT
+
+SELECT VARIABLE_VALUE = 'Synced' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_state_comment';
+SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
+
+# 2. Restart node #1 with a socket.ssl_cipher
+
+--connection node_1
+--source include/shutdown_mysqld.inc
+--let $restart_noprint = 1
+--let $start_mysqld_params = --wsrep-cluster-address=gcomm://127.0.0.1:$NODE_GALERAPORT_2 --wsrep_provider_options=base_port=$NODE_GALERAPORT_1;socket.ssl=yes;socket.ssl_ca=$MYSQL_TEST_DIR/std_data/galera-upgrade-ca-cert.pem;socket.ssl_cert=$MYSQL_TEST_DIR/std_data/galera-cert.pem;socket.ssl_key=$MYSQL_TEST_DIR/std_data/galera-key.pem;socket.ssl_cipher=AES256-SHA
+--source include/start_mysqld.inc
+--source include/wait_until_connected_again.inc
+
+--let $wait_condition = SELECT VARIABLE_VALUE = 'Synced' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_state_comment';
+--source include/wait_condition.inc
+SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
+
+# 3. Restart node #2 with the new socket.ssl_ca , socket.ssl_cert, socket.ssl_key and socket.ssl_cipher
+
+--connection node_2
+--source include/shutdown_mysqld.inc
+--let $start_mysqld_params = --wsrep_provider_options=base_port=$NODE_GALERAPORT_2;socket.ssl=yes;socket.ssl_ca=$MYSQL_TEST_DIR/std_data/galera-upgrade-ca-cert.pem;socket.ssl_cert=$MYSQL_TEST_DIR/std_data/galera-upgrade-server-cert.pem;socket.ssl_key=$MYSQL_TEST_DIR/std_data/galera-upgrade-server-key.pem;socket.ssl_cipher=AES256-SHA
+--source include/start_mysqld.inc
+--source include/wait_until_connected_again.inc
+
+--let $wait_condition = SELECT VARIABLE_VALUE = 'Synced' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_state_comment';
+--source include/wait_condition.inc
+SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
+
+# 4. Restart node #1 with the new socket.ssl_ca , socket.ssl_cert, socket.ssl_key and socket.ssl_cipher
+
+--connection node_1
+--source include/shutdown_mysqld.inc
+--let $start_mysqld_params = --wsrep-cluster-address=gcomm://127.0.0.1:$NODE_GALERAPORT_2 --wsrep_provider_options=base_port=$NODE_GALERAPORT_1;socket.ssl=yes;socket.ssl_ca=$MYSQL_TEST_DIR/std_data/galera-upgrade-ca-cert.pem;socket.ssl_cert=$MYSQL_TEST_DIR/std_data/galera-upgrade-server-cert.pem;socket.ssl_key=$MYSQL_TEST_DIR/std_data/galera-upgrade-server-key.pem;socket.ssl_cipher=AES256-SHA
+--source include/start_mysqld.inc
+--source include/wait_until_connected_again.inc
+
+--let $wait_condition = SELECT VARIABLE_VALUE = 'Synced' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_state_comment';
+--source include/wait_condition.inc
+SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
+
+# 5. Make sure node_2 is ready as well
+--connection node_2
+--source include/galera_wait_ready.inc
+
+# Upgrade complete. Both nodes now use the new key and certificate
+
+# Restore original auto_increment_offset values.
+--source include/auto_increment_offset_restore.inc
+
+--connection node_1
+call mtr.add_suppression("WSREP: write_handler\\(\\)");
+--connection node_2
+call mtr.add_suppression("WSREP: write_handler\\(\\)");
diff --git a/mysql-test/suite/galera/t/galera_var_replicate_myisam_off.test b/mysql-test/suite/galera/t/galera_var_replicate_myisam_off.test
index a556547d990..f7da712128a 100644
--- a/mysql-test/suite/galera/t/galera_var_replicate_myisam_off.test
+++ b/mysql-test/suite/galera/t/galera_var_replicate_myisam_off.test
@@ -3,7 +3,6 @@
 #
 
 --source include/galera_cluster.inc
---source include/have_innodb.inc
 
 CREATE TABLE t1 (f1 INT PRIMARY KEY) Engine=MyISAM;
 INSERT INTO t1 VALUES (1);
diff --git a/mysql-test/suite/galera/t/mdev-29775.test b/mysql-test/suite/galera/t/mdev-29775.test
new file mode 100644
index 00000000000..2de477a4822
--- /dev/null
+++ b/mysql-test/suite/galera/t/mdev-29775.test
@@ -0,0 +1,81 @@
+--source include/galera_cluster.inc
+--source include/have_aria.inc
+
+#
+# MDEV-29775 : Assertion `0' failed in void Protocol::end_statement() when adding data to the MyISAM table after setting wsrep_mode=replicate_myisam
+#
+SET GLOBAL wsrep_mode=REPLICATE_MYISAM;
+CREATE TABLE t (f0 CHAR(0)) ENGINE=MyISAM;
+INSERT INTO t VALUES();
+SELECT * FROM t;
+--connection node_2
+SELECT * FROM t;
+DROP TABLE t;
+
+--connection node_1
+SET GLOBAL wsrep_mode=REPLICATE_MYISAM;
+SET GLOBAL wsrep_forced_binlog_format=ROW;
+CREATE TABLE t (f0 CHAR(0)) ENGINE=MyISAM;
+INSERT INTO t VALUES();
+SELECT * FROM t;
+--connection node_2
+SELECT * FROM t;
+DROP TABLE t;
+
+--connection node_1
+SET GLOBAL wsrep_mode=REPLICATE_ARIA;
+CREATE TABLE t (f0 CHAR(0)) ENGINE=Aria;
+INSERT INTO t VALUES();
+SELECT * FROM t;
+--connection node_2
+SELECT * FROM t;
+DROP TABLE t;
+
+--connection node_1
+SET GLOBAL wsrep_mode=REPLICATE_ARIA;
+SET GLOBAL wsrep_forced_binlog_format=ROW;
+CREATE TABLE t (f0 CHAR(0)) ENGINE=Aria;
+INSERT INTO t VALUES();
+SELECT * FROM t;
+--connection node_2
+SELECT * FROM t;
+DROP TABLE t;
+
+--connection node_1
+SET GLOBAL wsrep_mode=REPLICATE_MYISAM;
+--error ER_WRONG_ARGUMENTS
+SET GLOBAL wsrep_forced_binlog_format=MIXED;
+--error ER_WRONG_ARGUMENTS
+SET GLOBAL wsrep_forced_binlog_format=STATEMENT;
+
+SET GLOBAL wsrep_mode=REPLICATE_ARIA;
+--error ER_WRONG_ARGUMENTS
+SET GLOBAL wsrep_forced_binlog_format=MIXED;
+--error ER_WRONG_ARGUMENTS
+SET GLOBAL wsrep_forced_binlog_format=STATEMENT;
+
+SET GLOBAL wsrep_mode=DEFAULT;
+SET GLOBAL wsrep_forced_binlog_format=MIXED;
+--error ER_WRONG_ARGUMENTS
+SET GLOBAL wsrep_mode = REPLICATE_MYISAM;
+--error ER_WRONG_ARGUMENTS
+SET GLOBAL wsrep_mode = REPLICATE_ARIA;
+
+SET GLOBAL wsrep_mode=DEFAULT;
+SET GLOBAL wsrep_forced_binlog_format=STATEMENT;
+--error ER_WRONG_ARGUMENTS
+SET GLOBAL wsrep_mode = REPLICATE_MYISAM;
+--error ER_WRONG_ARGUMENTS
+SET GLOBAL wsrep_mode = REPLICATE_ARIA;
+
+SET GLOBAL wsrep_forced_binlog_format=DEFAULT;
+SET GLOBAL wsrep_mode=DEFAULT;
+SET GLOBAL wsrep_forced_binlog_format=MIXED;
+--error ER_WRONG_ARGUMENTS
+SET GLOBAL wsrep_mode=REPLICATE_MYISAM;
+SET GLOBAL wsrep_forced_binlog_format=STATEMENT;
+--error ER_WRONG_ARGUMENTS
+SET GLOBAL wsrep_mode=REPLICATE_MYISAM;
+
+SET GLOBAL wsrep_forced_binlog_format=DEFAULT;
+SET GLOBAL wsrep_mode=DEFAULT;
diff --git a/mysql-test/suite/galera/t/mysql-wsrep#198.cnf b/mysql-test/suite/galera/t/mysql-wsrep#198.cnf
index d599f3940e4..4c62448fe3d 100644
--- a/mysql-test/suite/galera/t/mysql-wsrep#198.cnf
+++ b/mysql-test/suite/galera/t/mysql-wsrep#198.cnf
@@ -1,9 +1,4 @@
 !include ../galera_2nodes.cnf
 
-[mysqld.1]
+[mysqld]
 log-bin
-wsrep-debug=1
-
-[mysqld.1]
-log-bin
-wsrep-debug=1
diff --git a/mysql-test/suite/galera/t/mysql-wsrep#198.test b/mysql-test/suite/galera/t/mysql-wsrep#198.test
index a8190f2ae61..98dea684f0d 100644
--- a/mysql-test/suite/galera/t/mysql-wsrep#198.test
+++ b/mysql-test/suite/galera/t/mysql-wsrep#198.test
@@ -1,6 +1,5 @@
 --source include/galera_cluster.inc
 --source include/have_innodb.inc
---source include/force_restart.inc
 
 CREATE TABLE t1 (id INT PRIMARY KEY) ENGINE=InnoDB;
 CREATE TABLE t2 (id INT PRIMARY KEY) ENGINE=InnoDB;
@@ -21,8 +20,9 @@ LOCK TABLE t2 WRITE;
 
 --connection node_2
 SET SESSION wsrep_sync_wait = 0;
---let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE = 'Waiting for table metadata lock'
---source include/wait_condition.inc
+--let $wait_condition = SELECT COUNT(*) BETWEEN 1 AND 2 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE LIKE 'Waiting for table metadata lock%' OR STATE LIKE 'Waiting to execute in isolation%';
+--let $wait_condition_on_error_output = SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+--source include/wait_condition_with_debug_and_kill.inc
 
 --connection node_1
 INSERT INTO t2 VALUES (1);
@@ -38,3 +38,8 @@ UNLOCK TABLES;
 
 DROP TABLE t1;
 DROP TABLE t2;
+
+--connection node_1
+
+--disconnect node_2a
+--disconnect node_2b
diff --git a/mysql-test/suite/gcol/r/innodb_virtual_stats.result b/mysql-test/suite/gcol/r/innodb_virtual_stats.result
index 74a0480883d..c0f595263df 100644
--- a/mysql-test/suite/gcol/r/innodb_virtual_stats.result
+++ b/mysql-test/suite/gcol/r/innodb_virtual_stats.result
@@ -38,6 +38,10 @@ idxa	n_diff_pfx01	a
 idxa	n_diff_pfx02	a,DB_ROW_ID
 idxa	n_leaf_pages	Number of leaf pages in the index
 idxa	size	Number of pages in the index
+idxb	n_diff_pfx01	b
+idxb	n_diff_pfx02	b,DB_ROW_ID
+idxb	n_leaf_pages	Number of leaf pages in the index
+idxb	size	Number of pages in the index
 vidxcd	n_diff_pfx01	c
 vidxcd	n_diff_pfx02	c,d
 vidxcd	n_diff_pfx03	c,d,DB_ROW_ID
@@ -54,6 +58,14 @@ index_name	stat_name	stat_description
 GEN_CLUST_INDEX	n_diff_pfx01	DB_ROW_ID
 GEN_CLUST_INDEX	n_leaf_pages	Number of leaf pages in the index
 GEN_CLUST_INDEX	size	Number of pages in the index
+idxb	n_diff_pfx01	b
+idxb	n_diff_pfx02	b,DB_ROW_ID
+idxb	n_leaf_pages	Number of leaf pages in the index
+idxb	size	Number of pages in the index
+vidxcd	n_diff_pfx01	d
+vidxcd	n_diff_pfx02	d,DB_ROW_ID
+vidxcd	n_leaf_pages	Number of leaf pages in the index
+vidxcd	size	Number of pages in the index
 ALTER TABLE t ADD INDEX vidxe (e), ALGORITHM=INPLACE;
 select count(*) from t;
 count(*)
@@ -65,6 +77,18 @@ index_name	stat_name	stat_description
 GEN_CLUST_INDEX	n_diff_pfx01	DB_ROW_ID
 GEN_CLUST_INDEX	n_leaf_pages	Number of leaf pages in the index
 GEN_CLUST_INDEX	size	Number of pages in the index
+idxb	n_diff_pfx01	b
+idxb	n_diff_pfx02	b,DB_ROW_ID
+idxb	n_leaf_pages	Number of leaf pages in the index
+idxb	size	Number of pages in the index
+vidxcd	n_diff_pfx01	d
+vidxcd	n_diff_pfx02	d,DB_ROW_ID
+vidxcd	n_leaf_pages	Number of leaf pages in the index
+vidxcd	size	Number of pages in the index
+vidxe	n_diff_pfx01	e
+vidxe	n_diff_pfx02	e,DB_ROW_ID
+vidxe	n_leaf_pages	Number of leaf pages in the index
+vidxe	size	Number of pages in the index
 ALTER TABLE t ADD COLUMN f INT GENERATED ALWAYS AS(a + a), ADD INDEX vidxf (f), ALGORITHM=INPLACE;
 select count(*) from t;
 count(*)
@@ -76,6 +100,22 @@ index_name	stat_name	stat_description
 GEN_CLUST_INDEX	n_diff_pfx01	DB_ROW_ID
 GEN_CLUST_INDEX	n_leaf_pages	Number of leaf pages in the index
 GEN_CLUST_INDEX	size	Number of pages in the index
+idxb	n_diff_pfx01	b
+idxb	n_diff_pfx02	b,DB_ROW_ID
+idxb	n_leaf_pages	Number of leaf pages in the index
+idxb	size	Number of pages in the index
+vidxcd	n_diff_pfx01	d
+vidxcd	n_diff_pfx02	d,DB_ROW_ID
+vidxcd	n_leaf_pages	Number of leaf pages in the index
+vidxcd	size	Number of pages in the index
+vidxe	n_diff_pfx01	e
+vidxe	n_diff_pfx02	e,DB_ROW_ID
+vidxe	n_leaf_pages	Number of leaf pages in the index
+vidxe	size	Number of pages in the index
+vidxf	n_diff_pfx01	f
+vidxf	n_diff_pfx02	f,DB_ROW_ID
+vidxf	n_leaf_pages	Number of leaf pages in the index
+vidxf	size	Number of pages in the index
 ALTER TABLE t DROP INDEX vidxcd;
 SELECT index_name, stat_name, stat_description
 FROM mysql.innodb_index_stats
@@ -84,4 +124,16 @@ index_name	stat_name	stat_description
 GEN_CLUST_INDEX	n_diff_pfx01	DB_ROW_ID
 GEN_CLUST_INDEX	n_leaf_pages	Number of leaf pages in the index
 GEN_CLUST_INDEX	size	Number of pages in the index
+idxb	n_diff_pfx01	b
+idxb	n_diff_pfx02	b,DB_ROW_ID
+idxb	n_leaf_pages	Number of leaf pages in the index
+idxb	size	Number of pages in the index
+vidxe	n_diff_pfx01	e
+vidxe	n_diff_pfx02	e,DB_ROW_ID
+vidxe	n_leaf_pages	Number of leaf pages in the index
+vidxe	size	Number of pages in the index
+vidxf	n_diff_pfx01	f
+vidxf	n_diff_pfx02	f,DB_ROW_ID
+vidxf	n_leaf_pages	Number of leaf pages in the index
+vidxf	size	Number of pages in the index
 DROP TABLE t;
diff --git a/mysql-test/suite/innodb/r/autoinc_persist,desc.rdiff b/mysql-test/suite/innodb/r/autoinc_persist,desc.rdiff
index 639a60648e4..13a6cafe01a 100644
--- a/mysql-test/suite/innodb/r/autoinc_persist,desc.rdiff
+++ b/mysql-test/suite/innodb/r/autoinc_persist,desc.rdiff
@@ -1,4 +1,6 @@
-@@ -13,212 +13,212 @@
+--- autoinc_persist.result
++++ autoinc_persist.result,desc
+@@ -13,224 +13,224 @@
  #
  # Pre-create several tables
  SET SQL_MODE='STRICT_ALL_TABLES';
@@ -296,8 +298,7 @@
 +2
 +1
 +CREATE TABLE t11(a FLOAT AUTO_INCREMENT, PRIMARY KEY(a DESC)) ENGINE = InnoDB;
- INSERT INTO t11 VALUES(0), (0), (0), (0), (-1), (-10), (0),
- (20), (30), (31);
+ INSERT INTO t11 VALUES(0), (0), (0), (0), (-1), (-10), (0), (20), (30), (31);
  SELECT * FROM t11;
  a
 --10
@@ -310,7 +311,7 @@
 -20
 -30
  31
--CREATE TABLE t12(a DOUBLE AUTO_INCREMENT KEY) ENGINE = InnoDB;
+-CREATE TABLE t11u(a FLOAT UNSIGNED AUTO_INCREMENT KEY) ENGINE = InnoDB;
 +30
 +20
 +5
@@ -320,9 +321,30 @@
 +1
 +-1
 +-10
++CREATE TABLE t11u(a FLOAT UNSIGNED AUTO_INCREMENT, PRIMARY KEY(a DESC)) ENGINE = InnoDB;
+ INSERT INTO t11u VALUES(0), (0), (0), (0), (-1), (-10), (0), (20), (30), (31);
+ ERROR 22003: Out of range value for column 'a' at row 5
+ INSERT INTO t11u VALUES(0), (0), (0), (0), (0), (20), (30), (31);
+ SELECT * FROM t11u;
+ a
+-11
+-12
+-13
+-14
+-15
+-20
+-30
+ 31
+-CREATE TABLE t12(a DOUBLE AUTO_INCREMENT KEY) ENGINE = InnoDB;
++30
++20
++15
++14
++13
++12
++11
 +CREATE TABLE t12(a DOUBLE AUTO_INCREMENT, PRIMARY KEY(a DESC)) ENGINE = InnoDB;
- INSERT INTO t12 VALUES(0), (0), (0), (0), (-1), (-10), (0),
- (20), (30), (31);
+ INSERT INTO t12 VALUES(0), (0), (0), (0), (-1), (-10), (0), (20), (30), (31);
  SELECT * FROM t12;
  a
 --10
@@ -344,10 +366,10 @@
 +1
 +-1
 +-10
- # Scenario 1: Normal restart, to test if the counters are persisted
- # Scenario 2: Delete some values, to test the counters should not be the
- # one which is the largest in current table
-@@ -242,14 +242,14 @@
+ CREATE TABLE t12u(a DOUBLE UNSIGNED AUTO_INCREMENT KEY) ENGINE = InnoDB;
+ INSERT INTO t12u VALUES(0), (0), (0), (0), (-1), (-10), (0), (20), (30), (31);
+ ERROR 22003: Out of range value for column 'a' at row 5
+@@ -268,14 +268,14 @@
  SELECT MAX(a) AS `Expect 100000000000` FROM t9;
  Expect 100000000000
  100000000000
@@ -364,7 +386,7 @@
  ) ENGINE=InnoDB AUTO_INCREMENT=1234 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
  INSERT INTO t13 VALUES(0);
  SELECT a AS `Expect 1234` FROM t13;
-@@ -464,28 +464,28 @@
+@@ -490,28 +490,28 @@
  INSERT INTO t1 VALUES(0), (0);
  SELECT * FROM t1;
  a
@@ -398,7 +420,7 @@
  # Ensure that all changes before the server is killed are persisted.
  set global innodb_flush_log_at_trx_commit=1;
  TRUNCATE TABLE t1;
-@@ -498,63 +498,63 @@
+@@ -524,63 +524,63 @@
  INSERT INTO t19 VALUES(0), (0);
  SELECT * FROM t19;
  a
@@ -481,7 +503,7 @@
  DELETE FROM t3 WHERE a > 300;
  SELECT MAX(a) AS `Expect 200` FROM t3;
  Expect 200
-@@ -566,7 +566,7 @@
+@@ -592,7 +592,7 @@
  Table	Create Table
  t3	CREATE TABLE `t3` (
    `a` smallint(6) NOT NULL AUTO_INCREMENT,
@@ -490,7 +512,7 @@
  ) ENGINE=InnoDB AUTO_INCREMENT=201 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
  INSERT INTO t3 VALUES(0);
  SELECT MAX(a) AS `Expect 201` FROM t3;
-@@ -579,7 +579,7 @@
+@@ -605,7 +605,7 @@
  Table	Create Table
  t3	CREATE TABLE `t3` (
    `a` smallint(6) NOT NULL AUTO_INCREMENT,
@@ -499,7 +521,7 @@
  ) ENGINE=InnoDB AUTO_INCREMENT=500 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
  INSERT INTO t3 VALUES(0);
  SELECT MAX(a) AS `Expect 500` FROM t3;
-@@ -591,13 +591,13 @@
+@@ -617,13 +617,13 @@
  Table	Create Table
  t3	CREATE TABLE `t3` (
    `a` smallint(6) NOT NULL AUTO_INCREMENT,
@@ -515,7 +537,7 @@
  INSERT INTO t3 VALUES(150), (180);
  UPDATE t3 SET a = 200 WHERE a = 150;
  INSERT INTO t3 VALUES(220);
-@@ -607,7 +607,7 @@
+@@ -633,7 +633,7 @@
  Table	Create Table
  t3	CREATE TABLE `t3` (
    `a` smallint(6) NOT NULL AUTO_INCREMENT,
@@ -524,7 +546,7 @@
  ) ENGINE=InnoDB AUTO_INCREMENT=221 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
  INSERT INTO t3 VALUES(0);
  SELECT MAX(a) AS `Expect 221` FROM t3;
-@@ -619,7 +619,7 @@
+@@ -645,7 +645,7 @@
  Table	Create Table
  t3	CREATE TABLE `t3` (
    `a` smallint(6) NOT NULL AUTO_INCREMENT,
@@ -533,7 +555,7 @@
  ) ENGINE=InnoDB AUTO_INCREMENT=120 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
  # MDEV-6076: Test adding an AUTO_INCREMENT COLUMN
  CREATE TABLE mdev6076a (b INT) ENGINE=InnoDB;
-@@ -669,18 +669,18 @@
+@@ -695,18 +695,18 @@
  INSERT INTO t_inplace SELECT * FROM t3;
  SELECT * FROM t_inplace;
  a
@@ -559,7 +581,7 @@
  ) ENGINE=InnoDB AUTO_INCREMENT=211 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
  # This will keep the autoinc counter
  ALTER TABLE t_inplace AUTO_INCREMENT = 250, ALGORITHM = INPLACE;
-@@ -689,7 +689,7 @@
+@@ -715,7 +715,7 @@
  Table	Create Table
  t_inplace	CREATE TABLE `t_inplace` (
    `a` smallint(6) NOT NULL AUTO_INCREMENT,
@@ -568,7 +590,7 @@
  ) ENGINE=InnoDB AUTO_INCREMENT=250 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
  # This should keep the autoinc counter as well
  ALTER TABLE t_inplace ADD COLUMN b INT, ALGORITHM = INPLACE;
-@@ -699,16 +699,16 @@
+@@ -725,16 +725,16 @@
  t_inplace	CREATE TABLE `t_inplace` (
    `a` smallint(6) NOT NULL AUTO_INCREMENT,
    `b` int(11) DEFAULT NULL,
@@ -590,7 +612,7 @@
  # This should reset the autoinc counter to the one specified
  # Since it's smaller than current one but bigger than existing
  # biggest counter in the table
-@@ -719,7 +719,7 @@
+@@ -745,7 +745,7 @@
  t_inplace	CREATE TABLE `t_inplace` (
    `a` smallint(6) NOT NULL AUTO_INCREMENT,
    `b` int(11) DEFAULT NULL,
@@ -599,7 +621,7 @@
  ) ENGINE=InnoDB AUTO_INCREMENT=180 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
  # This should reset the autoinc counter to the next value of
  # current max counter in the table, since the specified value
-@@ -730,7 +730,7 @@
+@@ -756,7 +756,7 @@
  Table	Create Table
  t_inplace	CREATE TABLE `t_inplace` (
    `a` smallint(6) NOT NULL AUTO_INCREMENT,
@@ -608,7 +630,7 @@
  ) ENGINE=InnoDB AUTO_INCREMENT=123 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
  INSERT INTO t_inplace VALUES(0), (0);
  SELECT MAX(a) AS `Expect 124` FROM t_inplace;
-@@ -757,18 +757,18 @@
+@@ -783,18 +783,18 @@
  INSERT INTO t_copy SELECT * FROM t3;
  SELECT * FROM t_copy;
  a
@@ -634,7 +656,7 @@
  ) ENGINE=InnoDB AUTO_INCREMENT=211 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
  # This will keep the autoinc counter
  ALTER TABLE t_copy AUTO_INCREMENT = 250, ALGORITHM = COPY;
-@@ -777,7 +777,7 @@
+@@ -803,7 +803,7 @@
  Table	Create Table
  t_copy	CREATE TABLE `t_copy` (
    `a` smallint(6) NOT NULL AUTO_INCREMENT,
@@ -643,7 +665,7 @@
  ) ENGINE=InnoDB AUTO_INCREMENT=250 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
  # This should keep the autoinc counter as well
  ALTER TABLE t_copy ADD COLUMN b INT, ALGORITHM = COPY;
-@@ -787,16 +787,16 @@
+@@ -813,16 +813,16 @@
  t_copy	CREATE TABLE `t_copy` (
    `a` smallint(6) NOT NULL AUTO_INCREMENT,
    `b` int(11) DEFAULT NULL,
@@ -665,7 +687,7 @@
  # This should reset the autoinc counter to the one specified
  # Since it's smaller than current one but bigger than existing
  # biggest counter in the table
-@@ -807,7 +807,7 @@
+@@ -833,7 +833,7 @@
  t_copy	CREATE TABLE `t_copy` (
    `a` smallint(6) NOT NULL AUTO_INCREMENT,
    `b` int(11) DEFAULT NULL,
@@ -674,7 +696,7 @@
  ) ENGINE=InnoDB AUTO_INCREMENT=180 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
  # This should reset the autoinc counter to the next value of
  # current max counter in the table, since the specified value
-@@ -818,7 +818,7 @@
+@@ -844,7 +844,7 @@
  Table	Create Table
  t_copy	CREATE TABLE `t_copy` (
    `a` smallint(6) NOT NULL AUTO_INCREMENT,
@@ -683,7 +705,7 @@
  ) ENGINE=InnoDB AUTO_INCREMENT=123 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
  INSERT INTO t_copy VALUES(0), (0);
  SELECT MAX(a) AS `Expect 124` FROM t_copy;
-@@ -842,7 +842,7 @@
+@@ -868,7 +868,7 @@
  126
  DROP TABLE t_copy, it_copy;
  # Scenario 9: Test the sql_mode = NO_AUTO_VALUE_ON_ZERO
@@ -692,7 +714,7 @@
  set SQL_MODE = NO_AUTO_VALUE_ON_ZERO;
  INSERT INTO t30 VALUES(NULL, 1), (200, 2), (0, 3);
  INSERT INTO t30(b) VALUES(4), (5), (6), (7);
-@@ -869,20 +869,20 @@
+@@ -895,20 +895,20 @@
  set global innodb_flush_log_at_trx_commit=1;
  CREATE TABLE t31 (a INT) ENGINE = InnoDB;
  INSERT INTO t31 VALUES(1), (2);
@@ -719,7 +741,7 @@
  INSERT INTO t32 VALUES(0), (0);
  # Ensure that all changes before the server is killed are persisted.
  set global innodb_flush_log_at_trx_commit=1;
-@@ -897,7 +897,7 @@
+@@ -923,7 +923,7 @@
  # increasing the counter
  CREATE TABLE t33 (
  a BIGINT NOT NULL PRIMARY KEY,
@@ -728,7 +750,7 @@
  INSERT INTO t33 VALUES(1, NULL);
  INSERT INTO t33 VALUES(2, NULL);
  INSERT INTO t33 VALUES(2, NULL);
-@@ -920,13 +920,13 @@
+@@ -946,13 +946,13 @@
  INSERT INTO t31(a) VALUES(6), (0);
  SELECT * FROM t31;
  a	b
@@ -748,7 +770,7 @@
  DROP TABLE t31;
  set SQL_MODE = NO_AUTO_VALUE_ON_ZERO;
  DELETE FROM t30 WHERE a = 0;
-@@ -965,7 +965,7 @@
+@@ -991,7 +991,7 @@
  DROP TABLE t33;
  CREATE TABLE t33 (
  a BIGINT NOT NULL PRIMARY KEY,
@@ -757,7 +779,7 @@
  ALTER TABLE t33 DISCARD TABLESPACE;
  restore: t33 .ibd and .cfg files
  ALTER TABLE t33 IMPORT TABLESPACE;
-@@ -975,7 +975,7 @@
+@@ -1001,8 +1001,8 @@
  4
  SELECT * FROM t33;
  a	b
@@ -766,4 +788,5 @@
  3	4
 +2	2
 +10	1
- DROP TABLE t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t30, t32, t33;
+ DROP TABLE t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t11u, t12u,
+ t30, t32, t33;
diff --git a/mysql-test/suite/innodb/r/autoinc_persist.result b/mysql-test/suite/innodb/r/autoinc_persist.result
index 2f1613b4375..00f8f9b9d94 100644
--- a/mysql-test/suite/innodb/r/autoinc_persist.result
+++ b/mysql-test/suite/innodb/r/autoinc_persist.result
@@ -191,8 +191,7 @@ a
 100000000000
 100000000006
 CREATE TABLE t11(a FLOAT AUTO_INCREMENT KEY) ENGINE = InnoDB;
-INSERT INTO t11 VALUES(0), (0), (0), (0), (-1), (-10), (0),
-(20), (30), (31);
+INSERT INTO t11 VALUES(0), (0), (0), (0), (-1), (-10), (0), (20), (30), (31);
 SELECT * FROM t11;
 a
 -10
@@ -205,9 +204,22 @@ a
 20
 30
 31
+CREATE TABLE t11u(a FLOAT UNSIGNED AUTO_INCREMENT KEY) ENGINE = InnoDB;
+INSERT INTO t11u VALUES(0), (0), (0), (0), (-1), (-10), (0), (20), (30), (31);
+ERROR 22003: Out of range value for column 'a' at row 5
+INSERT INTO t11u VALUES(0), (0), (0), (0), (0), (20), (30), (31);
+SELECT * FROM t11u;
+a
+11
+12
+13
+14
+15
+20
+30
+31
 CREATE TABLE t12(a DOUBLE AUTO_INCREMENT KEY) ENGINE = InnoDB;
-INSERT INTO t12 VALUES(0), (0), (0), (0), (-1), (-10), (0),
-(20), (30), (31);
+INSERT INTO t12 VALUES(0), (0), (0), (0), (-1), (-10), (0), (20), (30), (31);
 SELECT * FROM t12;
 a
 -10
@@ -220,6 +232,20 @@ a
 20
 30
 31
+CREATE TABLE t12u(a DOUBLE UNSIGNED AUTO_INCREMENT KEY) ENGINE = InnoDB;
+INSERT INTO t12u VALUES(0), (0), (0), (0), (-1), (-10), (0), (20), (30), (31);
+ERROR 22003: Out of range value for column 'a' at row 5
+INSERT INTO t12u VALUES(0), (0), (0), (0), (0), (20), (30), (31);
+SELECT * FROM t12u;
+a
+11
+12
+13
+14
+15
+20
+30
+31
 # Scenario 1: Normal restart, to test if the counters are persisted
 # Scenario 2: Delete some values, to test the counters should not be the
 # one which is the largest in current table
@@ -979,5 +1005,6 @@ a	b
 10	1
 2	2
 3	4
-DROP TABLE t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t30, t32, t33;
+DROP TABLE t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t11u, t12u,
+t30, t32, t33;
 ALTER DATABASE test CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci;
diff --git a/mysql-test/suite/innodb/r/doublewrite.result b/mysql-test/suite/innodb/r/doublewrite.result
index 667c65d7b7b..d381c6850c3 100644
--- a/mysql-test/suite/innodb/r/doublewrite.result
+++ b/mysql-test/suite/innodb/r/doublewrite.result
@@ -11,9 +11,11 @@ insert into t1 values(5, repeat('.',12));
 commit work;
 SET GLOBAL innodb_fast_shutdown = 0;
 # restart
+SET GLOBAL innodb_max_dirty_pages_pct_lwm=0,innodb_max_dirty_pages_pct=0;
+SET GLOBAL innodb_max_dirty_pages_pct=99;
 connect  dml,localhost,root,,;
 XA START 'x';
-insert into t1 values (6, repeat('%', @@innodb_page_size/2));
+insert into t1 values(6, repeat('%', @@innodb_page_size/2));
 XA END 'x';
 XA PREPARE 'x';
 disconnect dml;
@@ -23,7 +25,6 @@ flush table t1 for export;
 # restart
 FOUND 1 /InnoDB: Recovered page \[page id: space=[1-9][0-9]*, page number=0\]/ in mysqld.1.err
 # restart
-XA ROLLBACK 'x';
 check table t1;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
@@ -34,18 +35,13 @@ f1	f2
 3	////////////
 4	------------
 5	............
-connect  dml,localhost,root,,;
-XA START 'x';
-insert into t1 values (6, repeat('%', @@innodb_page_size/2));
-XA END 'x';
-XA PREPARE 'x';
-disconnect dml;
-connection default;
-flush table t1 for export;
+SET GLOBAL innodb_max_dirty_pages_pct_lwm=0,innodb_max_dirty_pages_pct=0;
+SET GLOBAL innodb_max_dirty_pages_pct=99;
+XA ROLLBACK 'x';
+FLUSH TABLE t1 FOR EXPORT;
 # Kill the server
 # restart
 FOUND 4 /InnoDB: Recovered page \[page id: space=[1-9][0-9]*, page number=[03]\]/ in mysqld.1.err
-XA ROLLBACK 'x';
 check table t1;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
diff --git a/mysql-test/suite/innodb/r/innodb_row_lock_time_ms.result b/mysql-test/suite/innodb/r/innodb_row_lock_time_ms.result
index 984d789e058..bba1342f394 100644
--- a/mysql-test/suite/innodb/r/innodb_row_lock_time_ms.result
+++ b/mysql-test/suite/innodb/r/innodb_row_lock_time_ms.result
@@ -1,10 +1,18 @@
 CREATE TABLE `t`(`id` INT, PRIMARY KEY(`id`)) ENGINE=InnoDB STATS_PERSISTENT=0;
 INSERT INTO t VALUES (1);
-SET GLOBAL innodb_monitor_reset = "module_innodb";
+SET GLOBAL innodb_monitor_disable="lock_row_lock_time";
+SET GLOBAL innodb_monitor_disable="lock_row_lock_time_max";
+SET GLOBAL innodb_monitor_reset_all='lock_row_lock_time';
+SET GLOBAL innodb_monitor_reset_all='lock_row_lock_time_max';
+SET GLOBAL innodb_monitor_enable="lock_row_lock_time";
+SET GLOBAL innodb_monitor_enable="lock_row_lock_time_max";
 BEGIN;
 SELECT * FROM t FOR UPDATE;
 id
 1
+SELECT @innodb_row_lock_time_before := variable_value
+FROM information_schema.global_status
+WHERE LOWER(variable_name) = 'innodb_row_lock_time';
 connect con1,localhost,root,,;
 SET innodb_lock_wait_timeout = 1;
 SELECT * FROM t FOR UPDATE;
@@ -12,29 +20,27 @@ ERROR HY000: Lock wait timeout exceeded; try restarting transaction
 disconnect con1;
 connection default;
 COMMIT;
-SELECT variable_value > 100 FROM information_schema.global_status
+SELECT variable_value - @innodb_row_lock_time_before > 100
+FROM information_schema.global_status
 WHERE LOWER(variable_name) = 'innodb_row_lock_time';
-variable_value > 100
+variable_value - @innodb_row_lock_time_before > 100
 1
-SELECT variable_value > 100 FROM information_schema.global_status
+SELECT  variable_value > 100
+FROM information_schema.global_status
 WHERE LOWER(variable_name) = 'innodb_row_lock_time_max';
 variable_value > 100
 1
-SELECT variable_value > 100 FROM information_schema.global_status
-WHERE LOWER(variable_name) = 'innodb_row_lock_time_avg';
-variable_value > 100
-1
-SELECT count_reset > 100 FROM INFORMATION_SCHEMA.INNODB_METRICS
-WHERE NAME="lock_row_lock_time";
+SELECT count_reset > 100
+FROM INFORMATION_SCHEMA.INNODB_METRICS
+WHERE NAME='lock_row_lock_time';
 count_reset > 100
 1
-SELECT count_reset > 100 FROM INFORMATION_SCHEMA.INNODB_METRICS
-WHERE NAME="lock_row_lock_time_max";
-count_reset > 100
-1
-SELECT count_reset > 100 FROM INFORMATION_SCHEMA.INNODB_METRICS
-WHERE NAME="lock_row_lock_time_avg";
+SELECT count_reset > 100
+FROM INFORMATION_SCHEMA.INNODB_METRICS
+WHERE NAME='lock_row_lock_time_max';
 count_reset > 100
 1
 DROP TABLE t;
-SET GLOBAL innodb_monitor_reset=default;
+SET GLOBAL innodb_monitor_enable=default;
+SET GLOBAL innodb_monitor_disable=default;
+SET GLOBAL innodb_monitor_reset_all=default;
diff --git a/mysql-test/suite/innodb/r/innodb_stats_auto_recalc_on_nonexistent.result b/mysql-test/suite/innodb/r/innodb_stats_auto_recalc_on_nonexistent.result
index 6b2397432df..9a216374125 100644
--- a/mysql-test/suite/innodb/r/innodb_stats_auto_recalc_on_nonexistent.result
+++ b/mysql-test/suite/innodb/r/innodb_stats_auto_recalc_on_nonexistent.result
@@ -5,13 +5,13 @@ COUNT(*)	1
 SELECT COUNT(*) FROM mysql.innodb_index_stats WHERE table_name = 't';
 COUNT(*)	3
 SELECT * FROM t;
-FLUSH TABLE t;
 DELETE FROM mysql.innodb_index_stats WHERE table_name = 't';
 DELETE FROM mysql.innodb_table_stats WHERE table_name = 't';
 SELECT COUNT(*) FROM mysql.innodb_table_stats WHERE table_name = 't';
 COUNT(*)	0
 SELECT COUNT(*) FROM mysql.innodb_index_stats WHERE table_name = 't';
 COUNT(*)	0
+RENAME TABLE t TO tmp, tmp TO t;
 SELECT * FROM t;
 SELECT COUNT(*) FROM mysql.innodb_table_stats WHERE table_name = 't';
 COUNT(*)	1
@@ -25,13 +25,13 @@ COUNT(*)	1
 SELECT COUNT(*) FROM mysql.innodb_index_stats WHERE table_name = 't';
 COUNT(*)	3
 SELECT * FROM t;
-FLUSH TABLE t;
 DELETE FROM mysql.innodb_index_stats WHERE table_name = 't';
 DELETE FROM mysql.innodb_table_stats WHERE table_name = 't';
 SELECT COUNT(*) FROM mysql.innodb_table_stats WHERE table_name = 't';
 COUNT(*)	0
 SELECT COUNT(*) FROM mysql.innodb_index_stats WHERE table_name = 't';
 COUNT(*)	0
+RENAME TABLE t TO tmp, tmp TO t;
 SELECT * FROM t;
 SELECT COUNT(*) FROM mysql.innodb_table_stats WHERE table_name = 't';
 COUNT(*)	1
@@ -45,13 +45,13 @@ COUNT(*)	1
 SELECT COUNT(*) FROM mysql.innodb_index_stats WHERE table_name = 't';
 COUNT(*)	3
 SELECT * FROM t;
-FLUSH TABLE t;
 DELETE FROM mysql.innodb_index_stats WHERE table_name = 't';
 DELETE FROM mysql.innodb_table_stats WHERE table_name = 't';
 SELECT COUNT(*) FROM mysql.innodb_table_stats WHERE table_name = 't';
 COUNT(*)	0
 SELECT COUNT(*) FROM mysql.innodb_index_stats WHERE table_name = 't';
 COUNT(*)	0
+RENAME TABLE t TO tmp, tmp TO t;
 SELECT * FROM t;
 SELECT COUNT(*) FROM mysql.innodb_table_stats WHERE table_name = 't';
 COUNT(*)	0
diff --git a/mysql-test/suite/innodb/r/innodb_stats_fetch.result b/mysql-test/suite/innodb/r/innodb_stats_fetch.result
index 1c05d770ce9..a1194eb95ca 100644
--- a/mysql-test/suite/innodb/r/innodb_stats_fetch.result
+++ b/mysql-test/suite/innodb/r/innodb_stats_fetch.result
@@ -125,7 +125,7 @@ WHERE
 table_name = 'test_ps_fetch' AND
 index_name = 'idx' AND
 stat_name = 'n_diff_pfx02';
-FLUSH TABLE test_ps_fetch;
+RENAME TABLE test_ps_fetch TO tmp, tmp TO test_ps_fetch;
 SELECT seq_in_index, column_name, cardinality
 FROM information_schema.statistics WHERE table_name = 'test_ps_fetch'
 ORDER BY index_name, seq_in_index;
diff --git a/mysql-test/suite/innodb/t/autoinc_persist.test b/mysql-test/suite/innodb/t/autoinc_persist.test
index bfa602fdd9e..4ca1be41af8 100644
--- a/mysql-test/suite/innodb/t/autoinc_persist.test
+++ b/mysql-test/suite/innodb/t/autoinc_persist.test
@@ -96,15 +96,25 @@ INSERT INTO t10 VALUES(0), (0), (0), (0), (8), (10), (0),
 SELECT * FROM t10;
 
 eval CREATE TABLE t11(a FLOAT $AUTO_INCREMENT_KEY_a) ENGINE = InnoDB;
-INSERT INTO t11 VALUES(0), (0), (0), (0), (-1), (-10), (0),
-(20), (30), (31);
+INSERT INTO t11 VALUES(0), (0), (0), (0), (-1), (-10), (0), (20), (30), (31);
 SELECT * FROM t11;
 
+eval CREATE TABLE t11u(a FLOAT UNSIGNED $AUTO_INCREMENT_KEY_a) ENGINE = InnoDB;
+--error ER_WARN_DATA_OUT_OF_RANGE
+INSERT INTO t11u VALUES(0), (0), (0), (0), (-1), (-10), (0), (20), (30), (31);
+INSERT INTO t11u VALUES(0), (0), (0), (0), (0), (20), (30), (31);
+SELECT * FROM t11u;
+
 eval CREATE TABLE t12(a DOUBLE $AUTO_INCREMENT_KEY_a) ENGINE = InnoDB;
-INSERT INTO t12 VALUES(0), (0), (0), (0), (-1), (-10), (0),
-(20), (30), (31);
+INSERT INTO t12 VALUES(0), (0), (0), (0), (-1), (-10), (0), (20), (30), (31);
 SELECT * FROM t12;
 
+CREATE TABLE t12u(a DOUBLE UNSIGNED AUTO_INCREMENT KEY) ENGINE = InnoDB;
+--error ER_WARN_DATA_OUT_OF_RANGE
+INSERT INTO t12u VALUES(0), (0), (0), (0), (-1), (-10), (0), (20), (30), (31);
+INSERT INTO t12u VALUES(0), (0), (0), (0), (0), (20), (30), (31);
+SELECT * FROM t12u;
+
 --echo # Scenario 1: Normal restart, to test if the counters are persisted
 --echo # Scenario 2: Delete some values, to test the counters should not be the
 --echo # one which is the largest in current table
@@ -567,6 +577,6 @@ INSERT INTO t33 VALUES(3, NULL);
 SELECT MAX(b) AS `Expect 4` FROM t33;
 SELECT * FROM t33;
 
-DROP TABLE t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t30, t32, t33;
-
+DROP TABLE t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t11u, t12u,
+t30, t32, t33;
 --source include/test_db_charset_restore.inc
diff --git a/mysql-test/suite/innodb/t/doublewrite.combinations b/mysql-test/suite/innodb/t/doublewrite.combinations
index 4f52013f6fc..797b7158778 100644
--- a/mysql-test/suite/innodb/t/doublewrite.combinations
+++ b/mysql-test/suite/innodb/t/doublewrite.combinations
@@ -1,7 +1,9 @@
 [strict_crc32]
 --innodb-checksum-algorithm=strict_crc32
 --innodb-use-atomic-writes=0
+--innodb-undo-tablespaces=0
 
 [strict_full_crc32]
 --innodb-checksum-algorithm=strict_full_crc32
 --innodb-use-atomic-writes=0
+--innodb-undo-tablespaces=0
diff --git a/mysql-test/suite/innodb/t/doublewrite.test b/mysql-test/suite/innodb/t/doublewrite.test
index 70832584228..a9c81901c47 100644
--- a/mysql-test/suite/innodb/t/doublewrite.test
+++ b/mysql-test/suite/innodb/t/doublewrite.test
@@ -42,10 +42,17 @@ commit work;
 SET GLOBAL innodb_fast_shutdown = 0;
 let $shutdown_timeout=;
 --source include/restart_mysqld.inc
+SET GLOBAL innodb_max_dirty_pages_pct_lwm=0,innodb_max_dirty_pages_pct=0;
+let $wait_condition =
+SELECT variable_value = 0
+FROM information_schema.global_status
+WHERE variable_name = 'INNODB_BUFFER_POOL_PAGES_DIRTY';
+--source include/wait_condition.inc
+SET GLOBAL innodb_max_dirty_pages_pct=99;
 --source ../include/no_checkpoint_start.inc
 connect (dml,localhost,root,,);
 XA START 'x';
-insert into t1 values (6, repeat('%', @@innodb_page_size/2));
+insert into t1 values(6, repeat('%', @@innodb_page_size/2));
 XA END 'x';
 XA PREPARE 'x';
 disconnect dml;
@@ -53,10 +60,12 @@ connection default;
 
 flush table t1 for export;
 
-let $restart_parameters=;
---let CLEANUP_IF_CHECKPOINT=XA COMMIT 'x';drop table t1;
+--let CLEANUP_IF_CHECKPOINT=drop table t1, unexpected_checkpoint;
 --source ../include/no_checkpoint_end.inc
 
+--copy_file $MYSQLD_DATADIR/ibdata1 $MYSQLD_DATADIR/ibdata1.bak
+--copy_file $MYSQLD_DATADIR/ib_logfile0 $MYSQLD_DATADIR/ib_logfile0.bak
+
 perl;
 use IO::Handle;
 do "$ENV{MTR_SUITE_DIR}/include/crc32.pl";
@@ -145,6 +154,12 @@ let $shutdown_timeout=0;
 --source include/shutdown_mysqld.inc
 let $shutdown_timeout=;
 # Corrupt the file in a better way.
+
+--remove_file $MYSQLD_DATADIR/ibdata1
+--remove_file $MYSQLD_DATADIR/ib_logfile0
+--move_file $MYSQLD_DATADIR/ibdata1.bak $MYSQLD_DATADIR/ibdata1
+--move_file $MYSQLD_DATADIR/ib_logfile0.bak $MYSQLD_DATADIR/ib_logfile0
+
 perl;
 use IO::Handle;
 my $fname= "$ENV{'MYSQLD_DATADIR'}test/t1.ibd";
@@ -157,22 +172,23 @@ syswrite(FILE, chr(0) x ($page_size/2));
 close FILE;
 EOF
 --source include/start_mysqld.inc
-XA ROLLBACK 'x';
 check table t1;
 select f1, f2 from t1;
 
+SET GLOBAL innodb_max_dirty_pages_pct_lwm=0,innodb_max_dirty_pages_pct=0;
+let $wait_condition =
+SELECT variable_value = 0
+FROM information_schema.global_status
+WHERE variable_name = 'INNODB_BUFFER_POOL_PAGES_DIRTY';
+--source include/wait_condition.inc
+SET GLOBAL innodb_max_dirty_pages_pct=99;
 --source ../include/no_checkpoint_start.inc
-connect (dml,localhost,root,,);
-XA START 'x';
-insert into t1 values (6, repeat('%', @@innodb_page_size/2));
-XA END 'x';
-XA PREPARE 'x';
-disconnect dml;
-connection default;
+XA ROLLBACK 'x';
+FLUSH TABLE t1 FOR EXPORT;
 
-flush table t1 for export;
-
-let $restart_parameters=;
+# If we are skipping the test at this point due to an unexpected
+# checkpoint, we will already have tested a part of this functionality.
+--let CLEANUP_IF_CHECKPOINT=drop table t1;
 --source ../include/no_checkpoint_end.inc
 
 # Zero out the first page in file and try to recover from dblwr
@@ -186,7 +202,6 @@ EOF
 --source include/start_mysqld.inc
 let SEARCH_PATTERN=InnoDB: Recovered page \\[page id: space=[1-9][0-9]*, page number=[03]\\];
 --source include/search_pattern_in_file.inc
-XA ROLLBACK 'x';
 check table t1;
 select f1, f2 from t1;
 drop table t1;
diff --git a/mysql-test/suite/innodb/t/innodb_row_lock_time_ms.test b/mysql-test/suite/innodb/t/innodb_row_lock_time_ms.test
index 4a100821819..1cd43dbca7f 100644
--- a/mysql-test/suite/innodb/t/innodb_row_lock_time_ms.test
+++ b/mysql-test/suite/innodb/t/innodb_row_lock_time_ms.test
@@ -5,11 +5,26 @@ CREATE TABLE `t`(`id` INT, PRIMARY KEY(`id`)) ENGINE=InnoDB STATS_PERSISTENT=0;
 
 INSERT INTO t VALUES (1);
 
-SET GLOBAL innodb_monitor_reset = "module_innodb";
+SET GLOBAL innodb_monitor_disable="lock_row_lock_time";
+SET GLOBAL innodb_monitor_disable="lock_row_lock_time_max";
+SET GLOBAL innodb_monitor_reset_all='lock_row_lock_time';
+SET GLOBAL innodb_monitor_reset_all='lock_row_lock_time_max';
+SET GLOBAL innodb_monitor_enable="lock_row_lock_time";
+SET GLOBAL innodb_monitor_enable="lock_row_lock_time_max";
 
 BEGIN;
 SELECT * FROM t FOR UPDATE;
 
+# We can't predict (innodb/lock)_row_lock_time_avg value, because it's counted
+# as the whole waiting time divided by the amount of waits. The
+# corresponding counters in lock_sys can't be reset with any query.
+
+--disable_result_log
+SELECT @innodb_row_lock_time_before := variable_value
+  FROM information_schema.global_status
+  WHERE LOWER(variable_name) = 'innodb_row_lock_time';
+--enable_result_log
+
 --connect(con1,localhost,root,,)
 SET innodb_lock_wait_timeout = 1;
 --error ER_LOCK_WAIT_TIMEOUT
@@ -19,24 +34,28 @@ SELECT * FROM t FOR UPDATE;
 --connection default
 COMMIT;
 
-SELECT variable_value > 100 FROM information_schema.global_status
+SELECT variable_value - @innodb_row_lock_time_before > 100
+  FROM information_schema.global_status
   WHERE LOWER(variable_name) = 'innodb_row_lock_time';
-SELECT variable_value > 100 FROM information_schema.global_status
+# We can't use 'variable_value - @innodb_row_lock_time_max_before' trick for
+# innodb_row_lock_time_max, because we can't reset it, and we don't know the
+# initial value at the moment of the test execution.
+SELECT  variable_value > 100
+  FROM information_schema.global_status
   WHERE LOWER(variable_name) = 'innodb_row_lock_time_max';
-SELECT variable_value > 100 FROM information_schema.global_status
-  WHERE LOWER(variable_name) = 'innodb_row_lock_time_avg';
-
-SELECT count_reset > 100 FROM INFORMATION_SCHEMA.INNODB_METRICS
-  WHERE NAME="lock_row_lock_time";
-SELECT count_reset > 100 FROM INFORMATION_SCHEMA.INNODB_METRICS
-  WHERE NAME="lock_row_lock_time_max";
-SELECT count_reset > 100 FROM INFORMATION_SCHEMA.INNODB_METRICS
-  WHERE NAME="lock_row_lock_time_avg";
+SELECT count_reset > 100
+  FROM INFORMATION_SCHEMA.INNODB_METRICS
+  WHERE NAME='lock_row_lock_time';
+SELECT count_reset > 100
+  FROM INFORMATION_SCHEMA.INNODB_METRICS
+  WHERE NAME='lock_row_lock_time_max';
 
 DROP TABLE t;
 
 --disable_warnings
-SET GLOBAL innodb_monitor_reset=default;
+SET GLOBAL innodb_monitor_enable=default;
+SET GLOBAL innodb_monitor_disable=default;
+SET GLOBAL innodb_monitor_reset_all=default;
 --enable_warnings
 
 --source include/wait_until_count_sessions.inc
diff --git a/mysql-test/suite/innodb/t/innodb_stats_auto_recalc_on_nonexistent.test b/mysql-test/suite/innodb/t/innodb_stats_auto_recalc_on_nonexistent.test
index 4cd910071e8..b9ef74ea30d 100644
--- a/mysql-test/suite/innodb/t/innodb_stats_auto_recalc_on_nonexistent.test
+++ b/mysql-test/suite/innodb/t/innodb_stats_auto_recalc_on_nonexistent.test
@@ -17,9 +17,7 @@ CREATE TABLE t (a INT, PRIMARY KEY (a)) ENGINE=INNODB;
 -- eval $check_stats1
 -- eval $check_stats2
 
-# open and close the table
 SELECT * FROM t;
-FLUSH TABLE t;
 
 DELETE FROM mysql.innodb_index_stats WHERE table_name = 't';
 DELETE FROM mysql.innodb_table_stats WHERE table_name = 't';
@@ -27,7 +25,8 @@ DELETE FROM mysql.innodb_table_stats WHERE table_name = 't';
 -- eval $check_stats1
 -- eval $check_stats2
 
-# open the table, causing stats recalc/save
+# rename and open the table, causing stats recalc/save
+RENAME TABLE t TO tmp, tmp TO t;
 SELECT * FROM t;
 
 -- eval $check_stats1
@@ -43,9 +42,7 @@ CREATE TABLE t (a INT, PRIMARY KEY (a)) ENGINE=INNODB STATS_AUTO_RECALC=1;
 -- eval $check_stats1
 -- eval $check_stats2
 
-# open and close the table
 SELECT * FROM t;
-FLUSH TABLE t;
 
 DELETE FROM mysql.innodb_index_stats WHERE table_name = 't';
 DELETE FROM mysql.innodb_table_stats WHERE table_name = 't';
@@ -53,7 +50,7 @@ DELETE FROM mysql.innodb_table_stats WHERE table_name = 't';
 -- eval $check_stats1
 -- eval $check_stats2
 
-# open the table, causing stats recalc/save
+RENAME TABLE t TO tmp, tmp TO t;
 SELECT * FROM t;
 
 -- eval $check_stats1
@@ -69,9 +66,7 @@ CREATE TABLE t (a INT, PRIMARY KEY (a)) ENGINE=INNODB STATS_AUTO_RECALC=0;
 -- eval $check_stats1
 -- eval $check_stats2
 
-# open and close the table
 SELECT * FROM t;
-FLUSH TABLE t;
 
 DELETE FROM mysql.innodb_index_stats WHERE table_name = 't';
 DELETE FROM mysql.innodb_table_stats WHERE table_name = 't';
@@ -79,7 +74,8 @@ DELETE FROM mysql.innodb_table_stats WHERE table_name = 't';
 -- eval $check_stats1
 -- eval $check_stats2
 
-# open the table, stats should not be present, since autorecalc is disabled
+# rename the table, stats should not be present, since autorecalc is disabled
+RENAME TABLE t TO tmp, tmp TO t;
 SELECT * FROM t;
 
 -- eval $check_stats1
diff --git a/mysql-test/suite/innodb/t/innodb_stats_fetch.test b/mysql-test/suite/innodb/t/innodb_stats_fetch.test
index 63f0e6af251..f606fbc22f6 100644
--- a/mysql-test/suite/innodb/t/innodb_stats_fetch.test
+++ b/mysql-test/suite/innodb/t/innodb_stats_fetch.test
@@ -69,7 +69,7 @@ table_name = 'test_ps_fetch' AND
 index_name = 'idx' AND
 stat_name = 'n_diff_pfx02';
 
-FLUSH TABLE test_ps_fetch;
+RENAME TABLE test_ps_fetch TO tmp, tmp TO test_ps_fetch;
 
 SELECT seq_in_index, column_name, cardinality
 FROM information_schema.statistics WHERE table_name = 'test_ps_fetch'
diff --git a/mysql-test/suite/innodb_fts/r/index_table.result b/mysql-test/suite/innodb_fts/r/index_table.result
index 570e367a7d4..909a889db42 100644
--- a/mysql-test/suite/innodb_fts/r/index_table.result
+++ b/mysql-test/suite/innodb_fts/r/index_table.result
@@ -5,6 +5,9 @@ id INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,
 title VARCHAR(200),
 content TEXT
 ) ENGINE= InnoDB;
+SET STATEMENT debug_dbug='+d,innodb_report_deadlock' FOR
+CREATE FULLTEXT INDEX idx ON articles (title, content);
+ERROR HY000: Got error 11 "Resource temporarily unavailable" from storage engine InnoDB
 CREATE FULLTEXT INDEX idx ON articles (title, content);
 INSERT INTO articles (title, content) VALUES
 ('MySQL Tutorial','DBMS stands for MySQL DataBase ...'),
diff --git a/mysql-test/suite/innodb_fts/t/index_table.test b/mysql-test/suite/innodb_fts/t/index_table.test
index 4b484877be1..89c09053230 100644
--- a/mysql-test/suite/innodb_fts/t/index_table.test
+++ b/mysql-test/suite/innodb_fts/t/index_table.test
@@ -3,6 +3,9 @@
 
 -- source include/have_innodb.inc
 -- source include/have_debug.inc
+--disable_query_log
+call mtr.add_suppression("InnoDB: \\(Deadlock\\) writing `use_stopword'");
+--enable_query_log
 
 SET @optimize=@@GLOBAL.INNODB_OPTIMIZE_FULLTEXT_ONLY;
 SET GLOBAL INNODB_OPTIMIZE_FULLTEXT_ONLY=1;
@@ -14,6 +17,9 @@ CREATE TABLE articles (
 	content TEXT
 	) ENGINE= InnoDB;
 
+--error ER_GET_ERRNO
+SET STATEMENT debug_dbug='+d,innodb_report_deadlock' FOR
+CREATE FULLTEXT INDEX idx ON articles (title, content);
 CREATE FULLTEXT INDEX idx ON articles (title, content);
 
 INSERT INTO articles (title, content) VALUES
diff --git a/mysql-test/suite/perfschema/r/threads_innodb.result b/mysql-test/suite/perfschema/r/threads_innodb.result
index 7a84c01f28b..78d75cd6c85 100644
--- a/mysql-test/suite/perfschema/r/threads_innodb.result
+++ b/mysql-test/suite/perfschema/r/threads_innodb.result
@@ -1,10 +1,10 @@
 SELECT name, type, processlist_user, processlist_host, processlist_db,
-processlist_command, processlist_time, processlist_state, processlist_info,
+processlist_command, processlist_time, processlist_info,
 parent_thread_id, role, instrumented
 FROM performance_schema.threads
 WHERE name LIKE 'thread/innodb/%'
 GROUP BY name;
-name	type	processlist_user	processlist_host	processlist_db	processlist_command	processlist_time	processlist_state	processlist_info	parent_thread_id	role	instrumented
-thread/innodb/ib_tpool_worker	BACKGROUND	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	YES
-thread/innodb/page_cleaner	BACKGROUND	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	YES
-thread/innodb/page_encrypt	BACKGROUND	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	YES
+name	type	processlist_user	processlist_host	processlist_db	processlist_command	processlist_time	processlist_info	parent_thread_id	role	instrumented
+thread/innodb/ib_tpool_worker	BACKGROUND	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	YES
+thread/innodb/page_cleaner	BACKGROUND	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	YES
+thread/innodb/page_encrypt	BACKGROUND	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	YES
diff --git a/mysql-test/suite/perfschema/t/threads_innodb.test b/mysql-test/suite/perfschema/t/threads_innodb.test
index 366c3b82ce8..e791ded2597 100644
--- a/mysql-test/suite/perfschema/t/threads_innodb.test
+++ b/mysql-test/suite/perfschema/t/threads_innodb.test
@@ -14,7 +14,7 @@
 # We suppress here duplicates rows with the goal to avoid that the test fails
 # in case some defaults are changed.
 SELECT name, type, processlist_user, processlist_host, processlist_db,
-       processlist_command, processlist_time, processlist_state, processlist_info,
+       processlist_command, processlist_time, processlist_info,
        parent_thread_id, role, instrumented
 FROM performance_schema.threads
 WHERE name LIKE 'thread/innodb/%'
diff --git a/mysql-test/suite/rpl/r/rpl_parallel_innodb_lock_conflict.result b/mysql-test/suite/rpl/r/rpl_parallel_innodb_lock_conflict.result
index 1411db16af6..a3d87641622 100644
--- a/mysql-test/suite/rpl/r/rpl_parallel_innodb_lock_conflict.result
+++ b/mysql-test/suite/rpl/r/rpl_parallel_innodb_lock_conflict.result
@@ -1,16 +1,15 @@
 ***MDEV-5914: Parallel replication deadlock due to InnoDB lock conflicts ***
 include/master-slave.inc
 [connection master]
-connection server_2;
-SET sql_log_bin=0;
+ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB;
+CALL mtr.add_suppression("InnoDB: Transaction was aborted due to ");
 CALL mtr.add_suppression("Commit failed due to failure of an earlier commit on which this one depends");
-SET sql_log_bin=1;
+connection server_2;
 SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads;
 include/stop_slave.inc
 SET GLOBAL slave_parallel_threads=10;
 CHANGE MASTER TO master_use_gtid=slave_pos;
 connection server_1;
-ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB;
 CREATE TABLE t4 (a INT PRIMARY KEY, b INT, KEY b_idx(b)) ENGINE=InnoDB;
 INSERT INTO t4 VALUES (1,NULL), (2,2), (3,NULL), (4,4), (5, NULL), (6, 6);
 connect  con1,127.0.0.1,root,,test,$SERVER_MYPORT_1,;
diff --git a/mysql-test/suite/rpl/r/rpl_xa_2pc_multi_engine.result b/mysql-test/suite/rpl/r/rpl_xa_2pc_multi_engine.result
new file mode 100644
index 00000000000..9541107e62b
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_xa_2pc_multi_engine.result
@@ -0,0 +1,26 @@
+include/master-slave.inc
+[connection master]
+connection master;
+create table t1 (a int primary key, b int) engine=innodb;
+insert t1 values (1,1),(3,3),(5,5),(7,7);
+create table t2 (m int) engine=aria;
+# Create multi-engine, two-phase XA transaction (T1)
+xa start '1';
+insert t2 values (1);
+update t1 set b=50 where b=5;
+xa end '1';
+xa prepare '1';
+# Create T2
+connection server_1;
+update t1 set b=10 where a=5;
+connection master;
+xa commit '1';
+connection server_1;
+include/save_master_gtid.inc
+# This would hang prior to MDEV-21117
+connection slave;
+include/sync_with_master_gtid.inc
+connection master;
+drop table t1, t2;
+include/rpl_end.inc
+# End of rpl_xa_2pc_multi_engine.test
diff --git a/mysql-test/suite/rpl/t/rpl_parallel_innodb_lock_conflict.test b/mysql-test/suite/rpl/t/rpl_parallel_innodb_lock_conflict.test
index 532eb58571c..47fb8ff8c75 100644
--- a/mysql-test/suite/rpl/t/rpl_parallel_innodb_lock_conflict.test
+++ b/mysql-test/suite/rpl/t/rpl_parallel_innodb_lock_conflict.test
@@ -5,21 +5,19 @@
 --source include/have_debug_sync.inc
 --source include/master-slave.inc
 
---disable_query_log
-call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
---enable_query_log
+ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB;
+CALL mtr.add_suppression("InnoDB: Transaction was aborted due to ");
+CALL mtr.add_suppression("Commit failed due to failure of an earlier commit on which this one depends");
+--save_master_pos
 
 --connection server_2
-SET sql_log_bin=0;
-CALL mtr.add_suppression("Commit failed due to failure of an earlier commit on which this one depends");
-SET sql_log_bin=1;
+--sync_with_master
 SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads;
 --source include/stop_slave.inc
 SET GLOBAL slave_parallel_threads=10;
 CHANGE MASTER TO master_use_gtid=slave_pos;
 
 --connection server_1
-ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB;
 CREATE TABLE t4 (a INT PRIMARY KEY, b INT, KEY b_idx(b)) ENGINE=InnoDB;
 INSERT INTO t4 VALUES (1,NULL), (2,2), (3,NULL), (4,4), (5, NULL), (6, 6);
 --connect (con1,127.0.0.1,root,,test,$SERVER_MYPORT_1,)
diff --git a/mysql-test/suite/rpl/t/rpl_xa_2pc_multi_engine.test b/mysql-test/suite/rpl/t/rpl_xa_2pc_multi_engine.test
new file mode 100644
index 00000000000..854935ae6a5
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_xa_2pc_multi_engine.test
@@ -0,0 +1,63 @@
+#
+# This test ensures binlog order is correct for multi-engine, two-phase XA
+# transactions. MDEV-26652 exposed a race condition which would allow
+# concurrent transactions which modify the same table record to binlog in
+# the "opposite" order, i.e. what _should_ be:
+#   T1 XA PREPARE
+#   T1 XA COMMIT
+#   T2
+#
+# was binlogged as
+#   T1 XA PREPARE
+#   T2
+#   T1 XA COMMIT
+#
+# which would break replication.
+#
+# Note that the actual fix for this issue was done with MDEV-21117.
+#
+# References:
+#   MDEV-26652: xa transactions binlogged in wrong order
+#   MDEV-21117: refine the server binlog-based recovery for semisync
+#
+source include/have_binlog_format_row.inc;
+source include/have_innodb.inc;
+source include/master-slave.inc;
+
+--connection master
+create table t1 (a int primary key, b int) engine=innodb;
+insert t1 values (1,1),(3,3),(5,5),(7,7);
+create table t2 (m int) engine=aria;
+
+
+--echo # Create multi-engine, two-phase XA transaction (T1)
+xa start '1';
+insert t2 values (1);
+update t1 set b=50 where b=5;
+xa end '1';
+
+# Aria doesn't support XA PREPARE, so disable warnings
+--disable_warnings
+xa prepare '1';
+--enable_warnings
+
+--echo # Create T2
+--connection server_1
+--send update t1 set b=10 where a=5
+
+--connection master
+xa commit '1';
+
+--connection server_1
+--reap
+--source include/save_master_gtid.inc
+
+--echo # This would hang prior to MDEV-21117
+--connection slave
+--source include/sync_with_master_gtid.inc
+
+--connection master
+drop table t1, t2;
+
+--source include/rpl_end.inc
+--echo # End of rpl_xa_2pc_multi_engine.test
diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb.result b/mysql-test/suite/sys_vars/r/sysvars_innodb.result
index fe7c07ce6c8..8c1f514c7fa 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_innodb.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_innodb.result
@@ -1487,10 +1487,10 @@ VARIABLE_NAME	INNODB_STATS_PERSISTENT_SAMPLE_PAGES
 SESSION_VALUE	NULL
 DEFAULT_VALUE	20
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	INT UNSIGNED
 VARIABLE_COMMENT	The number of leaf index pages to sample when calculating persistent statistics (by ANALYZE, default 20)
 NUMERIC_MIN_VALUE	1
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	4294967295
 NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -1511,10 +1511,10 @@ VARIABLE_NAME	INNODB_STATS_TRANSIENT_SAMPLE_PAGES
 SESSION_VALUE	NULL
 DEFAULT_VALUE	8
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	INT UNSIGNED
 VARIABLE_COMMENT	The number of leaf index pages to sample when calculating transient statistics (if persistent statistics are not used, default 8)
 NUMERIC_MIN_VALUE	1
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	4294967295
 NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
diff --git a/mysql-test/suite/sys_vars/r/wsrep_replicate_myisam_basic.result b/mysql-test/suite/sys_vars/r/wsrep_replicate_myisam_basic.result
new file mode 100644
index 00000000000..c8effa8c0f3
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/wsrep_replicate_myisam_basic.result
@@ -0,0 +1,15 @@
+#
+# wsrep_replicate_myisam
+#
+# save the initial value
+SET @wsrep_mode_saved = @@global.wsrep_mode;
+
+# scope and valid values
+SET @@global.wsrep_mode=REPLICATE_MYISAM;
+SELECT @@global.wsrep_mode;
+@@global.wsrep_mode
+REPLICATE_MYISAM
+
+# restore the initial value
+SET @@global.wsrep_mode = @wsrep_mode_saved;
+# End of test
diff --git a/mysql-test/suite/sys_vars/t/wsrep_replicate_myisam_basic.test b/mysql-test/suite/sys_vars/t/wsrep_replicate_myisam_basic.test
new file mode 100644
index 00000000000..49ccdec047a
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/wsrep_replicate_myisam_basic.test
@@ -0,0 +1,19 @@
+--source include/have_wsrep.inc
+
+--echo #
+--echo # wsrep_replicate_myisam
+--echo #
+
+--echo # save the initial value
+SET @wsrep_mode_saved = @@global.wsrep_mode;
+
+--echo
+--echo # scope and valid values
+SET @@global.wsrep_mode=REPLICATE_MYISAM;
+SELECT @@global.wsrep_mode;
+
+--echo
+--echo # restore the initial value
+SET @@global.wsrep_mode = @wsrep_mode_saved;
+
+--echo # End of test
diff --git a/mysql-test/suite/sys_vars/r/wsrep_forced_binlog_format_basic.result b/mysql-test/suite/wsrep/r/wsrep_forced_binlog_format.result
similarity index 100%
rename from mysql-test/suite/sys_vars/r/wsrep_forced_binlog_format_basic.result
rename to mysql-test/suite/wsrep/r/wsrep_forced_binlog_format.result
diff --git a/mysql-test/suite/wsrep/t/wsrep_forced_binlog_format.cnf b/mysql-test/suite/wsrep/t/wsrep_forced_binlog_format.cnf
new file mode 100644
index 00000000000..b1c96d2614d
--- /dev/null
+++ b/mysql-test/suite/wsrep/t/wsrep_forced_binlog_format.cnf
@@ -0,0 +1,7 @@
+!include ../my.cnf
+
+[mysqld.1]
+wsrep-on=ON
+wsrep-cluster-address=gcomm://
+wsrep-provider=@ENV.WSREP_PROVIDER
+binlog-format=ROW
diff --git a/mysql-test/suite/sys_vars/t/wsrep_forced_binlog_format_basic.test b/mysql-test/suite/wsrep/t/wsrep_forced_binlog_format.test
similarity index 91%
rename from mysql-test/suite/sys_vars/t/wsrep_forced_binlog_format_basic.test
rename to mysql-test/suite/wsrep/t/wsrep_forced_binlog_format.test
index 455034bb623..37e9c6c718e 100644
--- a/mysql-test/suite/sys_vars/t/wsrep_forced_binlog_format_basic.test
+++ b/mysql-test/suite/wsrep/t/wsrep_forced_binlog_format.test
@@ -1,4 +1,7 @@
---source include/have_wsrep.inc
+--source include/have_innodb.inc
+--source include/have_wsrep_provider.inc
+--source include/have_binlog_format_row.inc
+
 
 --echo #
 --echo # wsrep_forced_binlog_format
diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c
index a563d52c0e9..2307341ddb2 100644
--- a/mysys/mf_keycache.c
+++ b/mysys/mf_keycache.c
@@ -3762,10 +3762,11 @@ static void free_block(SIMPLE_KEY_CACHE_CB *keycache, BLOCK_LINK *block)
 
 static int cmp_sec_link(const void *_a, const void *_b)
 {
-  BLOCK_LINK *const *a= _a;
-  BLOCK_LINK *const *b= _b;
-  return (((*a)->hash_link->diskpos < (*b)->hash_link->diskpos) ? -1 :
-      ((*a)->hash_link->diskpos > (*b)->hash_link->diskpos) ? 1 : 0);
+  const BLOCK_LINK *a= *(const BLOCK_LINK **)_a;
+  const BLOCK_LINK *b= *(const BLOCK_LINK **)_b;
+
+  return (a->hash_link->diskpos < b->hash_link->diskpos) ? -1 :
+      (a->hash_link->diskpos > b->hash_link->diskpos) ? 1 : 0;
 }
 
 
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index b4604e5f249..8738c7b70d1 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -114,6 +114,7 @@ SET (SQL_SOURCE
                mysqld.cc net_serv.cc  keycaches.cc
                ../sql-common/client_plugin.c
                opt_range.cc vector_mhnsw.cc
+               opt_group_by_cardinality.cc
                opt_rewrite_date_cmp.cc
                opt_rewrite_remove_casefold.cc
                opt_sargable_left.cc
diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc
index 823440aec34..a994e810238 100644
--- a/sql/item_geofunc.cc
+++ b/sql/item_geofunc.cc
@@ -86,6 +86,15 @@ String *Item_func_geometry_from_wkb::val_str(String *str)
   {
     String *str_ret= args[0]->val_str(str);
     null_value= args[0]->null_value;
+    if (!null_value && arg_count == 2 && !args[1]->null_value) {
+      srid= (uint32)args[1]->val_int();
+
+      if (str->copy(*str_ret))
+        return 0;
+
+      int4store(str->ptr(), srid);
+      return str;
+    }
     return str_ret;
   }
 
diff --git a/sql/opt_group_by_cardinality.cc b/sql/opt_group_by_cardinality.cc
new file mode 100644
index 00000000000..8b58096cfd1
--- /dev/null
+++ b/sql/opt_group_by_cardinality.cc
@@ -0,0 +1,376 @@
+/*
+   Copyright (c) 2025, MariaDB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA */
+
+/**
+  @file
+
+    Contains estimate_post_group_cardinality() which estimates cardinality
+    after GROUP BY operation is applied.
+*/
+
+#include "mariadb.h"
+#include "sql_priv.h"
+#include "sql_select.h"
+#include "sql_statistics.h"
+#include "opt_trace.h"
+
+static
+double estimate_table_group_cardinality(JOIN *join, Item ***group_list,
+                                        Item* const *end);
+
+inline bool has_one_bit_set(table_map val)
+{
+  return val && !(val & (val-1));
+}
+
+
+/*
+  @brief
+    Sort the Items that refer to one table (so have only one bit in
+    used_tables()). Used to get the items that refer to the same table
+    to be next to each other.
+*/
+
+int cmp_items_by_used_tables(const void *a_val, const void *b_val)
+{
+  table_map v1= (*((Item**)a_val))->used_tables();
+  table_map v2= (*((Item**)b_val))->used_tables();
+  return v1 > v2 ? 1 : (v1 < v2 ? -1 : 0);
+}
+
+
+/*
+  @brief
+    Given a SELECT with GROUP BY clause, estimate the cardinality of output
+    after the grouping operation is performed.
+
+  @detail
+    Consider a query
+
+      SELECT ...
+      FROM t1, t2, t3 ...
+      WHERE ...
+      GROUP BY
+        col1, col2, ...
+
+    Join optimizer produces an estimate of number of record combinations we'll
+    get after all join operations are performed (denote this join_output_card).
+    This function produces a conservative (i.e. upper bound) estimate of how
+    many groups will be produced by the GROUP BY operation.
+
+    It does it as follows:
+    * Split the GROUP BY clause into per-table lists.
+      (if there are GROUP BY items that refer to multiple tables, refuse
+      to work and return join_output_card).
+    * Compute n_groups estimate for each table and its GROUP BY sub-list.
+    * Compute a product of these estimates, n_groups_prod.
+    * Return MIN(join_ouput_card, n_groups_prod).
+
+  @param
+    join_output_card  Number of rows after join operation
+
+  @return
+    Number of rows that will be left after grouping operation
+*/
+
+double estimate_post_group_cardinality(JOIN *join, double join_output_card)
+{
+  Dynamic_array<Item*> group_cols(join->thd->mem_root);
+  ORDER *cur_group;
+
+  Json_writer_object wrapper(join->thd);
+  Json_writer_object trace(join->thd, "materialized_output_cardinality");
+  trace.add("join_output_cardinality", join_output_card);
+
+  /*
+    Walk the GROUP BY list and put items into group_cols array. Array is
+    easier to work with: we will sort it and then produce estimates for
+    sub-arrays that refer to just one table.
+    Also check that each item depends on just one table (if not, bail out).
+  */
+  for (cur_group= join->group_list; cur_group; cur_group= cur_group->next)
+  {
+    Item *item= *cur_group->item;
+    table_map map= item->used_tables();
+    if ((map & PSEUDO_TABLE_BITS) || !has_one_bit_set(map))
+    {
+      /* Can't estimate */
+      return join_output_card;
+    }
+    group_cols.append(item);
+  }
+  DBUG_ASSERT(group_cols.size());
+
+  group_cols.sort(cmp_items_by_used_tables);
+
+  double new_card= 1.0;
+  Item **pos= group_cols.front();
+  Json_writer_array trace_steps(join->thd, "estimation");
+
+  while (pos != group_cols.end())
+  {
+    new_card *= estimate_table_group_cardinality(join, &pos, group_cols.end());
+
+    if (new_card > join_output_card)
+      return join_output_card;
+  }
+
+  trace_steps.end();
+  trace.add("post_group_cardinality", new_card);
+  return new_card;
+}
+
+
+/*
+  @brief
+    Compute number of groups for a GROUP BY list that refers to a single table
+
+  @detail
+    Consider a query:
+
+      SELECT ...
+      FROM t1, t2, t3 ...
+      WHERE ...
+      GROUP BY
+        t1.col1, ... t1.colN    -- expressions only refer to t1.
+
+    The number of groups is estimated using the following:
+
+    == 1. Use found_records ==
+    There cannot be more rows than the number of records in t1 that match the
+    WHERE clause, that is, JOIN_TAB(t1)->found_records.
+    This estimate doesn't depend on the expressions in the GROUP BY list, so we
+    use it as a fall-back estimate.
+
+    == 2. Use index statistics ==
+    If t1 has an INDEX(col1, ... colN) then the number of different
+    combinations of {col1, ..., colN} can be obtained from index statistics.
+
+    It is possible to cover the GROUP BY list with several indexes (without
+    overlaps) and use a product of n_distinct statistics. For example, for
+
+      GROUP BY key1part1, key1part2,   key2part1, key2part2, key2part3
+
+    the estimate would be:
+
+      n_groups= n_distinct(key1, parts=2) * n_distinct(key2, parts=3)
+
+    There can be multiple ways one can cover GROUP BY list with different
+    indexes. We try to use indexes that cover more GROUP BY columns, first.
+    This may cause us to fail later. For example, for
+
+     GROUP BY a, b, c, d
+
+    and indexes
+      INDEX idx1(a,b,c)
+      INDEX idx2(a,b)
+      INDEX idx3(c,d)
+
+    We will use idx1 and then will be unable to get any estimate for column d.
+    We could have used idx2 and idx3, instead, and could have covered all
+    columns. We ignore such cases.
+
+    Note that when using index statistics, we ignore the WHERE condition
+    selectivity. That's because we cannot tell how the WHERE affects index
+    stats. Does it
+     A. reduce the number of GROUP BY groups, or
+     B. make each GROUP BY group smaller ?
+    We conservatively assume that B holds.
+
+    == 3 Use per-column EITS statistics ==
+    If we fail to cover GROUP BY with indexes, we try to use column statistics
+    for the remaining columns.
+
+  @param join the          Join object we're computing for
+  @param group_list INOUT  Array of Item* from GROUP BY clause, ordered
+                           by table. This function should process the table
+                           it is pointing to, and advance the pointer so it
+                           points at 'end' or at the next table.
+  @param end        IN     End of the above array.
+
+*/
+
+double estimate_table_group_cardinality(JOIN *join, Item ***group_list,
+                                        Item* const *end)
+{
+  TABLE *table= NULL;
+  key_map possible_keys;
+  Dynamic_array<int> columns(join->thd->mem_root);
+  double card= 1.0;
+  double table_records_after_where= DBL_MAX; // Safety
+
+  table_map table_bit= (**group_list)->used_tables();
+  /*
+    join->map2table is not set yet, so find our table in JOIN_TABs.
+  */
+  for (JOIN_TAB *tab= join->join_tab;
+       tab < join->join_tab + join->top_join_tab_count;
+       tab++)
+  {
+    if (tab->table->map == table_bit)
+    {
+      table= tab->table;
+      table_records_after_where= rows2double(tab->found_records);
+      break;
+    }
+  }
+  DBUG_ASSERT(table);
+
+  Json_writer_object trace_obj(join->thd);
+  trace_obj.add_table_name(table);
+  Json_writer_array trace_steps(join->thd, "steps");
+
+  possible_keys.clear_all();
+  bool found_complex_item= false;
+
+  /*
+    Walk through the group list and collect references to fields.
+    If there are other kinds of items, return table's cardinality.
+  */
+  Item **p;
+  for (p= *group_list;
+       p != end && (*p)->used_tables() == table_bit;
+       p++)
+  {
+    Item *real= (*p)->real_item();
+    if (real->type() == Item::FIELD_ITEM)
+    {
+      Field *field= ((Item_field*)real)->field;
+      possible_keys.merge(field->part_of_key);
+      columns.append(field->field_index);
+    }
+    else
+      found_complex_item= true;
+  }
+
+  /* Tell the caller where group_list ended */
+  *group_list= p;
+
+  if (found_complex_item)
+    goto whole_table;
+
+  possible_keys.intersect(table->keys_in_use_for_query);
+  /*
+    Ok, group_list has only columns and we've got them in 'columns'.
+  */
+  while (!possible_keys.is_clear_all())
+  {
+    /* Find the index which has the longest prefix covered by columns. */
+    uint longest_key= UINT_MAX;
+    int longest_len= 0;
+    key_map::Iterator key_it(possible_keys);
+    uint key;
+    while ((key= key_it++) != key_map::Iterator::BITMAP_END)
+    {
+      const KEY *keyinfo= table->key_info + key;
+
+      /* Find the length of index prefix covered by GROUP BY columns */
+      int part;
+      for (part= 0; part < (int)keyinfo->usable_key_parts; part++)
+      {
+        uint field_index= keyinfo->key_part[part].field->field_index;
+        if (columns.find_first(field_index) == columns.NOT_FOUND)
+          break;
+      }
+
+      if (part > 0) // At least one column is covered
+      {
+        /* Make sure the index has statistics available */
+        if (!keyinfo->actual_rec_per_key(part - 1))
+        {
+          possible_keys.clear_bit(key);
+          continue;
+        }
+        if (part > longest_len)
+        {
+          longest_len= part;
+          longest_key= key;
+        }
+      }
+      else
+      {
+        /*
+          The index can't cover even one-column prefix. Remove it from
+          consideration.
+        */
+        possible_keys.clear_bit(key);
+      }
+    }
+
+    if (longest_key == UINT_MAX)
+      break; // No indexes are usable, stop.
+
+    possible_keys.clear_bit(longest_key);
+    /* Multiply cardinality by index prefix's cardinality */
+    const KEY *keyinfo= table->key_info + longest_key;
+    double index_card= (rows2double(table->stat_records()) /
+             keyinfo->actual_rec_per_key(longest_len-1));
+
+    /* Safety in case of inconsistent statistics: */
+    set_if_bigger(index_card, 1.0);
+
+    Json_writer_object trace_idx(join->thd);
+    trace_idx.add("index_name", keyinfo->name)
+             .add("cardinality", index_card);
+    card *= index_card;
+    if (card > table_records_after_where)
+      goto whole_table;
+
+    /* Remove the columns we've handled from consideration */
+    for (int part= 0; part < longest_len; part++)
+    {
+      uint field_index= keyinfo->key_part[part].field->field_index;
+      size_t idx= columns.find_first(field_index);
+      if (idx != columns.NOT_FOUND)
+        columns.del(idx);
+      else
+        DBUG_ASSERT(0); // Can't happen, we've found it above.
+    }
+
+    if (!columns.size())
+      break; // If we've covered all columns, stop.
+  }
+
+  /*
+    If there are some columns left for which we couldn't get cardinality
+    from index statistics, try getting it from columns' histograms
+  */
+  for (size_t i=0; i < columns.size(); i++)
+  {
+    double freq;
+    Field *field= table->field[columns.at(i)];
+    if (!field->read_stats ||
+        (freq= field->read_stats->get_avg_frequency()) == 0.0)
+      goto whole_table;
+    double column_card= rows2double(table->stat_records()) / freq;
+    Json_writer_object trace_col(join->thd);
+    trace_col.add("column", field->field_name)
+             .add("cardinality", column_card);
+    card *= column_card;
+    if (card > table_records_after_where)
+      goto whole_table;
+  }
+
+normal_exit:
+  trace_steps.end();
+  trace_obj.add("cardinality", card);
+  return card;
+
+whole_table:
+  card= table_records_after_where;
+  goto normal_exit;
+}
+
diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index bc8519cd7f6..2c656d3d32e 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -8793,6 +8793,11 @@ SEL_TREE *Item_cond::get_mm_tree(RANGE_OPT_PARAM *param, Item **cond_ptr)
   SEL_TREE *tree= li.ref()[0]->get_mm_tree(param, li.ref());
   if (param->statement_should_be_aborted())
     DBUG_RETURN(NULL);
+  bool orig_disable_index_merge= param->disable_index_merge_plans;
+
+  if (list.elements > MAX_OR_ELEMENTS_FOR_INDEX_MERGE)
+    param->disable_index_merge_plans= true;
+
   if (tree)
   {
     if (tree->type == SEL_TREE::IMPOSSIBLE &&
@@ -8809,7 +8814,10 @@ SEL_TREE *Item_cond::get_mm_tree(RANGE_OPT_PARAM *param, Item **cond_ptr)
     {
       SEL_TREE *new_tree= li.ref()[0]->get_mm_tree(param, li.ref());
       if (new_tree == NULL || param->statement_should_be_aborted())
+      {
+        param->disable_index_merge_plans= orig_disable_index_merge;
         DBUG_RETURN(NULL);
+      }
       tree= tree_or(param, tree, new_tree);
       if (tree == NULL || tree->type == SEL_TREE::ALWAYS)
       {
@@ -8841,6 +8849,7 @@ SEL_TREE *Item_cond::get_mm_tree(RANGE_OPT_PARAM *param, Item **cond_ptr)
     if (replace_cond)
       *cond_ptr= replacement_item;
   }
+  param->disable_index_merge_plans= orig_disable_index_merge;
   DBUG_RETURN(tree);
 }
 
@@ -10397,6 +10406,8 @@ tree_or(RANGE_OPT_PARAM *param,SEL_TREE *tree1,SEL_TREE *tree2)
   {
     bool must_be_ored= sel_trees_must_be_ored(param, tree1, tree2, ored_keys);
     no_imerge_from_ranges= must_be_ored;
+    if (param->disable_index_merge_plans)
+      no_imerge_from_ranges= true;
 
     if (no_imerge_from_ranges && no_merges1 && no_merges2)
     {
diff --git a/sql/opt_range.h b/sql/opt_range.h
index 9c3395be273..532ac3f9323 100644
--- a/sql/opt_range.h
+++ b/sql/opt_range.h
@@ -35,6 +35,32 @@
 class JOIN;
 class Item_sum;
 
+/*
+  When processing an OR clause with more than MAX_OR_ELEMENTS_FOR_INDEX_MERGE
+  disjuncts (i.e. OR-parts), do not construct index_merge plans from it.
+
+  Some users have OR clauses with extremely large number of disjuncts, like:
+
+      (key1=1 AND key2=10) OR
+      (key1=2 AND key2=20) OR
+      (key1=3 AND key2=30) OR
+      ...
+
+  When processing this, the optimizer would try to build a lot of potential
+  index_merge plans. Hypothetically this could be useful as the cheapest plan
+  could be to pick a specific index for each disjunct and build:
+
+     index_merge(key1 IN (1,3,8,15...), key2 IN (20, 40, 50 ...))
+
+  In practice this causes combinatorial amount of time to be spent in the range
+  analyzer, and most variants will be discarded when the range optimizer tries
+  to avoid this combinatorial explosion (which may or may not work depending on
+  the form of the WHERE clause).
+  In practice, very long ORs are served well enough by just considering range
+  accesses on individual indexes.
+*/
+const int MAX_OR_ELEMENTS_FOR_INDEX_MERGE=100;
+
 struct KEY_PART {
   uint16           key,part;
   /* See KEY_PART_INFO for meaning of the next two: */
@@ -887,6 +913,9 @@ public:
   */
   bool remove_false_where_parts;
 
+  /* If TRUE, do not construct index_merge plans */
+  bool disable_index_merge_plans;
+
   /*
     Which functions should give SQL notes for unusable keys.
   */
diff --git a/sql/sp_head.cc b/sql/sp_head.cc
index c051e37bbdd..5f1f6c04b80 100644
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
@@ -3868,8 +3868,10 @@ bool sp_head::add_for_loop_open_cursor(THD *thd, sp_pcontext *spcont,
                                         spcont, coffset, false);
   if (instr_cfetch == NULL || add_instr(instr_cfetch))
     return true;
-  instr_cfetch->add_to_varlist(index);
-  return false;
+  const sp_rcontext_addr raddr(&sp_rcontext_handler_local, index->offset);
+  sp_fetch_target *target=
+    new (thd->mem_root) sp_fetch_target(index->name, raddr);
+  return !target || instr_cfetch->add_to_fetch_target_list(target);
 }
 
 
diff --git a/sql/sp_instr.cc b/sql/sp_instr.cc
index 8a0dd04e344..a87d1c31756 100644
--- a/sql/sp_instr.cc
+++ b/sql/sp_instr.cc
@@ -1985,7 +1985,7 @@ sp_instr_cfetch::execute(THD *thd, uint *nextp)
   Query_arena backup_arena;
   DBUG_ENTER("sp_instr_cfetch::execute");
 
-  res= c ? c->fetch(thd, &m_varlist, m_error_on_no_data) : -1;
+  res= c ? c->fetch(thd, &m_fetch_target_list, m_error_on_no_data) : -1;
 
   *nextp= m_ip+1;
   DBUG_RETURN(res);
@@ -1995,8 +1995,8 @@ sp_instr_cfetch::execute(THD *thd, uint *nextp)
 void
 sp_instr_cfetch::print(String *str)
 {
-  List_iterator_fast<sp_variable> li(m_varlist);
-  sp_variable *pv;
+  List_iterator_fast<sp_fetch_target> li(m_fetch_target_list);
+  sp_fetch_target *pv;
   const LEX_CSTRING *cursor_name= m_ctx->find_cursor(m_cursor);
 
   /* cfetch name@offset vars... */
@@ -2015,12 +2015,14 @@ sp_instr_cfetch::print(String *str)
   str->qs_append(m_cursor);
   while ((pv= li++))
   {
-    if (str->reserve(pv->name.length+SP_INSTR_UINT_MAXLEN+2))
+    const LEX_CSTRING *prefix= pv->rcontext_handler()->get_name_prefix();
+    if (str->reserve(pv->name.length+prefix->length+SP_INSTR_UINT_MAXLEN+2))
       return;
     str->qs_append(' ');
+    str->qs_append(prefix);
     str->qs_append(&pv->name);
     str->qs_append('@');
-    str->qs_append(pv->offset);
+    str->qs_append(pv->offset());
   }
 }
 
diff --git a/sql/sp_instr.h b/sql/sp_instr.h
index 8b5c23b4774..59857bda590 100644
--- a/sql/sp_instr.h
+++ b/sql/sp_instr.h
@@ -591,7 +591,8 @@ public:
 }; // class sp_instr_stmt : public sp_lex_instr
 
 
-class sp_instr_set : public sp_lex_instr
+class sp_instr_set : public sp_lex_instr,
+                     public sp_rcontext_addr
 {
   sp_instr_set(const sp_instr_set &);	/**< Prevent use of these */
   void operator=(sp_instr_set &);
@@ -603,8 +604,7 @@ public:
                LEX *lex, bool lex_resp,
 	       const LEX_CSTRING &expr_str)
     : sp_lex_instr(ip, ctx, lex, lex_resp),
-      m_rcontext_handler(rh),
-      m_offset(offset),
+      sp_rcontext_addr(rh, offset),
       m_value(val),
       m_expr_str(expr_str)
   {}
@@ -651,8 +651,6 @@ protected:
   }
 
   sp_rcontext *get_rcontext(THD *thd) const;
-  const Sp_rcontext_handler *m_rcontext_handler;
-  uint m_offset;		///< Frame offset
   Item *m_value;
 
 private:
@@ -1515,7 +1513,7 @@ public:
       m_cursor(c),
       m_error_on_no_data(error_on_no_data)
   {
-    m_varlist.empty();
+    m_fetch_target_list.empty();
   }
 
   virtual ~sp_instr_cfetch() = default;
@@ -1524,14 +1522,19 @@ public:
 
   void print(String *str) override;
 
-  void add_to_varlist(sp_variable *var)
+  bool add_to_fetch_target_list(sp_fetch_target *target)
   {
-    m_varlist.push_back(var);
+    return m_fetch_target_list.push_back(target);
+  }
+
+  void set_fetch_target_list(List<sp_fetch_target> *list)
+  {
+    m_fetch_target_list= *list;
   }
 
 private:
   uint m_cursor;
-  List<sp_variable> m_varlist;
+  List<sp_fetch_target> m_fetch_target_list;
   bool m_error_on_no_data;
 
 public:
diff --git a/sql/sp_pcontext.h b/sql/sp_pcontext.h
index 164624fdfe4..4ba199040a6 100644
--- a/sql/sp_pcontext.h
+++ b/sql/sp_pcontext.h
@@ -83,6 +83,27 @@ public:
                                          uint *row_field_offset);
 };
 
+
+/*
+  This class stores FETCH statement target variables:
+    FETCH cur INTO t1, t2, t2;
+  Targets can be:
+  - Local SP variables
+  - PACKAGE BODY variables
+*/
+class sp_fetch_target: public Sql_alloc,
+                       public sp_rcontext_addr
+{
+public:
+  LEX_CSTRING name;
+
+  sp_fetch_target(const LEX_CSTRING &name_arg, const sp_rcontext_addr &addr)
+   :sp_rcontext_addr(addr),
+    name(name_arg)
+  { }
+};
+
+
 ///////////////////////////////////////////////////////////////////////////
 
 /// This class represents an SQL/PSM label. Can refer to the identifier
diff --git a/sql/sp_rcontext.cc b/sql/sp_rcontext.cc
index 15b8fc77c7b..087ecd5c1cf 100644
--- a/sql/sp_rcontext.cc
+++ b/sql/sp_rcontext.cc
@@ -749,7 +749,8 @@ void sp_cursor::destroy()
 }
 
 
-int sp_cursor::fetch(THD *thd, List<sp_variable> *vars, bool error_on_no_data)
+int sp_cursor::fetch(THD *thd, List<sp_fetch_target> *vars,
+                     bool error_on_no_data)
 {
   if (! server_side_cursor)
   {
@@ -759,8 +760,7 @@ int sp_cursor::fetch(THD *thd, List<sp_variable> *vars, bool error_on_no_data)
   }
   if (vars->elements != result.get_field_count() &&
       (vars->elements != 1 ||
-       result.get_field_count() !=
-       thd->spcont->get_variable(vars->head()->offset)->cols()))
+       result.get_field_count() != thd->get_variable(*vars->head())->cols()))
   {
     my_message(ER_SP_WRONG_NO_OF_FETCH_ARGS,
                ER_THD(thd, ER_SP_WRONG_NO_OF_FETCH_ARGS), MYF(0));
@@ -827,11 +827,12 @@ int sp_cursor::Select_fetch_into_spvars::prepare(List<Item> &fields,
 
 
 bool sp_cursor::Select_fetch_into_spvars::
-       send_data_to_variable_list(List<sp_variable> &vars, List<Item> &items)
+       send_data_to_variable_list(List<sp_fetch_target> &vars,
+                                  List<Item> &items)
 {
-  List_iterator_fast<sp_variable> spvar_iter(vars);
+  List_iterator_fast<sp_fetch_target> spvar_iter(vars);
   List_iterator_fast<Item> item_iter(items);
-  sp_variable *spvar;
+  sp_fetch_target *spvar;
   Item *item;
 
   /* Must be ensured by the caller */
@@ -843,7 +844,7 @@ bool sp_cursor::Select_fetch_into_spvars::
   */
   for (; spvar= spvar_iter++, item= item_iter++; )
   {
-    if (thd->spcont->set_variable(thd, spvar->offset, &item))
+    if (thd->get_rcontext(*spvar)->set_variable(thd, spvar->offset(), &item))
       return true;
   }
   return false;
@@ -852,7 +853,6 @@ bool sp_cursor::Select_fetch_into_spvars::
 
 int sp_cursor::Select_fetch_into_spvars::send_data(List<Item> &items)
 {
-  Item *item;
   /*
     If we have only one variable in spvar_list, and this is a ROW variable,
     and the number of fields in the ROW variable matches the number of
@@ -863,10 +863,15 @@ int sp_cursor::Select_fetch_into_spvars::send_data(List<Item> &items)
     we go through send_data_to_variable_list(). It will report an error
     on attempt to assign a scalar value to a ROW variable.
   */
-  return spvar_list->elements == 1 &&
-         (item= thd->spcont->get_variable(spvar_list->head()->offset)) &&
-         item->type_handler() == &type_handler_row &&
-         item->cols() == items.elements ?
-    thd->spcont->set_variable_row(thd, spvar_list->head()->offset, items) :
-    send_data_to_variable_list(*spvar_list, items);
+  if (m_fetch_target_list->elements == 1)
+  {
+    const sp_fetch_target *target= m_fetch_target_list->head();
+    sp_rcontext *rctx= thd->get_rcontext(*target);
+    Item *item;
+    if ((item= rctx->get_variable(target->offset())) &&
+        item->type_handler() == &type_handler_row &&
+        item->cols() == items.elements)
+    return rctx->set_variable_row(thd, target->offset(), items);
+  }
+  return send_data_to_variable_list(*m_fetch_target_list, items);
 }
diff --git a/sql/sql_array.h b/sql/sql_array.h
index d3b20af605e..812e8aae12b 100644
--- a/sql/sql_array.h
+++ b/sql/sql_array.h
@@ -182,6 +182,19 @@ public:
     return ((const Elem*)array.buffer) + array.elements - 1;
   }
 
+  static const size_t NOT_FOUND= (size_t)-1;
+
+  /// @returns index of the first element equal to el, or NOT_FOUND
+  size_t find_first(const Elem &el) const
+  {
+    for (size_t i=0; i < size() ; i++)
+    {
+      if (el == at(i))
+        return i;
+    }
+    return NOT_FOUND;
+  }
+
   size_t size() const { return array.elements; }
 
   const Elem *end() const
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 2d09103f84b..c3e9d3b7b58 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -4466,6 +4466,18 @@ bool my_var_sp_row_field::set(THD *thd, Item *item)
 }
 
 
+sp_rcontext *THD::get_rcontext(const sp_rcontext_addr &addr)
+{
+  return addr.rcontext_handler()->get_rcontext(spcont);
+}
+
+
+Item_field *THD::get_variable(const sp_rcontext_addr &addr)
+{
+  return get_rcontext(addr)->get_variable(addr.offset());
+}
+
+
 bool select_dumpvar::send_data_to_var_list(List<Item> &items)
 {
   DBUG_ENTER("select_dumpvar::send_data_to_var_list");
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 6c73bc58638..2eff34f3ae0 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -4081,6 +4081,9 @@ public:
 
   sp_rcontext *spcont;		// SP runtime context
 
+  sp_rcontext *get_rcontext(const sp_rcontext_addr &addr);
+  Item_field *get_variable(const sp_rcontext_addr &addr);
+
   /** number of name_const() substitutions, see sp_head.cc:subst_spvars() */
   uint       query_name_consts;
 
@@ -6480,10 +6483,11 @@ private:
   /// FETCH <cname> INTO <varlist>.
   class Select_fetch_into_spvars: public select_result_interceptor
   {
-    List<sp_variable> *spvar_list;
+    List<sp_fetch_target> *m_fetch_target_list;
     uint field_count;
     bool m_view_structure_only;
-    bool send_data_to_variable_list(List<sp_variable> &vars, List<Item> &items);
+    bool send_data_to_variable_list(List<sp_fetch_target> &vars,
+                                    List<Item> &items);
   public:
     Select_fetch_into_spvars(THD *thd_arg, bool view_structure_only)
      :select_result_interceptor(thd_arg),
@@ -6492,11 +6496,14 @@ private:
     void reset(THD *thd_arg)
     {
       select_result_interceptor::reinit(thd_arg);
-      spvar_list= NULL;
+      m_fetch_target_list= NULL;
       field_count= 0;
     }
     uint get_field_count() { return field_count; }
-    void set_spvar_list(List<sp_variable> *vars) { spvar_list= vars; }
+    void set_spvar_list(List<sp_fetch_target> *vars)
+    {
+      m_fetch_target_list= vars;
+    }
 
     bool send_eof() override { return FALSE; }
     int send_data(List<Item> &items) override;
@@ -6526,7 +6533,7 @@ public:
   my_bool is_open()
   { return MY_TEST(server_side_cursor); }
 
-  int fetch(THD *, List<sp_variable> *vars, bool error_on_no_data);
+  int fetch(THD *, List<sp_fetch_target> *vars, bool error_on_no_data);
 
   bool export_structure(THD *thd, Row_definition_list *list);
 
diff --git a/sql/sql_cmd.h b/sql/sql_cmd.h
index 6089593c123..27f3385b5bd 100644
--- a/sql/sql_cmd.h
+++ b/sql/sql_cmd.h
@@ -140,6 +140,7 @@ public:
   bool resolve_storage_engine_with_error(THD *thd, handlerton **ha,
                                          bool tmp_table);
   bool is_set() { return m_storage_engine_name.str != NULL; }
+  const LEX_CSTRING *name() const { return &m_storage_engine_name; }
 };
 
 
diff --git a/sql/sql_db.cc b/sql/sql_db.cc
index e88855eb6b5..16ccc2bebb1 100644
--- a/sql/sql_db.cc
+++ b/sql/sql_db.cc
@@ -534,36 +534,53 @@ static bool write_db_opt(THD *thd, const char *path,
 
   DESCRIPTION
 
+  create->default_table_charset is guaranteed to be alway set
+  Required by some callers
+
   RETURN VALUES
   0	File found
-  1	No database file or could not open it
-
+  -1	No database file (file was not found or 'empty' file was cached)
+  1     Could not open it
 */
 
-bool load_db_opt(THD *thd, const char *path, Schema_specification_st *create)
+int load_db_opt(THD *thd, const char *path, Schema_specification_st *create)
 {
   File file;
   char buf[256+DATABASE_COMMENT_MAXLEN];
   DBUG_ENTER("load_db_opt");
-  bool error=1;
+  int error= 0;
   size_t nbytes;
   myf utf8_flag= thd->get_utf8_flag();
 
   bzero((char*) create,sizeof(*create));
-  create->default_table_charset= thd->variables.collation_server;
 
   /* Check if options for this database are already in the hash */
   if (!get_dbopt(thd, path, create))
-    DBUG_RETURN(0);
+  {
+    if (!create->default_table_charset)
+      error= -1;                                // db.opt did not exists
+    goto err1;
+  }
 
   /* Otherwise, load options from the .opt file */
   if ((file= mysql_file_open(key_file_dbopt,
                              path, O_RDONLY | O_SHARE, MYF(0))) < 0)
+  {
+    /*
+      Create an empty entry, to avoid doing an extra file open for every create
+      table.
+    */
+    put_dbopt(path, create);
+    error= -1;
     goto err1;
+  }
 
   IO_CACHE cache;
   if (init_io_cache(&cache, file, IO_SIZE, READ_CACHE, 0, 0, MYF(0)))
-    goto err2;
+  {
+    error= 1;
+    goto err2;                                  // Not cached
+  }
 
   while ((int) (nbytes= my_b_gets(&cache, (char*) buf, sizeof(buf))) > 0)
   {
@@ -584,7 +601,7 @@ bool load_db_opt(THD *thd, const char *path, Schema_specification_st *create)
            default-collation commands.
         */
         if (!(create->default_table_charset=
-        get_charset_by_csname(pos+1, MY_CS_PRIMARY, MYF(utf8_flag))) &&
+              get_charset_by_csname(pos+1, MY_CS_PRIMARY, MYF(utf8_flag))) &&
             !(create->default_table_charset=
               get_charset_by_name(pos+1, MYF(utf8_flag))))
         {
@@ -619,10 +636,11 @@ bool load_db_opt(THD *thd, const char *path, Schema_specification_st *create)
 err2:
   mysql_file_close(file, MYF(0));
 err1:
+  if (!create->default_table_charset)           // In case of error
+    create->default_table_charset= thd->variables.collation_server;
   DBUG_RETURN(error);
 }
 
-
 /*
   Retrieve database options by name. Load database options file or fetch from
   cache.
@@ -649,11 +667,12 @@ err1:
     db_create_info right after that.
 
   RETURN VALUES (read NOTE!)
-    FALSE   Success
-    TRUE    Failed to retrieve options
+  0	File found
+  -1	No database file (file was not found or 'empty' file was cached)
+  1     Could not open it
 */
 
-bool load_db_opt_by_name(THD *thd, const char *db_name,
+int load_db_opt_by_name(THD *thd, const char *db_name,
                          Schema_specification_st *db_create_info)
 {
   char db_opt_path[FN_REFLEN + 1];
diff --git a/sql/sql_db.h b/sql/sql_db.h
index 5b97e845cec..018891e5628 100644
--- a/sql/sql_db.h
+++ b/sql/sql_db.h
@@ -37,8 +37,8 @@ bool mysql_opt_change_db(THD *thd,
 bool my_dboptions_cache_init(void);
 void my_dboptions_cache_free(void);
 bool check_db_dir_existence(const char *db_name);
-bool load_db_opt(THD *thd, const char *path, Schema_specification_st *create);
-bool load_db_opt_by_name(THD *thd, const char *db_name,
+int load_db_opt(THD *thd, const char *path, Schema_specification_st *create);
+int load_db_opt_by_name(THD *thd, const char *db_name,
                          Schema_specification_st *db_create_info);
 CHARSET_INFO *get_default_db_collation(THD *thd, const char *db_name);
 bool my_dbopt_init(void);
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 5e5641c594c..c473bec574d 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -6697,6 +6697,21 @@ LEX::find_variable(const LEX_CSTRING *name,
 }
 
 
+sp_fetch_target *LEX::make_fetch_target(THD *thd, const Lex_ident_sys_st &name)
+{
+  sp_pcontext *spc;
+  const Sp_rcontext_handler *rha;
+  sp_variable *spv= find_variable(&name, &spc, &rha);
+  if (unlikely(!spv))
+  {
+    my_error(ER_SP_UNDECLARED_VAR, MYF(0), name.str);
+    return nullptr;
+  }
+  return new (thd->mem_root) sp_fetch_target(name,
+                               sp_rcontext_addr(rha, spv->offset));
+}
+
+
 static bool is_new(const char *str)
 {
   return (str[0] == 'n' || str[0] == 'N') &&
@@ -7414,8 +7429,11 @@ bool LEX::sp_for_loop_cursor_iterate(THD *thd, const Lex_for_loop_st &loop)
                                         spcont, loop.m_cursor_offset, false);
   if (unlikely(instr == NULL) || unlikely(sphead->add_instr(instr)))
     return true;
-  instr->add_to_varlist(loop.m_index);
-  return false;
+  const sp_rcontext_addr raddr(&sp_rcontext_handler_local,
+                               loop.m_index->offset);
+  sp_fetch_target *trg=
+    new (thd->mem_root) sp_fetch_target(loop.m_index->name, raddr);
+  return !trg || instr->add_to_fetch_target_list(trg);
 }
 
 
@@ -9494,7 +9512,7 @@ int set_statement_var_if_exists(THD *thd, const char *var_name,
 }
 
 
-bool LEX::sp_add_cfetch(THD *thd, const LEX_CSTRING *name)
+sp_instr_cfetch *LEX::sp_add_instr_cfetch(THD *thd, const LEX_CSTRING *name)
 {
   uint offset;
   sp_instr_cfetch *i;
@@ -9502,14 +9520,14 @@ bool LEX::sp_add_cfetch(THD *thd, const LEX_CSTRING *name)
   if (!spcont->find_cursor(name, &offset, false))
   {
     my_error(ER_SP_CURSOR_MISMATCH, MYF(0), name->str);
-    return true;
+    return nullptr;
   }
   i= new (thd->mem_root)
     sp_instr_cfetch(sphead->instructions(), spcont, offset,
                     !(thd->variables.sql_mode & MODE_ORACLE));
   if (unlikely(i == NULL) || unlikely(sphead->add_instr(i)))
-    return true;
-  return false;
+    return nullptr;
+  return i;
 }
 
 
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index 7edc5ae0578..2113e0b1747 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -148,8 +148,10 @@ class LEX_COLUMN;
 class sp_head;
 class sp_name;
 class sp_instr;
+class sp_instr_cfetch;
 class sp_pcontext;
 class sp_variable;
+class sp_fetch_target;
 class sp_expr_lex;
 class sp_assignment_lex;
 class partition_info;
@@ -3872,6 +3874,7 @@ public:
     sp_pcontext *not_used_ctx;
     return find_variable(name, &not_used_ctx, rh);
   }
+  sp_fetch_target *make_fetch_target(THD *thd, const Lex_ident_sys_st &name);
   bool set_variable(const Lex_ident_sys_st *name, Item *item,
                     const LEX_CSTRING &expr_str);
   bool set_variable(const Lex_ident_sys_st *name1,
@@ -4502,7 +4505,7 @@ public:
     create_info.add(options);
     return check_create_options(create_info);
   }
-  bool sp_add_cfetch(THD *thd, const LEX_CSTRING *name);
+  sp_instr_cfetch *sp_add_instr_cfetch(THD *thd, const LEX_CSTRING *name);
   bool sp_add_agg_cfetch();
 
   bool set_command_with_check(enum_sql_command command,
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index c14afdc4679..8450b166497 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -6371,6 +6371,10 @@ make_join_statistics(JOIN *join, List<TABLE_LIST> &tables_list,
       for (i= 0; i < join->table_count ; i++)
         if (double rr= join->best_positions[i].records_read)
           records= COST_MULT(records, rr);
+
+      if (join->group_list)
+        records= estimate_post_group_cardinality(join, records);
+
       rows= double_to_rows(records);
       set_if_smaller(rows, unit->lim.get_select_limit());
       join->select_lex->increase_derived_records(rows);
@@ -15813,7 +15817,7 @@ uint check_join_cache_usage(JOIN_TAB *tab,
       }
       goto no_join_cache;
     }
-    if (cache_level > 4 && no_bka_cache)
+    if (cache_level < 5 || no_bka_cache)
       goto no_join_cache;
     
     if ((flags & HA_MRR_NO_ASSOCIATION) &&
diff --git a/sql/sql_select.h b/sql/sql_select.h
index 2925b5bc95c..2621bd4cd0d 100644
--- a/sql/sql_select.h
+++ b/sql/sql_select.h
@@ -2724,6 +2724,8 @@ void propagate_new_equalities(THD *thd, Item *cond,
 
 #define PREV_BITS(type, N_BITS) ((type)my_set_bits(N_BITS))
 
+double estimate_post_group_cardinality(JOIN *join, double join_output_card);
+
 bool dbug_user_var_equals_str(THD *thd, const char *name, const char *value);
 
 #include "opt_vcol_substitution.h"
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index b717b5c12bd..8d8ad22ebcb 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -1475,7 +1475,14 @@ bool mysqld_show_create_db(THD *thd, LEX_CSTRING *dbname,
       DBUG_RETURN(TRUE);
     }
 
-    load_db_opt_by_name(thd, dbname->str, &create);
+    if (load_db_opt_by_name(thd, dbname->str, &create) < 0)
+    {
+      push_warning_printf(thd, Sql_condition::WARN_LEVEL_NOTE,
+                          ER_UNKNOWN_ERROR,
+                          "Database '%.192s' does not have a db.opt file. "
+                          "You can create one with ALTER DATABASE if needed",
+                          dbname->str);
+    }
   }
 
   mysqld_show_create_db_get_fields(thd, &field_list);
@@ -3059,25 +3066,27 @@ void mysqld_list_processes(THD *thd,const char *user, bool verbose)
 
   while (thread_info *thd_info= arg.thread_infos.get())
   {
+    const char *str;
+    ulonglong start_time;
+    CSET_STRING query;
+
     protocol->prepare_for_resend();
     protocol->store(thd_info->thread_id);
     protocol->store(thd_info->user, strlen(thd_info->user), system_charset_info);
     protocol->store(thd_info->host, strlen(thd_info->host), system_charset_info);
     protocol->store_string_or_null(thd_info->db, system_charset_info);
-    if (thd_info->proc_info)
-      protocol->store(thd_info->proc_info, strlen(thd_info->proc_info),
-                      system_charset_info);
+    if ((str= thd_info->proc_info))
+      protocol->store(str, strlen(str), system_charset_info);
     else
       protocol->store(&command_name[thd_info->command], system_charset_info);
-    if (thd_info->start_time && now > thd_info->start_time)
-      protocol->store_long((now - thd_info->start_time) / HRTIME_RESOLUTION);
+    if ((start_time= thd_info->start_time) && now > start_time)
+      protocol->store_long((now - start_time) / HRTIME_RESOLUTION);
     else
       protocol->store_null();
     protocol->store_string_or_null(thd_info->state_info, system_charset_info);
-    if (thd_info->query_string.length())
-      protocol->store(thd_info->query_string.str(),
-                      thd_info->query_string.length(),
-                      thd_info->query_string.charset());
+    query= thd_info->query_string;
+    if (query.length() && query.str())
+      protocol->store(query.str(), query.length(), query.charset());
     else
       protocol->store_null();
     if (!(thd->variables.old_behavior & OLD_MODE_NO_PROGRESS_INFO))
diff --git a/sql/sql_statistics.cc b/sql/sql_statistics.cc
index 2e4984ba505..a12892a50f2 100644
--- a/sql/sql_statistics.cc
+++ b/sql/sql_statistics.cc
@@ -2079,12 +2079,9 @@ public:
 
     for (i= 0, state= calc_state; i < prefixes; i++, state++)
     {
-      if (i < prefixes)
-      {
-        double val= state->prefix_count == 0 ?
-	            0 : (double) state->entry_count / state->prefix_count;                     
-        index_info->collected_stats->set_avg_frequency(i, val);
-      }
+      double val= state->prefix_count == 0 ?
+                  0 : (double) state->entry_count / state->prefix_count;
+      index_info->collected_stats->set_avg_frequency(i, val);
     }
   }       
 };
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index a154bc6ca8e..513a0e881c8 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -1618,12 +1618,19 @@ int mysql_rm_table_no_locks(THD *thd, TABLE_LIST *tables,
     else
     {
 #ifdef WITH_WSREP
-      if (WSREP(thd) && hton && !wsrep_should_replicate_ddl(thd, hton))
+      if (WSREP(thd) && hton)
       {
-        error= 1;
-        goto err;
+        handlerton *ht= hton;
+        // For partitioned tables resolve underlying handlerton
+        if (table->table && table->table->file->partition_ht())
+          ht= table->table->file->partition_ht();
+        if (!wsrep_should_replicate_ddl(thd, ht))
+        {
+          error= 1;
+          goto err;
+        }
       }
-#endif
+#endif /* WITH_WSREP */
 
       error= -1;
       if (thd->locked_tables_mode == LTM_LOCK_TABLES ||
@@ -1899,18 +1906,6 @@ err:
   if (non_temp_tables_count)
     query_cache_invalidate3(thd, tables, 0);
 
-  /*
-    We are always logging drop of temporary tables.
-    The reason is to handle the following case:
-    - Use statement based replication
-    - CREATE TEMPORARY TABLE foo (logged)
-    - set row based replication
-    - DROP TEMPORARY TABLE foo   (needs to be logged)
-    This should be fixed so that we remember if creation of the
-    temporary table was logged and only log it if the creation was
-    logged.
-  */
-
   if (non_trans_tmp_table_deleted ||
       trans_tmp_table_deleted || non_tmp_table_deleted)
   {
@@ -5071,9 +5066,26 @@ bool wsrep_check_sequence(THD* thd,
     // In Galera cluster we support only InnoDB sequences
     if (db_type != DB_TYPE_INNODB)
     {
-      my_error(ER_NOT_SUPPORTED_YET, MYF(0),
-               "non-InnoDB sequences in Galera cluster");
-      return(true);
+      // Currently any dynamic storage engine is not possible to identify
+      // using DB_TYPE_XXXX and ENGINE=SEQUENCE is one of them.
+      // Therefore, we get storage engine name from lex.
+      const LEX_CSTRING *tb_name= thd->lex->m_sql_cmd->option_storage_engine_name()->name();
+      // (1) CREATE TABLE ... ENGINE=SEQUENCE  OR
+      // (2) ALTER TABLE ... ENGINE=           OR
+      //     Note in ALTER TABLE table->s->sequence != nullptr
+      // (3) CREATE SEQUENCE ... ENGINE=
+      if ((thd->lex->sql_command == SQLCOM_CREATE_TABLE &&
+           lex_string_eq(tb_name, STRING_WITH_LEN("SEQUENCE"))) ||
+          (thd->lex->sql_command == SQLCOM_ALTER_TABLE) ||
+          (thd->lex->sql_command == SQLCOM_CREATE_SEQUENCE))
+      {
+        my_error(ER_NOT_SUPPORTED_YET, MYF(0),
+                 "non-InnoDB sequences in Galera cluster");
+        push_warning_printf(thd, Sql_condition::WARN_LEVEL_NOTE,
+                            ER_NOT_SUPPORTED_YET,
+                            "ENGINE=%s not supported by Galera", tb_name->str);
+	return(true);
+      }
     }
 
     // In Galera cluster it is best to use INCREMENT BY 0 with CACHE
@@ -10806,10 +10818,21 @@ bool mysql_alter_table(THD *thd, const LEX_CSTRING *new_db,
   if (WSREP(thd) && table &&
       (thd->lex->sql_command == SQLCOM_ALTER_TABLE ||
        thd->lex->sql_command == SQLCOM_CREATE_INDEX ||
-       thd->lex->sql_command == SQLCOM_DROP_INDEX) &&
-      !wsrep_should_replicate_ddl(thd, table->s->db_type()))
-    DBUG_RETURN(true);
-#endif /* WITH_WSREP */
+       thd->lex->sql_command == SQLCOM_DROP_INDEX))
+  {
+    handlerton *ht= table->s->db_type();
+
+    // If alter used ENGINE= we use that
+    if (create_info->used_fields & HA_CREATE_USED_ENGINE)
+      ht= create_info->db_type;
+    // For partitioned tables resolve underlying handlerton
+    else if (table->file->partition_ht())
+      ht= table->file->partition_ht();
+
+    if (!wsrep_should_replicate_ddl(thd, ht))
+      DBUG_RETURN(true);
+  }
+#endif
 
   DEBUG_SYNC(thd, "alter_table_after_open_tables");
 
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc
index 9a968338eae..95ef0d5a008 100644
--- a/sql/sql_trigger.cc
+++ b/sql/sql_trigger.cc
@@ -622,7 +622,12 @@ bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create)
   table= tables->table;
 
 #ifdef WITH_WSREP
-  if (WSREP(thd) && !wsrep_should_replicate_ddl(thd, table->s->db_type()))
+  /* Resolve should we replicate creation of the trigger.
+     It should be replicated if storage engine(s) associated
+     to trigger are replicated by Galera.
+  */
+  if (WSREP(thd) &&
+      !wsrep_should_replicate_ddl_iterate(thd, tables))
     goto end;
 #endif
 
diff --git a/sql/sql_truncate.cc b/sql/sql_truncate.cc
index e6b46548567..660d79a2334 100644
--- a/sql/sql_truncate.cc
+++ b/sql/sql_truncate.cc
@@ -332,8 +332,15 @@ bool Sql_cmd_truncate_table::lock_table(THD *thd, TABLE_LIST *table_ref,
     versioned= table->versioned();
     hton= table->file->ht;
 #ifdef WITH_WSREP
+    /* Resolve should we replicate truncate. It should
+       be replicated if storage engine(s) associated
+       are replicated by Galera. If this is partitioned
+       table we need to find out default partition
+       handlerton.
+    */
     if (WSREP(thd) &&
-	!wsrep_should_replicate_ddl(thd, hton))
+        !wsrep_should_replicate_ddl(thd, table->file->partition_ht() ?
+                                    table->file->partition_ht() : hton))
       DBUG_RETURN(TRUE);
 #endif
 
@@ -355,12 +362,22 @@ bool Sql_cmd_truncate_table::lock_table(THD *thd, TABLE_LIST *table_ref,
     sequence= share->table_type == TABLE_TYPE_SEQUENCE;
     hton= share->db_type();
 #ifdef WITH_WSREP
-    if (WSREP(thd) &&
-	hton != view_pseudo_hton &&
-	!wsrep_should_replicate_ddl(thd, hton))
+    if (WSREP(thd) && hton != view_pseudo_hton)
     {
-      tdc_release_share(share);
-      DBUG_RETURN(TRUE);
+      /* Resolve should we replicate truncate. It should
+         be replicated if storage engine(s) associated
+         are replicated by Galera. If this is partitioned
+         table we need to find out default partition
+         handlerton.
+      */
+      const handlerton *ht= share->default_part_plugin ?
+        plugin_hton(share->default_part_plugin) : hton;
+
+      if (ht && !wsrep_should_replicate_ddl(thd, ht))
+      {
+        tdc_release_share(share);
+        DBUG_RETURN(TRUE);
+      }
     }
 #endif
 
diff --git a/sql/sql_view.cc b/sql/sql_view.cc
index 1822d0141cd..2e0240f6b3d 100644
--- a/sql/sql_view.cc
+++ b/sql/sql_view.cc
@@ -452,8 +452,6 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views,
   lex->link_first_table_back(view, link_to_local);
   view->open_type= OT_BASE_ONLY;
 
-  WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL);
-
   /*
     ignore lock specs for CREATE statement
   */
@@ -471,13 +469,20 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views,
   }
 
 #ifdef WITH_WSREP
-  if(!wsrep_should_replicate_ddl_iterate(thd, static_cast<const TABLE_LIST *>(tables)))
+  /* Resolve should we replicate creation of the view.
+     It should be replicated if storage engine(s) associated
+     to view are replicated by Galera.
+  */
+  if (WSREP(thd) &&
+      !wsrep_should_replicate_ddl_iterate(thd, tables))
   {
     res= TRUE;
     goto err_no_relink;
   }
 #endif
 
+  WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL);
+
   view= lex->unlink_first_table(&link_to_local);
 
   if (check_db_dir_existence(view->db.str))
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 59f3a714f6a..3f2b370ca87 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -258,6 +258,7 @@ void _CONCAT_UNDERSCORED(turn_parser_debug_on,yyparse)()
   Item_basic_constant *item_basic_constant;
   Key_part_spec *key_part;
   LEX *lex;
+  sp_instr_cfetch *instr_cfetch;
   sp_expr_lex *expr_lex;
   sp_assignment_lex *assignment_lex;
   class sp_lex_cursor *sp_cursor_stmt;
@@ -271,6 +272,7 @@ void _CONCAT_UNDERSCORED(turn_parser_debug_on,yyparse)()
   List<Statement_information_item> *stmt_info_list;
   List<String> *string_list;
   List<Lex_ident_sys> *ident_sys_list;
+  List<sp_fetch_target> *fetch_target_list;
   Statement_information_item *stmt_info_item;
   String *string;
   TABLE_LIST *table_list;
@@ -1586,6 +1588,12 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
         sp_cursor_stmt_lex
         sp_cursor_stmt
 
+%type <instr_cfetch>
+        sp_proc_stmt_fetch_head
+
+%type <fetch_target_list>
+        sp_fetch_list
+
 %type <expr_lex>
         expr_lex
 
@@ -4363,23 +4371,26 @@ sp_proc_stmt_open:
 sp_proc_stmt_fetch_head:
           FETCH_SYM ident INTO
           {
-            if (unlikely(Lex->sp_add_cfetch(thd, &$2)))
+            if (unlikely(!($$= Lex->sp_add_instr_cfetch(thd, &$2))))
               MYSQL_YYABORT;
           }
         | FETCH_SYM FROM ident INTO
           {
-            if (unlikely(Lex->sp_add_cfetch(thd, &$3)))
+            if (unlikely(!($$= Lex->sp_add_instr_cfetch(thd, &$3))))
               MYSQL_YYABORT;
           }
        | FETCH_SYM NEXT_SYM FROM ident INTO
           {
-            if (unlikely(Lex->sp_add_cfetch(thd, &$4)))
+            if (unlikely(!($$= Lex->sp_add_instr_cfetch(thd, &$4))))
               MYSQL_YYABORT;
           }
         ;
 
 sp_proc_stmt_fetch:
-         sp_proc_stmt_fetch_head sp_fetch_list { }
+         sp_proc_stmt_fetch_head sp_fetch_list
+         {
+           $1->set_fetch_target_list($2);
+         }
        | FETCH_SYM GROUP_SYM NEXT_SYM ROW_SYM
          {
            if (unlikely(Lex->sp_add_agg_cfetch()))
@@ -4408,35 +4419,16 @@ sp_proc_stmt_close:
 sp_fetch_list:
           ident
           {
-            LEX *lex= Lex;
-            sp_head *sp= lex->sphead;
-            sp_pcontext *spc= lex->spcont;
-            sp_variable *spv= likely(spc != NULL)
-              ? spc->find_variable(&$1, false)
-              : NULL;
-
-            if (unlikely(!spv))
-              my_yyabort_error((ER_SP_UNDECLARED_VAR, MYF(0), $1.str));
-
-            /* An SP local variable */
-            sp_instr_cfetch *i= (sp_instr_cfetch *)sp->last_instruction();
-            i->add_to_varlist(spv);
+            sp_fetch_target *target= Lex->make_fetch_target(thd, $1);
+            if (!target ||
+                !($$= List<sp_fetch_target>::make(thd->mem_root, target)))
+              MYSQL_YYABORT;
           }
         | sp_fetch_list ',' ident
           {
-            LEX *lex= Lex;
-            sp_head *sp= lex->sphead;
-            sp_pcontext *spc= lex->spcont;
-            sp_variable *spv= likely(spc != NULL)
-              ? spc->find_variable(&$3, false)
-              : NULL;
-
-            if (unlikely(!spv))
-              my_yyabort_error((ER_SP_UNDECLARED_VAR, MYF(0), $3.str));
-
-            /* An SP local variable */
-            sp_instr_cfetch *i= (sp_instr_cfetch *)sp->last_instruction();
-            i->add_to_varlist(spv);
+            sp_fetch_target *target= Lex->make_fetch_target(thd, $3);
+            if (!target || $1->push_back(target, thd->mem_root))
+              MYSQL_YYABORT;
           }
         ;
 
diff --git a/sql/structs.h b/sql/structs.h
index 8b71e4cc311..fa9e115822b 100644
--- a/sql/structs.h
+++ b/sql/structs.h
@@ -1103,4 +1103,29 @@ public:
 };
 
 
+/*
+  A run-time address of an SP variable. Consists of:
+  - The rcontext type (LOCAL, PACKAGE BODY),
+    controlled by m_rcontext_handler
+  - The frame offset
+*/
+class sp_rcontext_addr
+{
+public:
+  sp_rcontext_addr(const class Sp_rcontext_handler *h, uint offset)
+   :m_rcontext_handler(h), m_offset(offset)
+  { }
+  const Sp_rcontext_handler *rcontext_handler() const
+  {
+    return m_rcontext_handler;
+  }
+  uint offset() const
+  {
+    return m_offset;
+  }
+protected:
+  const class Sp_rcontext_handler *m_rcontext_handler;
+  uint m_offset;               ///< Frame offset
+};
+
 #endif /* STRUCTS_INCLUDED */
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
index 4e4a77e65e7..c8f6bb6b746 100644
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
@@ -6448,7 +6448,9 @@ static const char *wsrep_binlog_format_names[]=
 static Sys_var_enum Sys_wsrep_forced_binlog_format(
        "wsrep_forced_binlog_format", "binlog format to take effect over user's choice",
        GLOBAL_VAR(wsrep_forced_binlog_format), CMD_LINE(REQUIRED_ARG),
-       wsrep_binlog_format_names, DEFAULT(BINLOG_FORMAT_UNSPEC));
+       wsrep_binlog_format_names, DEFAULT(BINLOG_FORMAT_UNSPEC),
+       NO_MUTEX_GUARD, NOT_IN_BINLOG,
+       ON_CHECK(wsrep_forced_binlog_format_check));
 
 static Sys_var_mybool Sys_wsrep_recover_datadir(
        "wsrep_recover", "Recover database state after crash and exit",
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc
index e0d9137e9d5..3e5b9f1ea15 100644
--- a/sql/wsrep_mysqld.cc
+++ b/sql/wsrep_mysqld.cc
@@ -1,5 +1,5 @@
-/* Copyright (c) 2008, 2023 Codership Oy <http://www.codership.com>
-   Copyright (c) 2020, 2022, MariaDB
+/* Copyright (c) 2008, 2024, Codership Oy <http://www.codership.com>
+   Copyright (c) 2020, 2024, MariaDB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -1614,7 +1614,12 @@ bool wsrep_sync_wait (THD* thd, uint mask)
       This allows autocommit SELECTs and a first SELECT after SET AUTOCOMMIT=0
       TODO: modify to check if thd has locked any rows.
     */
-    return thd->wsrep_cs().sync_wait(-1);
+    if (thd->wsrep_cs().sync_wait(-1))
+    {
+      wsrep_override_error(thd, thd->wsrep_cs().current_error(),
+                           thd->wsrep_cs().current_error_status());
+      return true;
+    }
   }
 
   return false;
@@ -2498,19 +2503,12 @@ static int wsrep_drop_table_query(THD* thd, uchar** buf, size_t* buf_len)
 /* Forward declarations. */
 int wsrep_create_trigger_query(THD *thd, uchar** buf, size_t* buf_len);
 
-bool wsrep_should_replicate_ddl_iterate(THD* thd, const TABLE_LIST* table_list)
-{
-  if (WSREP(thd))
-  {
-    for (const TABLE_LIST* it= table_list; it; it= it->next_global)
-    {
-      if (it->table &&
-          !wsrep_should_replicate_ddl(thd, it->table->s->db_type()))
-        return false;
-    }
-  }
-  return true;
-}
+/*! Should DDL be replicated by Galera
+ *
+ * @param thd            thread handle
+ * @param hton           real storage engine handlerton
+ *
+ * @retval true if we should replicate DDL, false if not */
 
 bool wsrep_should_replicate_ddl(THD* thd, const handlerton *hton)
 {
@@ -2520,6 +2518,8 @@ bool wsrep_should_replicate_ddl(THD* thd, const handlerton *hton)
   if (!hton)
     return true;
 
+  DBUG_ASSERT(hton != nullptr);
+
   switch (hton->db_type)
   {
     case DB_TYPE_INNODB:
@@ -2531,6 +2531,11 @@ bool wsrep_should_replicate_ddl(THD* thd, const handlerton *hton)
       else
         WSREP_DEBUG("wsrep OSU failed for %s", wsrep_thd_query(thd));
       break;
+    case DB_TYPE_PARTITION_DB:
+      /* In most cases this means we could not find out
+         table->file->partition_ht() */
+      return true;
+      break;
     case DB_TYPE_ARIA:
       if (wsrep_check_mode(WSREP_MODE_REPLICATE_ARIA))
 	return true;
@@ -2551,6 +2556,27 @@ bool wsrep_should_replicate_ddl(THD* thd, const handlerton *hton)
                       ha_resolve_storage_engine_name(hton));
   return false;
 }
+
+bool wsrep_should_replicate_ddl_iterate(THD* thd, const TABLE_LIST* table_list)
+{
+  for (const TABLE_LIST* it= table_list; it; it= it->next_global)
+  {
+    if (it->table)
+    {
+      /* If this is partitioned table we need to find out
+         implementing storage engine handlerton.
+      */
+      const handlerton *ht= it->table->file->partition_ht() ?
+                              it->table->file->partition_ht() :
+                              it->table->s->db_type();
+
+      if (!wsrep_should_replicate_ddl(thd, ht))
+        return false;
+    }
+  }
+  return true;
+}
+
 /*
   Decide if statement should run in TOI.
 
@@ -2659,9 +2685,8 @@ bool wsrep_can_run_in_toi(THD *thd, const char *db, const char *table,
     if (create_info)
     {
       const handlerton *hton= create_info->db_type;
-
       if (!hton)
-	hton= ha_default_handlerton(thd);
+        hton= ha_default_handlerton(thd);
       if (!wsrep_should_replicate_ddl(thd, hton))
         return false;
     }
@@ -3227,11 +3252,9 @@ void wsrep_to_isolation_end(THD *thd)
 
   @param  requestor_ctx        The MDL context of the requestor
   @param  ticket               MDL ticket for the requested lock
+  @param  key                  The key of the object (data) being protected
 
-  @retval TRUE   Lock request can be granted
-  @retval FALSE  Lock request cannot be granted
 */
-
 void wsrep_handle_mdl_conflict(MDL_context *requestor_ctx,
                                const MDL_ticket *ticket,
                                const MDL_key *key)
@@ -3313,16 +3336,21 @@ void wsrep_handle_mdl_conflict(MDL_context *requestor_ctx,
             (granted_thd->system_thread != NON_SYSTEM_THREAD &&
              granted_thd->mdl_context.has_explicit_locks()))
     {
-      WSREP_DEBUG("BF thread waiting for FLUSH for %s",
-                  wsrep_thd_query(request_thd));
-      THD_STAGE_INFO(request_thd, stage_waiting_ddl);
+      WSREP_DEBUG("BF thread waiting for %s",
+                  granted_thd->lex->sql_command == SQLCOM_FLUSH ? "FLUSH" : "BACKUP");
       ticket->wsrep_report(wsrep_debug);
+
       if (granted_thd->current_backup_stage != BACKUP_FINISHED &&
 	  wsrep_check_mode(WSREP_MODE_BF_MARIABACKUP))
       {
 	wsrep_abort_thd(request_thd, granted_thd, 1);
       }
     }
+    else if (granted_thd->lex->sql_command == SQLCOM_LOCK_TABLES)
+    {
+      WSREP_DEBUG("BF thread waiting for LOCK TABLES");
+      ticket->wsrep_report(wsrep_debug);
+    }
     else if (request_thd->lex->sql_command == SQLCOM_DROP_TABLE)
     {
       WSREP_DEBUG("DROP caused BF abort, conf %s for %s",
diff --git a/sql/wsrep_mysqld.h b/sql/wsrep_mysqld.h
index 7e7398996bf..6cd8d6cea95 100644
--- a/sql/wsrep_mysqld.h
+++ b/sql/wsrep_mysqld.h
@@ -356,7 +356,7 @@ int wsrep_to_isolation_begin(THD *thd, const char *db_, const char *table_,
                              const wsrep::key_array *fk_tables= nullptr,
                              const HA_CREATE_INFO* create_info= nullptr);
 
-bool wsrep_should_replicate_ddl(THD* thd, const handlerton *db_type);
+bool wsrep_should_replicate_ddl(THD* thd, const handlerton *hton);
 bool wsrep_should_replicate_ddl_iterate(THD* thd, const TABLE_LIST* table_list);
 
 void wsrep_to_isolation_end(THD *thd);
@@ -615,7 +615,6 @@ bool wsrep_table_list_has_non_temp_tables(THD *thd, TABLE_LIST *tables);
 #define wsrep_thr_deinit() do {} while(0)
 #define wsrep_init_globals() do {} while(0)
 #define wsrep_create_appliers(X) do {} while(0)
-#define wsrep_should_replicate_ddl(X,Y) (1)
 #define wsrep_cluster_address_exists() (false)
 #define WSREP_MYSQL_DB (0)
 #define WSREP_TO_ISOLATION_BEGIN(db_, table_, table_list_) do { } while(0)
diff --git a/sql/wsrep_var.cc b/sql/wsrep_var.cc
index 83e017a2fc3..3394ed6913c 100644
--- a/sql/wsrep_var.cc
+++ b/sql/wsrep_var.cc
@@ -1,4 +1,4 @@
-/* Copyright 2008-2022 Codership Oy <http://www.codership.com>
+/* Copyright 2008-2023 Codership Oy <http://www.codership.com>
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -333,14 +333,12 @@ bool wsrep_start_position_check (sys_var *self, THD* thd, set_var* var)
          var->save_result.string_value.length);
   start_pos_buf[var->save_result.string_value.length]= 0;
 
-
   WSREP_DEBUG("SST wsrep_start_position check for new position %s old %s",
-	     start_pos_buf, wsrep_start_position);
+              start_pos_buf, wsrep_start_position);
 
   // Verify the format.
   if (wsrep_start_position_verify(start_pos_buf)) return true;
 
-
   // Give error if position is updated when wsrep is not enabled or
   // provider is not loaded.
   if ((!WSREP_ON || !Wsrep_server_state::instance().is_provider_loaded())
@@ -658,7 +656,7 @@ bool wsrep_cluster_address_update (sys_var *self, THD* thd, enum_var_type type)
   {
     wsrep_create_rollbacker();
     WSREP_DEBUG("Cluster address update creating %ld applier threads running %lu",
-	    wsrep_slave_threads, wsrep_running_applier_threads);
+                wsrep_slave_threads, wsrep_running_applier_threads);
     wsrep_create_appliers(wsrep_slave_threads);
   }
   mysql_mutex_unlock(&LOCK_wsrep_cluster_config);
@@ -762,7 +760,7 @@ static void wsrep_slave_count_change_update ()
 {
   wsrep_slave_count_change = (wsrep_slave_threads - wsrep_running_applier_threads);
   WSREP_DEBUG("Change on slave threads: New %ld old %lu difference %d",
-	  wsrep_slave_threads, wsrep_running_applier_threads, wsrep_slave_count_change);
+              wsrep_slave_threads, wsrep_running_applier_threads, wsrep_slave_count_change);
 }
 
 bool wsrep_slave_threads_update (sys_var *self, THD* thd, enum_var_type type)
@@ -787,9 +785,9 @@ bool wsrep_slave_threads_update (sys_var *self, THD* thd, enum_var_type type)
     // Thread creation and execution is asyncronous, therefore we need
     // wait them to be started or error produced
     while (wsrep_running_applier_threads != (ulong)wsrep_slave_threads &&
-	   !wsrep_thread_create_failed.load(std::memory_order_relaxed))
+           !wsrep_thread_create_failed.load(std::memory_order_relaxed))
     {
-	    my_sleep(1000);
+      my_sleep(1000);
     }
 
     mysql_mutex_lock(&LOCK_global_system_variables);
@@ -978,6 +976,22 @@ bool wsrep_max_ws_size_update(sys_var *self, THD *thd, enum_var_type)
 
 bool wsrep_mode_check(sys_var *self, THD* thd, set_var* var)
 {
+  ulonglong new_wsrep_mode= var->save_result.ulonglong_value;
+  ulonglong old_wsrep_mode= wsrep_mode;
+  wsrep_mode= new_wsrep_mode;
+  if (wsrep_check_mode(WSREP_MODE_REPLICATE_MYISAM) ||
+      wsrep_check_mode(WSREP_MODE_REPLICATE_ARIA))
+  {
+    if (!(wsrep_forced_binlog_format == BINLOG_FORMAT_UNSPEC ||
+          wsrep_forced_binlog_format == BINLOG_FORMAT_ROW))
+    {
+      my_message(ER_WRONG_ARGUMENTS, "wsrep_mode=[REPLICATE_MYISAM|REPLICATE_ARIA] "
+                 "can't be enabled if wsrep_forced_binlog != [NONE|ROW]", MYF(0));
+      wsrep_mode= old_wsrep_mode;
+      return true;
+    }
+  }
+  wsrep_mode= old_wsrep_mode;
   return false;
 }
 
@@ -1121,3 +1135,28 @@ bool wsrep_gtid_domain_id_update(sys_var* self, THD *thd, enum_var_type)
   return false;
 }
 
+bool wsrep_forced_binlog_format_check(sys_var *self, THD* thd, set_var* var)
+{
+  ulonglong new_forced_binlog_format= var->save_result.ulonglong_value;
+
+  if (!(new_forced_binlog_format == BINLOG_FORMAT_UNSPEC ||
+        new_forced_binlog_format == BINLOG_FORMAT_ROW))
+  {
+    if (wsrep_check_mode(WSREP_MODE_BINLOG_ROW_FORMAT_ONLY))
+    {
+      my_message(ER_WRONG_ARGUMENTS, "wsrep_forced_binlog_format=[MIXED|STATEMENT] can't be set "
+                 "if wsrep_mode=BINLOG_ROW_FORMAT_ONLY", MYF(0));
+      return true;
+    }
+
+    if (wsrep_check_mode(WSREP_MODE_REPLICATE_MYISAM) ||
+        wsrep_check_mode(WSREP_MODE_REPLICATE_ARIA))
+    {
+      my_message(ER_WRONG_ARGUMENTS, "wsrep_forced_binlog_format=[MIXED|STATEMENT] can't be set "
+                 "if wsrep_mode=[REPLICATE_MYISAM|REPLICATE_ARIA]", MYF(0));
+      return true;
+    }
+  }
+
+  return false;
+}
diff --git a/sql/wsrep_var.h b/sql/wsrep_var.h
index 6b10530ae97..b4817ebd60b 100644
--- a/sql/wsrep_var.h
+++ b/sql/wsrep_var.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013-2022 Codership Oy <info@codership.com>
+/* Copyright (C) 2013-2023 Codership Oy <info@codership.com>
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -109,6 +109,7 @@ extern bool wsrep_gtid_seq_no_check          CHECK_ARGS;
 extern bool wsrep_gtid_domain_id_update      UPDATE_ARGS;
 
 extern bool wsrep_mode_check                 CHECK_ARGS;
+extern bool wsrep_forced_binlog_format_check CHECK_ARGS;
 #else  /* WITH_WSREP */
 
 #define wsrep_provider_init(X)
diff --git a/storage/federatedx/federatedx_io.cc b/storage/federatedx/federatedx_io.cc
index 68ffe2148ca..2a8df77c2fa 100644
--- a/storage/federatedx/federatedx_io.cc
+++ b/storage/federatedx/federatedx_io.cc
@@ -47,6 +47,7 @@ struct io_schemes_st
 static const io_schemes_st federated_io_schemes[] =
 {
   { "mysql", &instantiate_io_mysql },
+  { "mariadb", &instantiate_io_mysql },
   { "null", instantiate_io_null } /* must be last element */
 };
 
diff --git a/storage/innobase/CMakeLists.txt b/storage/innobase/CMakeLists.txt
index 8b9fd00009f..9f68ceb539b 100644
--- a/storage/innobase/CMakeLists.txt
+++ b/storage/innobase/CMakeLists.txt
@@ -221,7 +221,6 @@ SET(INNOBASE_SOURCES
 	include/dict0pagecompress.h
 	include/dict0pagecompress.inl
 	include/dict0stats.h
-	include/dict0stats.inl
 	include/dict0stats_bg.h
 	include/dict0types.h
 	include/dyn0buf.h
diff --git a/storage/innobase/buf/buf0flu.cc b/storage/innobase/buf/buf0flu.cc
index 5e0ebf63150..6523d227de2 100644
--- a/storage/innobase/buf/buf0flu.cc
+++ b/storage/innobase/buf/buf0flu.cc
@@ -1910,7 +1910,8 @@ inline void log_t::write_checkpoint(lsn_t end_lsn) noexcept
     resize_flush_buf= nullptr;
     resize_target= 0;
     resize_lsn.store(0, std::memory_order_relaxed);
-    writer_update();
+    resize_initiator= nullptr;
+    writer_update(false);
   }
 
   log_resize_release();
diff --git a/storage/innobase/dict/dict0dict.cc b/storage/innobase/dict/dict0dict.cc
index 63fdc6231c0..626034a53d2 100644
--- a/storage/innobase/dict/dict0dict.cc
+++ b/storage/innobase/dict/dict0dict.cc
@@ -195,71 +195,6 @@ dict_tables_have_same_db(
 	return(FALSE);
 }
 
-/** Decrement the count of open handles */
-void dict_table_close(dict_table_t *table)
-{
-  if (table->get_ref_count() == 1 &&
-      dict_stats_is_persistent_enabled(table) &&
-      strchr(table->name.m_name, '/'))
-  {
-    /* It looks like we are closing the last handle. The user could
-    have executed FLUSH TABLES in order to have the statistics reloaded
-    from the InnoDB persistent statistics tables. We must acquire
-    exclusive dict_sys.latch to prevent a race condition with another
-    thread concurrently acquiring a handle on the table. */
-    dict_sys.lock(SRW_LOCK_CALL);
-    if (table->release())
-    {
-      table->stats_mutex_lock();
-      if (table->get_ref_count() == 0)
-        dict_stats_deinit(table);
-      table->stats_mutex_unlock();
-    }
-    dict_sys.unlock();
-  }
-  else
-    table->release();
-}
-
-/** Decrements the count of open handles of a table.
-@param[in,out]	table		table
-@param[in]	dict_locked	whether dict_sys.latch is being held
-@param[in]	thd		thread to release MDL
-@param[in]	mdl		metadata lock or NULL if the thread
-				is a foreground one. */
-void
-dict_table_close(
-	dict_table_t*	table,
-	bool		dict_locked,
-	THD*		thd,
-	MDL_ticket*	mdl)
-{
-  if (!dict_locked)
-    dict_table_close(table);
-  else
-  {
-    if (table->release() && dict_stats_is_persistent_enabled(table) &&
-	strchr(table->name.m_name, '/'))
-    {
-      /* Force persistent stats re-read upon next open of the table so
-      that FLUSH TABLE can be used to forcibly fetch stats from disk if
-      they have been manually modified. */
-      table->stats_mutex_lock();
-      if (table->get_ref_count() == 0)
-        dict_stats_deinit(table);
-      table->stats_mutex_unlock();
-    }
-
-    ut_ad(dict_lru_validate());
-    ut_ad(dict_sys.find(table));
-  }
-
-  if (!thd || !mdl);
-  else if (MDL_context *mdl_context= static_cast<MDL_context*>
-           (thd_mdl_context(thd)))
-    mdl_context->release_lock(mdl);
-}
-
 /** Check if the table has a given (non_virtual) column.
 @param[in]	table		table object
 @param[in]	col_name	column name
@@ -580,6 +515,14 @@ dict_index_get_nth_field_pos(
 	return(ULINT_UNDEFINED);
 }
 
+void mdl_release(THD *thd, MDL_ticket *mdl) noexcept
+{
+  if (!thd || !mdl);
+  else if (MDL_context *mdl_context= static_cast<MDL_context*>
+           (thd_mdl_context(thd)))
+    mdl_context->release_lock(mdl);
+}
+
 /** Parse the table file name into table name and database name.
 @tparam        dict_frozen  whether the caller holds dict_sys.latch
 @param[in,out] db_name      database name buffer
diff --git a/storage/innobase/dict/dict0stats.cc b/storage/innobase/dict/dict0stats.cc
index 69cf5ccd702..a1d354ca3b6 100644
--- a/storage/innobase/dict/dict0stats.cc
+++ b/storage/innobase/dict/dict0stats.cc
@@ -362,7 +362,7 @@ dict_table_schema_check(
 
 	if (!table) {
 		if (opt_bootstrap)
-			return DB_TABLE_NOT_FOUND;
+			return DB_STATS_DO_NOT_EXIST;
 		if (req_schema == &table_stats_schema) {
 			if (innodb_table_stats_not_found_reported) {
 				return DB_STATS_DO_NOT_EXIST;
@@ -380,10 +380,10 @@ dict_table_schema_check(
 
 		snprintf(errstr, errstr_sz, "Table %s not found.",
 			 req_schema->table_name_sql);
-		return DB_TABLE_NOT_FOUND;
+		return DB_STATS_DO_NOT_EXIST;
 	}
 
-	if (!table->is_readable() && !table->space) {
+	if (!table->is_readable() || !table->space) {
 		/* missing tablespace */
 		snprintf(errstr, errstr_sz,
 			 "Tablespace for table %s is missing.",
@@ -494,11 +494,8 @@ dict_table_schema_check(
 	return DB_SUCCESS;
 }
 
-/*********************************************************************//**
-Checks whether the persistent statistics storage exists and that all
-tables have the proper structure.
-@return true if exists and all tables are ok */
-static bool dict_stats_persistent_storage_check(bool dict_already_locked)
+dict_stats_schema_check
+dict_stats_persistent_storage_check(bool dict_already_locked) noexcept
 {
 	char		errstr[512];
 	dberr_t		ret;
@@ -524,14 +521,14 @@ static bool dict_stats_persistent_storage_check(bool dict_already_locked)
 
 	switch (ret) {
 	case DB_SUCCESS:
-		return true;
+		return SCHEMA_OK;
+	case DB_STATS_DO_NOT_EXIST:
+		return SCHEMA_NOT_EXIST;
 	default:
 		if (!opt_bootstrap) {
-			ib::error() << errstr;
+			sql_print_error("InnoDB: %s", errstr);
 		}
-		/* fall through */
-	case DB_STATS_DO_NOT_EXIST:
-		return false;
+		return SCHEMA_INVALID;
 	}
 }
 
@@ -547,13 +544,16 @@ dberr_t dict_stats_exec_sql(pars_info_t *pinfo, const char* sql, trx_t *trx)
 {
   ut_ad(dict_sys.locked());
 
-  if (!dict_stats_persistent_storage_check(true))
-  {
-    pars_info_free(pinfo);
-    return DB_STATS_DO_NOT_EXIST;
+  switch (dict_stats_persistent_storage_check(true)) {
+  case SCHEMA_OK:
+    return que_eval_sql(pinfo, sql, trx);
+  case SCHEMA_INVALID:
+  case SCHEMA_NOT_EXIST:
+    break;
   }
 
-  return que_eval_sql(pinfo, sql, trx);
+  pars_info_free(pinfo);
+  return DB_STATS_DO_NOT_EXIST;
 }
 
 /*********************************************************************//**
@@ -590,7 +590,7 @@ void dict_stats_empty_table(dict_table_t *table)
 	table->stat_clustered_index_size = 1;
 	/* 1 page for each index, not counting the clustered */
 	table->stat_sum_of_other_index_sizes
-		= UT_LIST_GET_LEN(table->indexes) - 1;
+		= uint32_t(UT_LIST_GET_LEN(table->indexes) - 1);
 	table->stat_modified_counter = 0;
 
 	dict_index_t*	index;
@@ -606,7 +606,7 @@ void dict_stats_empty_table(dict_table_t *table)
 		dict_stats_empty_index(index);
 	}
 
-	table->stat_initialized = TRUE;
+	table->stat = table->stat | dict_table_t::STATS_INITIALIZED;
 	table->stats_mutex_unlock();
 }
 
@@ -647,16 +647,10 @@ dict_stats_assert_initialized(
 /*==========================*/
 	const dict_table_t*	table)	/*!< in: table */
 {
-	ut_a(table->stat_initialized);
-
 	MEM_CHECK_DEFINED(&table->stats_last_recalc,
 			  sizeof table->stats_last_recalc);
 
-	MEM_CHECK_DEFINED(&table->stat_persistent,
-			  sizeof table->stat_persistent);
-
-	MEM_CHECK_DEFINED(&table->stats_auto_recalc,
-			  sizeof table->stats_auto_recalc);
+	MEM_CHECK_DEFINED(&table->stat, sizeof table->stat);
 
 	MEM_CHECK_DEFINED(&table->stats_sample_pages,
 			  sizeof table->stats_sample_pages);
@@ -825,8 +819,8 @@ btr_estimate_number_of_different_key_vals(dict_index_t* index,
 	ulint		n_cols;
 	ib_uint64_t*	n_diff;
 	ib_uint64_t*	n_not_null;
-	ibool		stats_null_not_equal;
-	uintmax_t	n_sample_pages=1; /* number of pages to sample */
+	bool		stats_null_not_equal;
+	uint32_t	n_sample_pages=1; /* number of pages to sample */
 	ulint		not_empty_flag	= 0;
 	ulint		total_external_size = 0;
 	uintmax_t	add_on;
@@ -864,11 +858,11 @@ btr_estimate_number_of_different_key_vals(dict_index_t* index,
 	case SRV_STATS_NULLS_UNEQUAL:
 		/* for both SRV_STATS_NULLS_IGNORED and SRV_STATS_NULLS_UNEQUAL
 		case, we will treat NULLs as unequal value */
-		stats_null_not_equal = TRUE;
+		stats_null_not_equal = true;
 		break;
 
 	case SRV_STATS_NULLS_EQUAL:
-		stats_null_not_equal = FALSE;
+		stats_null_not_equal = false;
 		break;
 
 	default:
@@ -919,19 +913,21 @@ btr_estimate_number_of_different_key_vals(dict_index_t* index,
 
 		so taking all case2 paths is I, our expression is:
 		n_pages = S < I? min(I,L) : I
-                */
-		if (index->stat_index_size > 1) {
-			n_sample_pages = (srv_stats_transient_sample_pages < index->stat_index_size)
-				? ut_min(index->stat_index_size,
-					 static_cast<ulint>(
-						 log2(double(index->stat_index_size))
-						 * double(srv_stats_transient_sample_pages)))
-				: index->stat_index_size;
+		*/
+		if (uint32_t I = index->stat_index_size) {
+			const uint32_t S{srv_stats_transient_sample_pages};
+			n_sample_pages = S < I
+				? std::min(I,
+					   uint32_t(log2(double(I))
+						    * double(S)))
+				: I;
 		}
 	}
 
 	/* Sanity check */
-	ut_ad(n_sample_pages > 0 && n_sample_pages <= (index->stat_index_size <= 1 ? 1 : index->stat_index_size));
+	ut_ad(n_sample_pages);
+	ut_ad(n_sample_pages <= (index->stat_index_size <= 1
+				 ? 1 : index->stat_index_size));
 
 	/* We sample some pages in the index to get an estimate */
 	btr_cur_t cursor;
@@ -1144,7 +1140,7 @@ invalid:
 
 		mtr.x_lock_space(index->table->space);
 
-		ulint dummy, size;
+		uint32_t dummy, size;
 		index->stat_index_size
 			= fseg_n_reserved_pages(*root, PAGE_HEADER
 						+ PAGE_BTR_SEG_LEAF
@@ -1184,24 +1180,12 @@ invalid:
 	return err;
 }
 
-/*********************************************************************//**
-Calculates new estimates for table and index statistics. This function
-is relatively quick and is used to calculate transient statistics that
-are not saved on disk.
-This was the only way to calculate statistics before the
-Persistent Statistics feature was introduced.
-@return error code
-@retval DB_SUCCESS_LOCKED REC if the table under bulk insert operation */
-static
-dberr_t
-dict_stats_update_transient(
-/*========================*/
-	dict_table_t*	table)	/*!< in/out: table */
+dberr_t dict_stats_update_transient(dict_table_t *table) noexcept
 {
 	ut_ad(!table->stats_mutex_is_owner());
 
 	dict_index_t*	index;
-	ulint		sum_of_index_sizes	= 0;
+	uint32_t	sum_of_index_sizes	= 0;
 	dberr_t		err = DB_SUCCESS;
 
 	/* Find out the sizes of the indexes and how many different values
@@ -1209,17 +1193,16 @@ dict_stats_update_transient(
 
 	index = dict_table_get_first_index(table);
 
-	if (!table->space) {
-		/* Nothing to do. */
-empty_table:
+	if (!index || !table->space) {
 		dict_stats_empty_table(table);
-		return err;
-	} else if (index == NULL) {
-		/* Table definition is corrupt */
+		return DB_SUCCESS;
+	}
 
-		ib::warn() << "Table " << table->name
-			<< " has no indexes. Cannot calculate statistics.";
-		goto empty_table;
+	if (trx_id_t bulk_trx_id = table->bulk_trx_id) {
+		if (trx_sys.find(nullptr, bulk_trx_id, false)) {
+			dict_stats_empty_table(table);
+			return DB_SUCCESS_LOCKED_REC;
+		}
 	}
 
 	for (; index != NULL; index = dict_table_get_next_index(index)) {
@@ -1257,7 +1240,7 @@ empty_table:
 
 	table->stat_modified_counter = 0;
 
-	table->stat_initialized = TRUE;
+	table->stat = table->stat | dict_table_t::STATS_INITIALIZED;
 
 	table->stats_mutex_unlock();
 
@@ -2194,8 +2177,8 @@ dict_stats_analyze_index_for_n_prefix(
 struct index_stats_t
 {
   std::vector<index_field_stats_t> stats;
-  ulint index_size;
-  ulint n_leaf_pages;
+  uint32_t index_size;
+  uint32_t n_leaf_pages;
 
   index_stats_t(ulint n_uniq) : index_size(1), n_leaf_pages(1)
   {
@@ -2334,7 +2317,7 @@ empty_index:
 
 	uint16_t root_level = btr_page_get_level(root->page.frame);
 	mtr.x_lock_space(index->table->space);
-	ulint dummy, size;
+	uint32_t dummy, size;
 	result.index_size
 		= fseg_n_reserved_pages(*root, PAGE_HEADER + PAGE_BTR_SEG_LEAF
 					+ root->page.frame, &size, &mtr)
@@ -2604,17 +2587,7 @@ found_level:
 	DBUG_RETURN(result);
 }
 
-/*********************************************************************//**
-Calculates new estimates for table and index statistics. This function
-is relatively slow and is used to calculate persistent statistics that
-will be saved on disk.
-@return DB_SUCCESS or error code
-@retval DB_SUCCESS_LOCKED_REC if the table under bulk insert operation */
-static
-dberr_t
-dict_stats_update_persistent(
-/*=========================*/
-	dict_table_t*	table)		/*!< in/out: table */
+dberr_t dict_stats_update_persistent(dict_table_t *table) noexcept
 {
 	dict_index_t*	index;
 
@@ -2622,6 +2595,13 @@ dict_stats_update_persistent(
 
 	DEBUG_SYNC_C("dict_stats_update_persistent");
 
+	if (trx_id_t bulk_trx_id = table->bulk_trx_id) {
+		if (trx_sys.find(nullptr, bulk_trx_id, false)) {
+			dict_stats_empty_table(table);
+			return DB_SUCCESS_LOCKED_REC;
+		}
+	}
+
 	/* analyze the clustered index first */
 
 	index = dict_table_get_first_index(table);
@@ -2710,7 +2690,7 @@ dict_stats_update_persistent(
 
 	table->stat_modified_counter = 0;
 
-	table->stat_initialized = TRUE;
+	table->stat = table->stat | dict_table_t::STATS_INITIALIZED;
 
 	dict_stats_assert_initialized(table);
 
@@ -2719,6 +2699,18 @@ dict_stats_update_persistent(
 	return(DB_SUCCESS);
 }
 
+dberr_t dict_stats_update_persistent_try(dict_table_t *table)
+{
+  if (table->stats_is_persistent() &&
+      dict_stats_persistent_storage_check(false) == SCHEMA_OK)
+  {
+    if (dberr_t err= dict_stats_update_persistent(table))
+      return err;
+    return dict_stats_save(table);
+  }
+  return DB_SUCCESS;
+}
+
 #include "mysql_com.h"
 /** Save an individual index's statistic into the persistent statistics
 storage.
@@ -2797,14 +2789,14 @@ dict_stats_save_index_stat(
 		"END;", trx);
 
 	if (UNIV_UNLIKELY(ret != DB_SUCCESS)) {
-		if (innodb_index_stats_not_found == false &&
-		    index->stats_error_printed == false) {
+		if (innodb_index_stats_not_found == false
+		    && !index->table->stats_error_printed) {
+			index->table->stats_error_printed = true;
 		ib::error() << "Cannot save index statistics for table "
 			<< index->table->name
 			<< ", index " << index->name
 			<< ", stat name \"" << stat_name << "\": "
 			<< ret;
-			index->stats_error_printed = true;
 		}
 	}
 
@@ -2842,17 +2834,11 @@ static dberr_t dict_stats_report_error(dict_table_t* table)
 	return err;
 }
 
-/** Save the table's statistics into the persistent statistics storage.
-@param[in]	table		table whose stats to save
-@param[in]	only_for_index	if this is non-NULL, then stats for indexes
-that are not equal to it will not be saved, if NULL, then all indexes' stats
-are saved
+/** Save the persistent statistics of a table or an index.
+@param table            table whose stats to save
+@param only_for_index   the index ID to save statistics for (0=all)
 @return DB_SUCCESS or error code */
-static
-dberr_t
-dict_stats_save(
-	dict_table_t*		table,
-	const index_id_t*	only_for_index)
+dberr_t dict_stats_save(dict_table_t* table, index_id_t index_id)
 {
 	pars_info_t*	pinfo;
 	char		db_utf8[MAX_DB_UTF8_LEN];
@@ -2889,7 +2875,7 @@ dict_stats_save(
 	    || strcmp(table_stats->name.m_name, TABLE_STATS_NAME)) {
 release_and_exit:
 		if (table_stats) {
-			dict_table_close(table_stats, false, thd, mdl_table);
+			dict_table_close(table_stats, thd, mdl_table);
 		}
 		return DB_STATS_DO_NOT_EXIST;
 	}
@@ -2906,7 +2892,7 @@ release_and_exit:
 		goto release_and_exit;
 	}
 	if (strcmp(index_stats->name.m_name, INDEX_STATS_NAME)) {
-		dict_table_close(index_stats, false, thd, mdl_index);
+		dict_table_close(index_stats, thd, mdl_index);
 		goto release_and_exit;
 	}
 
@@ -2966,8 +2952,14 @@ release_and_exit:
 		"END;", trx);
 
 	if (UNIV_UNLIKELY(ret != DB_SUCCESS)) {
-		ib::error() << "Cannot save table statistics for table "
-			<< table->name << ": " << ret;
+		sql_print_error("InnoDB: Cannot save table statistics for"
+#ifdef EMBEDDED_LIBRARY
+				" table %.*s.%s: %s",
+#else
+				" table %.*sQ.%sQ: %s",
+#endif
+				int(table->name.dblen()), table->name.m_name,
+				table->name.basename(), ut_strerr(ret));
 rollback_and_exit:
 		trx->rollback();
 free_and_exit:
@@ -2975,8 +2967,8 @@ free_and_exit:
 		dict_sys.unlock();
 unlocked_free_and_exit:
 		trx->free();
-		dict_table_close(table_stats, false, thd, mdl_table);
-		dict_table_close(index_stats, false, thd, mdl_index);
+		dict_table_close(table_stats, thd, mdl_table);
+		dict_table_close(index_stats, thd, mdl_index);
 		return ret;
 	}
 
@@ -3010,7 +3002,7 @@ unlocked_free_and_exit:
 
 		index = it->second;
 
-		if (only_for_index != NULL && index->id != *only_for_index) {
+		if (index_id != 0 && index->id != index_id) {
 			continue;
 		}
 
@@ -3078,6 +3070,14 @@ unlocked_free_and_exit:
 	goto free_and_exit;
 }
 
+void dict_stats_empty_table_and_save(dict_table_t *table)
+{
+  dict_stats_empty_table(table);
+  if (table->stats_is_persistent() &&
+      dict_stats_persistent_storage_check(false) == SCHEMA_OK)
+    dict_stats_save(table);
+}
+
 /*********************************************************************//**
 Called for the row that is selected by
 SELECT ... FROM mysql.innodb_table_stats WHERE table='...'
@@ -3126,8 +3126,7 @@ dict_stats_fetch_table_stats_step(
 			ut_a(len == 8);
 
 			table->stat_clustered_index_size
-				= std::max<ulint>(
-				      (ulint) mach_read_from_8(data), 1);
+				= std::max(mach_read_from_4(data + 4), 1U);
 			break;
 		}
 
@@ -3136,18 +3135,9 @@ dict_stats_fetch_table_stats_step(
 			ut_a(dtype_get_mtype(type) == DATA_INT);
 			ut_a(len == 8);
 
-			ulint stat_other_idx_size
-				= (ulint) mach_read_from_8(data);
-			if (!stat_other_idx_size
-			    && UT_LIST_GET_LEN(table->indexes) > 1) {
-				stat_other_idx_size
-					= UT_LIST_GET_LEN(table->indexes) - 1;
-			}
-			table->stat_sum_of_other_index_sizes
-				= std::max<ulint>(
-				    (ulint) mach_read_from_8(data),
-				    UT_LIST_GET_LEN(table->indexes) - 1);
-
+			table->stat_sum_of_other_index_sizes = std::max(
+				mach_read_from_4(data + 4),
+				uint32_t(UT_LIST_GET_LEN(table->indexes) - 1));
 			break;
 		}
 		default:
@@ -3332,14 +3322,12 @@ dict_stats_fetch_index_stats_step(
 
 	if (stat_name_len == 4 /* strlen("size") */
 	    && strncasecmp("size", stat_name, stat_name_len) == 0) {
-		index->stat_index_size
-			= std::max<ulint>((ulint) stat_value, 1);
+		index->stat_index_size = std::max(uint32_t(stat_value), 1U);
 		arg->stats_were_modified = true;
 	} else if (stat_name_len == 12 /* strlen("n_leaf_pages") */
 		   && strncasecmp("n_leaf_pages", stat_name, stat_name_len)
 		   == 0) {
-		index->stat_n_leaf_pages
-			= std::max<ulint>((ulint) stat_value, 1);
+		index->stat_n_leaf_pages = std::max(uint32_t(stat_value), 1U);
 		arg->stats_were_modified = true;
 	} else if (stat_name_len > PFX_LEN /* e.g. stat_name=="n_diff_pfx01" */
 		   && strncasecmp(PFX, stat_name, PFX_LEN) == 0) {
@@ -3429,19 +3417,11 @@ dict_stats_fetch_index_stats_step(
 	return(TRUE);
 }
 
-/*********************************************************************//**
-Read table's statistics from the persistent statistics storage.
-@return DB_SUCCESS or error code */
-static
-dberr_t
-dict_stats_fetch_from_ps(
-/*=====================*/
-	dict_table_t*	table)	/*!< in/out: table */
+/** Read the stored persistent statistics of a table. */
+dberr_t dict_stats_fetch_from_ps(dict_table_t *table)
 {
 	index_fetch_t	index_fetch_arg;
-	trx_t*		trx;
 	pars_info_t*	pinfo;
-	dberr_t		ret;
 	char		db_utf8[MAX_DB_UTF8_LEN];
 	char		table_utf8[MAX_TABLE_UTF8_LEN];
 
@@ -3455,34 +3435,36 @@ dict_stats_fetch_from_ps(
 	MDL_ticket *mdl_table = nullptr, *mdl_index = nullptr;
 	dict_table_t* table_stats = dict_table_open_on_name(
 		TABLE_STATS_NAME, false, DICT_ERR_IGNORE_NONE);
-	if (table_stats) {
-		dict_sys.freeze(SRW_LOCK_CALL);
-		table_stats = dict_acquire_mdl_shared<false>(table_stats, thd,
-							     &mdl_table);
-		dict_sys.unfreeze();
+	if (!table_stats) {
+		return DB_STATS_DO_NOT_EXIST;
 	}
+	dict_table_t* index_stats = dict_table_open_on_name(
+		INDEX_STATS_NAME, false, DICT_ERR_IGNORE_NONE);
+	if (!index_stats) {
+		table_stats->release();
+		return DB_STATS_DO_NOT_EXIST;
+	}
+
+	dict_sys.freeze(SRW_LOCK_CALL);
+	table_stats = dict_acquire_mdl_shared<false>(table_stats, thd,
+						     &mdl_table);
 	if (!table_stats
 	    || strcmp(table_stats->name.m_name, TABLE_STATS_NAME)) {
 release_and_exit:
+		dict_sys.unfreeze();
 		if (table_stats) {
-			dict_table_close(table_stats, false, thd, mdl_table);
+			dict_table_close(table_stats, thd, mdl_table);
+		}
+		if (index_stats) {
+			dict_table_close(index_stats, thd, mdl_index);
 		}
 		return DB_STATS_DO_NOT_EXIST;
 	}
 
-	dict_table_t* index_stats = dict_table_open_on_name(
-		INDEX_STATS_NAME, false, DICT_ERR_IGNORE_NONE);
-	if (index_stats) {
-		dict_sys.freeze(SRW_LOCK_CALL);
-		index_stats = dict_acquire_mdl_shared<false>(index_stats, thd,
-							     &mdl_index);
-		dict_sys.unfreeze();
-	}
-	if (!index_stats) {
-		goto release_and_exit;
-	}
-	if (strcmp(index_stats->name.m_name, INDEX_STATS_NAME)) {
-		dict_table_close(index_stats, false, thd, mdl_index);
+	index_stats = dict_acquire_mdl_shared<false>(index_stats, thd,
+						     &mdl_index);
+	if (!index_stats
+	    || strcmp(index_stats->name.m_name, INDEX_STATS_NAME)) {
 		goto release_and_exit;
 	}
 
@@ -3490,10 +3472,6 @@ release_and_exit:
 	DEBUG_SYNC(thd, "dict_stats_mdl_acquired");
 #endif /* ENABLED_DEBUG_SYNC */
 
-	trx = trx_create();
-
-	trx_start_internal_read_only(trx);
-
 	dict_fs2utf8(table->name.m_name, db_utf8, sizeof(db_utf8),
 		     table_utf8, sizeof(table_utf8));
 
@@ -3514,76 +3492,85 @@ release_and_exit:
 			        "fetch_index_stats_step",
 			        dict_stats_fetch_index_stats_step,
 			        &index_fetch_arg);
-	dict_sys.lock(SRW_LOCK_CALL); /* FIXME: remove this */
-	ret = que_eval_sql(pinfo,
-			   "PROCEDURE FETCH_STATS () IS\n"
-			   "found INT;\n"
-			   "DECLARE FUNCTION fetch_table_stats_step;\n"
-			   "DECLARE FUNCTION fetch_index_stats_step;\n"
-			   "DECLARE CURSOR table_stats_cur IS\n"
-			   "  SELECT\n"
-			   /* if you change the selected fields, be
-			   sure to adjust
-			   dict_stats_fetch_table_stats_step() */
-			   "  n_rows,\n"
-			   "  clustered_index_size,\n"
-			   "  sum_of_other_index_sizes\n"
-			   "  FROM \"" TABLE_STATS_NAME "\"\n"
-			   "  WHERE\n"
-			   "  database_name = :database_name AND\n"
-			   "  table_name = :table_name;\n"
-			   "DECLARE CURSOR index_stats_cur IS\n"
-			   "  SELECT\n"
-			   /* if you change the selected fields, be
-			   sure to adjust
-			   dict_stats_fetch_index_stats_step() */
-			   "  index_name,\n"
-			   "  stat_name,\n"
-			   "  stat_value,\n"
-			   "  sample_size\n"
-			   "  FROM \"" INDEX_STATS_NAME "\"\n"
-			   "  WHERE\n"
-			   "  database_name = :database_name AND\n"
-			   "  table_name = :table_name;\n"
+	dict_sys.unfreeze();
+	dict_sys.lock(SRW_LOCK_CALL);
+	que_t* graph = pars_sql(
+		pinfo,
+		"PROCEDURE FETCH_STATS () IS\n"
+		"found INT;\n"
+		"DECLARE FUNCTION fetch_table_stats_step;\n"
+		"DECLARE FUNCTION fetch_index_stats_step;\n"
+		"DECLARE CURSOR table_stats_cur IS\n"
+		"  SELECT\n"
+		/* if you change the selected fields, be
+		sure to adjust
+		dict_stats_fetch_table_stats_step() */
+		"  n_rows,\n"
+		"  clustered_index_size,\n"
+		"  sum_of_other_index_sizes\n"
+		"  FROM \"" TABLE_STATS_NAME "\"\n"
+		"  WHERE\n"
+		"  database_name = :database_name AND\n"
+		"  table_name = :table_name;\n"
+		"DECLARE CURSOR index_stats_cur IS\n"
+		"  SELECT\n"
+		/* if you change the selected fields, be
+		sure to adjust
+		dict_stats_fetch_index_stats_step() */
+		"  index_name,\n"
+		"  stat_name,\n"
+		"  stat_value,\n"
+		"  sample_size\n"
+		"  FROM \"" INDEX_STATS_NAME "\"\n"
+		"  WHERE\n"
+		"  database_name = :database_name AND\n"
+		"  table_name = :table_name;\n"
 
-			   "BEGIN\n"
+		"BEGIN\n"
 
-			   "OPEN table_stats_cur;\n"
-			   "FETCH table_stats_cur INTO\n"
-			   "  fetch_table_stats_step();\n"
-			   "IF (SQL % NOTFOUND) THEN\n"
-			   "  CLOSE table_stats_cur;\n"
-			   "  RETURN;\n"
-			   "END IF;\n"
-			   "CLOSE table_stats_cur;\n"
+		"OPEN table_stats_cur;\n"
+		"FETCH table_stats_cur INTO\n"
+		"  fetch_table_stats_step();\n"
+		"IF (SQL % NOTFOUND) THEN\n"
+		"  CLOSE table_stats_cur;\n"
+		"  RETURN;\n"
+		"END IF;\n"
+		"CLOSE table_stats_cur;\n"
 
-			   "OPEN index_stats_cur;\n"
-			   "found := 1;\n"
-			   "WHILE found = 1 LOOP\n"
-			   "  FETCH index_stats_cur INTO\n"
-			   "    fetch_index_stats_step();\n"
-			   "  IF (SQL % NOTFOUND) THEN\n"
-			   "    found := 0;\n"
-			   "  END IF;\n"
-			   "END LOOP;\n"
-			   "CLOSE index_stats_cur;\n"
+		"OPEN index_stats_cur;\n"
+		"found := 1;\n"
+		"WHILE found = 1 LOOP\n"
+		"  FETCH index_stats_cur INTO\n"
+		"    fetch_index_stats_step();\n"
+		"  IF (SQL % NOTFOUND) THEN\n"
+		"    found := 0;\n"
+		"  END IF;\n"
+		"END LOOP;\n"
+		"CLOSE index_stats_cur;\n"
 
-			   "END;", trx);
-	/* pinfo is freed by que_eval_sql() */
+		"END;");
 	dict_sys.unlock();
 
-	dict_table_close(table_stats, false, thd, mdl_table);
-	dict_table_close(index_stats, false, thd, mdl_index);
+	trx_t* trx = trx_create();
+	trx->graph = nullptr;
+	graph->trx = trx;
+
+	trx_start_internal_read_only(trx);
+	que_run_threads(que_fork_start_command(graph));
+	que_graph_free(graph);
+
+	dict_table_close(table_stats, thd, mdl_table);
+	dict_table_close(index_stats, thd, mdl_index);
 
 	trx_commit_for_mysql(trx);
-
+	dberr_t ret = trx->error_state;
 	trx->free();
 
 	if (!index_fetch_arg.stats_were_modified) {
-		return(DB_STATS_DO_NOT_EXIST);
+		return DB_STATS_DO_NOT_EXIST;
 	}
 
-	return(ret);
+	return ret;
 }
 
 /*********************************************************************//**
@@ -3593,249 +3580,46 @@ dict_stats_update_for_index(
 /*========================*/
 	dict_index_t*	index)	/*!< in/out: index */
 {
-	DBUG_ENTER("dict_stats_update_for_index");
+  dict_table_t *const table= index->table;
+  ut_ad(table->stat_initialized());
 
-	if (dict_stats_is_persistent_enabled(index->table)) {
-
-		if (dict_stats_persistent_storage_check(false)) {
-			index_stats_t stats = dict_stats_analyze_index(index);
-			index->table->stats_mutex_lock();
-			index->stat_index_size = stats.index_size;
-			index->stat_n_leaf_pages = stats.n_leaf_pages;
-			for (size_t i = 0; i < stats.stats.size(); ++i) {
-				index->stat_n_diff_key_vals[i]
-					= stats.stats[i].n_diff_key_vals;
-				index->stat_n_sample_sizes[i]
-					= stats.stats[i].n_sample_sizes;
-				index->stat_n_non_null_key_vals[i]
-					= stats.stats[i].n_non_null_key_vals;
-			}
-			index->table->stat_sum_of_other_index_sizes
-				+= index->stat_index_size;
-			index->table->stats_mutex_unlock();
-
-			dict_stats_save(index->table, &index->id);
-			DBUG_VOID_RETURN;
-		}
-		/* else */
-
-		if (innodb_index_stats_not_found == false &&
-		    index->stats_error_printed == false) {
-			/* Fall back to transient stats since the persistent
-			storage is not present or is corrupted */
-
-		ib::info() << "Recalculation of persistent statistics"
-			" requested for table " << index->table->name
-			<< " index " << index->name
-			<< " but the required"
-			" persistent statistics storage is not present or is"
-			" corrupted. Using transient stats instead.";
-			index->stats_error_printed = false;
-		}
-	}
-
-	dict_stats_update_transient_for_index(index);
-
-	DBUG_VOID_RETURN;
-}
-
-/*********************************************************************//**
-Calculates new estimates for table and index statistics. The statistics
-are used in query optimization.
-@return DB_SUCCESS or error code
-@retval DB_SUCCESS_LOCKED_REC if the table under bulk insert operation */
-dberr_t
-dict_stats_update(
-/*==============*/
-	dict_table_t*		table,	/*!< in/out: table */
-	dict_stats_upd_option_t	stats_upd_option)
-					/*!< in: whether to (re) calc
-					the stats or to fetch them from
-					the persistent statistics
-					storage */
-{
-	ut_ad(!table->stats_mutex_is_owner());
-
-	if (!table->is_readable()) {
-		return (dict_stats_report_error(table));
-	} else if (srv_force_recovery >= SRV_FORCE_NO_UNDO_LOG_SCAN) {
-		/* If we have set a high innodb_force_recovery level, do
-		not calculate statistics, as a badly corrupted index can
-		cause a crash in it. */
-		dict_stats_empty_table(table);
-		return(DB_SUCCESS);
-	}
-
-	if (trx_id_t bulk_trx_id = table->bulk_trx_id) {
-		if (trx_sys.find(nullptr, bulk_trx_id, false)) {
-			dict_stats_empty_table(table);
-			return DB_SUCCESS_LOCKED_REC;
-		}
-	}
-
-	switch (stats_upd_option) {
-	case DICT_STATS_RECALC_PERSISTENT:
-
-		if (srv_read_only_mode) {
-			goto transient;
-		}
-
-		/* Persistent recalculation requested, called from
-		1) ANALYZE TABLE, or
-		2) the auto recalculation background thread, or
-		3) open table if stats do not exist on disk and auto recalc
-		   is enabled */
-
-		/* InnoDB internal tables (e.g. SYS_TABLES) cannot have
-		persistent stats enabled */
-		ut_a(strchr(table->name.m_name, '/') != NULL);
-
-		/* check if the persistent statistics storage exists
-		before calling the potentially slow function
-		dict_stats_update_persistent(); that is a
-		prerequisite for dict_stats_save() succeeding */
-		if (dict_stats_persistent_storage_check(false)) {
-
-			dberr_t	err;
-
-			err = dict_stats_update_persistent(table);
-
-			if (err != DB_SUCCESS) {
-				return(err);
-			}
-
-			err = dict_stats_save(table, NULL);
-
-			return(err);
-		}
-
-		/* Fall back to transient stats since the persistent
-		storage is not present or is corrupted */
-
-		if (innodb_table_stats_not_found == false &&
-		    table->stats_error_printed == false) {
-		ib::warn() << "Recalculation of persistent statistics"
-			" requested for table "
-			<< table->name
-			<< " but the required persistent"
-			" statistics storage is not present or is corrupted."
-			" Using transient stats instead.";
-			table->stats_error_printed = true;
-		}
-
-		goto transient;
-
-	case DICT_STATS_RECALC_TRANSIENT:
-
-		goto transient;
-
-	case DICT_STATS_EMPTY_TABLE:
-		dict_stats_empty_table(table);
-
-		/* If table is using persistent stats,
-		then save the stats on disk */
-
-		if (dict_stats_is_persistent_enabled(table)) {
-
-			if (dict_stats_persistent_storage_check(false)) {
-
-				return(dict_stats_save(table, NULL));
-			}
-
-			return(DB_STATS_DO_NOT_EXIST);
-		}
-
-		return(DB_SUCCESS);
-
-	case DICT_STATS_FETCH_ONLY_IF_NOT_IN_MEMORY:
-
-		/* fetch requested, either fetch from persistent statistics
-		storage or use the old method */
-
-		if (table->stat_initialized) {
-			return(DB_SUCCESS);
-		}
-
-		/* InnoDB internal tables (e.g. SYS_TABLES) cannot have
-		persistent stats enabled */
-		ut_a(strchr(table->name.m_name, '/') != NULL);
-
-		if (!dict_stats_persistent_storage_check(false)) {
-			/* persistent statistics storage does not exist
-			or is corrupted, calculate the transient stats */
-
-			if (innodb_table_stats_not_found == false &&
-			    table->stats_error_printed == false &&
-			    !opt_bootstrap) {
-				ib::error() << "Fetch of persistent statistics"
-					" requested for table "
-					<< table->name
-					<< " but the required system tables "
-					<< TABLE_STATS_NAME_PRINT
-					<< " and " << INDEX_STATS_NAME_PRINT
-					<< " are not present or have unexpected"
-					" structure. Using transient stats instead.";
-					table->stats_error_printed = true;
-			}
-
-			goto transient;
-		}
-
-		dberr_t	err = dict_stats_fetch_from_ps(table);
-
-		switch (err) {
-		case DB_SUCCESS:
-			return(DB_SUCCESS);
-		case DB_STATS_DO_NOT_EXIST:
-
-			if (srv_read_only_mode) {
-				goto transient;
-			}
-#ifdef WITH_WSREP
-			if (wsrep_thd_skip_locking(current_thd)) {
-				goto transient;
-			}
+  if (table->stats_is_persistent())
+    switch (dict_stats_persistent_storage_check(false)) {
+    case SCHEMA_NOT_EXIST:
+      break;
+    case SCHEMA_INVALID:
+      if (table->stats_error_printed)
+        break;
+      table->stats_error_printed= true;
+      sql_print_information("InnoDB: Recalculation of persistent statistics"
+#ifdef EMBEDDED_LIBRARY
+                            " requested for table %.*s.%s index %s but"
+#else
+                            " requested for table %.*sQ.%sQ index %sQ but"
 #endif
-			if (dict_stats_auto_recalc_is_enabled(table)) {
-				return(dict_stats_update(
-						table,
-						DICT_STATS_RECALC_PERSISTENT));
-			}
+                            " the required persistent statistics storage"
+                            " is corrupted. Using transient stats instead.",
+                            int(table->name.dblen()), table->name.m_name,
+                            table->name.basename(), index->name());
+      break;
+    case SCHEMA_OK:
+      index_stats_t stats{dict_stats_analyze_index(index)};
+      table->stats_mutex_lock();
+      index->stat_index_size = stats.index_size;
+      index->stat_n_leaf_pages = stats.n_leaf_pages;
+      for (size_t i = 0; i < stats.stats.size(); ++i)
+      {
+        index->stat_n_diff_key_vals[i]= stats.stats[i].n_diff_key_vals;
+        index->stat_n_sample_sizes[i]= stats.stats[i].n_sample_sizes;
+        index->stat_n_non_null_key_vals[i]= stats.stats[i].n_non_null_key_vals;
+      }
+      table->stat_sum_of_other_index_sizes+= index->stat_index_size;
+      table->stats_mutex_unlock();
+      dict_stats_save(table, index->id);
+      return;
+    }
 
-			ib::info() << "Trying to use table " << table->name
-				<< " which has persistent statistics enabled,"
-				" but auto recalculation turned off and the"
-				" statistics do not exist in "
-				TABLE_STATS_NAME_PRINT
-				" and " INDEX_STATS_NAME_PRINT
-				". Please either run \"ANALYZE TABLE "
-				<< table->name << ";\" manually or enable the"
-				" auto recalculation with \"ALTER TABLE "
-				<< table->name << " STATS_AUTO_RECALC=1;\"."
-				" InnoDB will now use transient statistics for "
-				<< table->name << ".";
-
-			goto transient;
-		default:
-
-			if (innodb_table_stats_not_found == false &&
-			    table->stats_error_printed == false) {
-				ib::error() << "Error fetching persistent statistics"
-					" for table "
-					<< table->name
-					<< " from " TABLE_STATS_NAME_PRINT " and "
-					INDEX_STATS_NAME_PRINT ": " << err
-					<< ". Using transient stats method instead.";
-			}
-
-			goto transient;
-		}
-	/* no "default:" in order to produce a compilation warning
-	about unhandled enumeration value */
-	}
-
-transient:
-	return dict_stats_update_transient(table);
+  dict_stats_update_transient_for_index(index);
 }
 
 /** Execute DELETE FROM mysql.innodb_table_stats
@@ -3985,7 +3769,7 @@ dberr_t dict_stats_rename_index(const char *db, const char *table,
                                 const char *old_name, const char *new_name,
                                 trx_t *trx)
 {
-  if (!dict_stats_persistent_storage_check(true))
+  if (dict_stats_persistent_storage_check(true) != SCHEMA_OK)
     return DB_STATS_DO_NOT_EXIST;
   pars_info_t *pinfo= pars_info_create();
 
@@ -4121,7 +3905,7 @@ test_dict_stats_save()
 	index2_stat_n_sample_sizes[2] = TEST_IDX2_N_DIFF3_SAMPLE_SIZE;
 	index2_stat_n_sample_sizes[3] = TEST_IDX2_N_DIFF4_SAMPLE_SIZE;
 
-	ret = dict_stats_save(&table, NULL);
+	ret = dict_stats_save(&table);
 
 	ut_a(ret == DB_SUCCESS);
 
diff --git a/storage/innobase/dict/dict0stats_bg.cc b/storage/innobase/dict/dict0stats_bg.cc
index 700380d0d8f..13d5fb9a659 100644
--- a/storage/innobase/dict/dict0stats_bg.cc
+++ b/storage/innobase/dict/dict0stats_bg.cc
@@ -131,7 +131,9 @@ schedule new estimates for table and index statistics to be calculated.
 void dict_stats_update_if_needed_func(dict_table_t *table)
 #endif
 {
-	if (UNIV_UNLIKELY(!table->stat_initialized)) {
+        uint32_t stat{table->stat};
+
+	if (UNIV_UNLIKELY(!table->stat_initialized(stat))) {
 		/* The table may have been evicted from dict_sys
 		and reloaded internally by InnoDB for FOREIGN KEY
 		processing, but not reloaded by the SQL layer.
@@ -150,13 +152,9 @@ void dict_stats_update_if_needed_func(dict_table_t *table)
 	ulonglong	counter = table->stat_modified_counter++;
 	ulonglong	n_rows = dict_table_get_n_rows(table);
 
-	if (dict_stats_is_persistent_enabled(table)) {
-		if (table->name.is_temporary()) {
-			return;
-		}
-		if (counter > n_rows / 10 /* 10% */
-		    && dict_stats_auto_recalc_is_enabled(table)) {
-
+	if (table->stats_is_persistent(stat)) {
+		if (table->stats_is_auto_recalc(stat)
+		    && counter > n_rows / 10 && !table->name.is_temporary()) {
 #ifdef WITH_WSREP
 			/* Do not add table to background
 			statistic calculation if this thread is not a
@@ -199,7 +197,7 @@ void dict_stats_update_if_needed_func(dict_table_t *table)
 
 	if (counter > threshold) {
 		/* this will reset table->stat_modified_counter to 0 */
-		dict_stats_update(table, DICT_STATS_RECALC_TRANSIENT);
+		dict_stats_update_transient(table);
 	}
 }
 
@@ -325,7 +323,7 @@ invalid_table_id:
 
   if (!mdl || !table->is_accessible())
   {
-    dict_table_close(table, false, thd, mdl);
+    dict_table_close(table, thd, mdl);
     goto invalid_table_id;
   }
 
@@ -339,10 +337,10 @@ invalid_table_id:
     difftime(time(nullptr), table->stats_last_recalc) >= MIN_RECALC_INTERVAL;
 
   const dberr_t err= update_now
-    ? dict_stats_update(table, DICT_STATS_RECALC_PERSISTENT)
+    ? dict_stats_update_persistent_try(table)
     : DB_SUCCESS_LOCKED_REC;
 
-  dict_table_close(table, false, thd, mdl);
+  dict_table_close(table, thd, mdl);
 
   mysql_mutex_lock(&recalc_pool_mutex);
   auto i= std::find_if(recalc_pool.begin(), recalc_pool.end(),
diff --git a/storage/innobase/fsp/fsp0fsp.cc b/storage/innobase/fsp/fsp0fsp.cc
index fd0d547cee7..cc55ddd66cc 100644
--- a/storage/innobase/fsp/fsp0fsp.cc
+++ b/storage/innobase/fsp/fsp0fsp.cc
@@ -1657,12 +1657,11 @@ fseg_find_last_used_frag_page_slot(
 /** Calculate reserved fragment page slots.
 @param inode  file segment index
 @return number of fragment pages */
-static ulint fseg_get_n_frag_pages(const fseg_inode_t *inode)
+static uint32_t fseg_get_n_frag_pages(const fseg_inode_t *inode) noexcept
 {
-	ulint	i;
-	ulint	count	= 0;
+	uint32_t count = 0;
 
-	for (i = 0; i < FSEG_FRAG_ARR_N_SLOTS; i++) {
+	for (ulint i = 0; i < FSEG_FRAG_ARR_N_SLOTS; i++) {
 		if (FIL_NULL != fseg_get_nth_frag_page_no(inode, i)) {
 			count++;
 		}
@@ -1806,21 +1805,24 @@ Calculates the number of pages reserved by a segment, and how many pages are
 currently used.
 @return number of reserved pages */
 static
-ulint
+uint32_t
 fseg_n_reserved_pages_low(
 /*======================*/
 	const fseg_inode_t*	inode,	/*!< in: segment inode */
-	ulint*		used)	/*!< out: number of pages used (not
+	uint32_t*		used)	/*!< out: number of pages used (not
 				more than reserved) */
+	noexcept
 {
+	const uint32_t extent_size = FSP_EXTENT_SIZE;
+
 	*used = mach_read_from_4(inode + FSEG_NOT_FULL_N_USED)
-		+ FSP_EXTENT_SIZE * flst_get_len(inode + FSEG_FULL)
+		+ extent_size * flst_get_len(inode + FSEG_FULL)
 		+ fseg_get_n_frag_pages(inode);
 
 	return fseg_get_n_frag_pages(inode)
-		+ FSP_EXTENT_SIZE * flst_get_len(inode + FSEG_FREE)
-		+ FSP_EXTENT_SIZE * flst_get_len(inode + FSEG_NOT_FULL)
-		+ FSP_EXTENT_SIZE * flst_get_len(inode + FSEG_FULL);
+		+ extent_size * flst_get_len(inode + FSEG_FREE)
+		+ extent_size * flst_get_len(inode + FSEG_NOT_FULL)
+		+ extent_size * flst_get_len(inode + FSEG_FULL);
 }
 
 /** Calculate the number of pages reserved by a segment,
@@ -1830,9 +1832,9 @@ and how many pages are currently used.
 @param[out]     used    number of pages that are used (not more than reserved)
 @param[in,out]  mtr     mini-transaction
 @return number of reserved pages */
-ulint fseg_n_reserved_pages(const buf_block_t &block,
-                            const fseg_header_t *header, ulint *used,
-                            mtr_t *mtr)
+uint32_t fseg_n_reserved_pages(const buf_block_t &block,
+                               const fseg_header_t *header, uint32_t *used,
+                               mtr_t *mtr) noexcept
 {
   ut_ad(page_align(header) == block.page.frame);
   buf_block_t *iblock;
@@ -1857,7 +1859,7 @@ static dberr_t fseg_fill_free_list(const fseg_inode_t *inode,
                                    buf_block_t *iblock, fil_space_t *space,
                                    uint32_t hint, mtr_t *mtr)
 {
-  ulint	used;
+  uint32_t used;
 
   ut_ad(!((page_offset(inode) - FSEG_ARR_OFFSET) % FSEG_INODE_SIZE));
   ut_d(space->modify_check(*mtr));
@@ -2008,8 +2010,7 @@ fseg_alloc_free_page_low(
 	dberr_t*		err)
 {
 	ib_id_t		seg_id;
-	ulint		used;
-	ulint		reserved;
+	uint32_t	used, reserved;
 	xdes_t*		descr;		/*!< extent of the hinted page */
 	uint32_t	ret_page;	/*!< the allocated page offset, FIL_NULL
 					if could not be allocated */
diff --git a/storage/innobase/fts/fts0config.cc b/storage/innobase/fts/fts0config.cc
index 4566224e171..524f648676e 100644
--- a/storage/innobase/fts/fts0config.cc
+++ b/storage/innobase/fts/fts0config.cc
@@ -231,7 +231,7 @@ fts_config_set_value(
 	n_rows_updated = trx->undo_no - undo_no;
 
 	/* Check if we need to do an insert. */
-	if (n_rows_updated == 0) {
+	if (error == DB_SUCCESS && n_rows_updated == 0) {
 		info = pars_info_create();
 
 		pars_info_bind_varchar_literal(
diff --git a/storage/innobase/fts/fts0fts.cc b/storage/innobase/fts/fts0fts.cc
index 183172a8fe6..5bf9548f95c 100644
--- a/storage/innobase/fts/fts0fts.cc
+++ b/storage/innobase/fts/fts0fts.cc
@@ -37,6 +37,7 @@ Full Text Search interface
 #include "fts0plugin.h"
 #include "dict0stats.h"
 #include "btr0pcur.h"
+#include "log.h"
 
 static const ulint FTS_MAX_ID_LEN = 32;
 
@@ -1870,8 +1871,10 @@ fts_create_one_common_table(
 		}
 	}
 
-	ib::warn() << "Failed to create FTS common table " << fts_table_name;
-	trx->error_state = error;
+	ut_ad(trx->state == TRX_STATE_NOT_STARTED
+	      || trx->error_state == error);
+	sql_print_warning("InnoDB: Failed to create FTS common table %s: %s",
+			  fts_table_name, ut_strerr(error));
 	return NULL;
 }
 
@@ -2057,8 +2060,10 @@ fts_create_one_index_table(
 		}
 	}
 
-	ib::warn() << "Failed to create FTS index table " << table_name;
-	trx->error_state = error;
+	ut_ad(trx->state == TRX_STATE_NOT_STARTED
+	      || trx->error_state == error);
+	sql_print_warning("InnoDB: Failed to create FTS index table %s: %s",
+			  table_name, ut_strerr(error));
 	return NULL;
 }
 
diff --git a/storage/innobase/fts/fts0opt.cc b/storage/innobase/fts/fts0opt.cc
index 30889e5903c..38b45a94142 100644
--- a/storage/innobase/fts/fts0opt.cc
+++ b/storage/innobase/fts/fts0opt.cc
@@ -2809,7 +2809,7 @@ static void fts_optimize_sync_table(dict_table_t *table,
 		  std::this_thread::sleep_for(std::chrono::seconds(6)););
 
   if (mdl_ticket)
-    dict_table_close(sync_table, false, fts_opt_thd, mdl_ticket);
+    dict_table_close(sync_table, fts_opt_thd, mdl_ticket);
 }
 
 /**********************************************************************//**
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index 0d26b70a779..05d7b46866d 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -1475,9 +1475,9 @@ static void innodb_drop_database(handlerton*, char *path)
     trx->commit();
 
   if (table_stats)
-    dict_table_close(table_stats, true, thd, mdl_table);
+    dict_table_close(table_stats, thd, mdl_table);
   if (index_stats)
-    dict_table_close(index_stats, true, thd, mdl_index);
+    dict_table_close(index_stats, thd, mdl_index);
   row_mysql_unlock_data_dictionary(trx);
 
   trx->free();
@@ -1625,9 +1625,9 @@ inline void ha_innobase::reload_statistics()
   if (dict_table_t *table= m_prebuilt ? m_prebuilt->table : nullptr)
   {
     if (table->is_readable())
-      dict_stats_init(table);
+      statistics_init(table, true);
     else
-      table->stat_initialized= 1;
+      table->stat.fetch_or(dict_table_t::STATS_INITIALIZED);
   }
 }
 
@@ -1952,7 +1952,7 @@ static int innodb_check_version(handlerton *hton, const char *path,
   {
     const trx_id_t trx_id= table->def_trx_id;
     DBUG_ASSERT(trx_id <= create_id);
-    dict_table_close(table);
+    table->release();
     DBUG_PRINT("info", ("create_id: %llu  trx_id: %" PRIu64, create_id, trx_id));
     DBUG_RETURN(create_id != trx_id);
   }
@@ -2991,6 +2991,44 @@ static int innobase_rollback_by_xid(XID *xid) noexcept
   return XAER_NOTA;
 }
 
+/** Initialize the InnoDB persistent statistics attributes.
+@param table           InnoDB table
+@param table_options   MariaDB table options
+@param sar             the value of STATS_AUTO_RECALC
+@param initialized     whether the InnoDB statistics were already initialized
+@return whether table->stats_sample_pages needs to be initialized */
+static bool innodb_copy_stat_flags(dict_table_t *table,
+                                   ulong table_options,
+                                   enum_stats_auto_recalc sar,
+                                   bool initialized) noexcept
+{
+  if (table->is_temporary() || table->no_rollback())
+  {
+    table->stat= dict_table_t::STATS_INITIALIZED |
+      dict_table_t::STATS_PERSISTENT_OFF | dict_table_t::STATS_AUTO_RECALC_OFF;
+    table->stats_sample_pages= 1;
+    return false;
+  }
+
+  static_assert(HA_OPTION_STATS_PERSISTENT ==
+                dict_table_t::STATS_PERSISTENT_ON << 11, "");
+  static_assert(HA_OPTION_NO_STATS_PERSISTENT ==
+                dict_table_t::STATS_PERSISTENT_OFF << 11, "");
+  uint32_t stat=
+    (table_options &
+     (HA_OPTION_STATS_PERSISTENT | HA_OPTION_NO_STATS_PERSISTENT)) >> 11;
+  static_assert(uint32_t{HA_STATS_AUTO_RECALC_ON} << 3 ==
+                dict_table_t::STATS_AUTO_RECALC_ON, "");
+  static_assert(uint32_t{HA_STATS_AUTO_RECALC_OFF} << 3 ==
+                dict_table_t::STATS_AUTO_RECALC_OFF, "");
+  static_assert(true == dict_table_t::STATS_INITIALIZED, "");
+  stat|= (sar & (HA_STATS_AUTO_RECALC_ON | HA_STATS_AUTO_RECALC_OFF)) << 3 |
+    uint32_t(initialized);
+
+  table->stat= stat;
+  return true;
+}
+
 /*********************************************************************//**
 Copy table flags from MySQL's HA_CREATE_INFO into an InnoDB table object.
 Those flags are stored in .frm file and end up in the MySQL table object,
@@ -3003,29 +3041,9 @@ innobase_copy_frm_flags_from_create_info(
 	dict_table_t*		innodb_table,	/*!< in/out: InnoDB table */
 	const HA_CREATE_INFO*	create_info)	/*!< in: create info */
 {
-	ibool	ps_on;
-	ibool	ps_off;
-
-	if (innodb_table->is_temporary()
-	    || innodb_table->no_rollback()) {
-		/* Temp tables do not use persistent stats. */
-		ps_on = FALSE;
-		ps_off = TRUE;
-	} else {
-		ps_on = create_info->table_options
-			& HA_OPTION_STATS_PERSISTENT;
-		ps_off = create_info->table_options
-			& HA_OPTION_NO_STATS_PERSISTENT;
-	}
-
-	dict_stats_set_persistent(innodb_table, ps_on, ps_off);
-
-	dict_stats_auto_recalc_set(
-		innodb_table,
-		create_info->stats_auto_recalc == HA_STATS_AUTO_RECALC_ON,
-		create_info->stats_auto_recalc == HA_STATS_AUTO_RECALC_OFF);
-
-	innodb_table->stats_sample_pages = create_info->stats_sample_pages;
+  if (innodb_copy_stat_flags(innodb_table, create_info->table_options,
+                             create_info->stats_auto_recalc, false))
+    innodb_table->stats_sample_pages= create_info->stats_sample_pages;
 }
 
 /*********************************************************************//**
@@ -3039,28 +3057,10 @@ innobase_copy_frm_flags_from_table_share(
 	dict_table_t*		innodb_table,	/*!< in/out: InnoDB table */
 	const TABLE_SHARE*	table_share)	/*!< in: table share */
 {
-	ibool	ps_on;
-	ibool	ps_off;
-
-	if (innodb_table->is_temporary()) {
-		/* Temp tables do not use persistent stats */
-		ps_on = FALSE;
-		ps_off = TRUE;
-	} else {
-		ps_on = table_share->db_create_options
-			& HA_OPTION_STATS_PERSISTENT;
-		ps_off = table_share->db_create_options
-			& HA_OPTION_NO_STATS_PERSISTENT;
-	}
-
-	dict_stats_set_persistent(innodb_table, ps_on, ps_off);
-
-	dict_stats_auto_recalc_set(
-		innodb_table,
-		table_share->stats_auto_recalc == HA_STATS_AUTO_RECALC_ON,
-		table_share->stats_auto_recalc == HA_STATS_AUTO_RECALC_OFF);
-
-	innodb_table->stats_sample_pages = table_share->stats_sample_pages;
+  if (innodb_copy_stat_flags(innodb_table, table_share->db_create_options,
+                             table_share->stats_auto_recalc,
+                             innodb_table->stat_initialized()))
+    innodb_table->stats_sample_pages= table_share->stats_sample_pages;
 }
 
 /*********************************************************************//**
@@ -3300,7 +3300,7 @@ static bool innobase_query_caching_table_check(
 
 	bool allow = innobase_query_caching_table_check_low(table, trx);
 
-	dict_table_close(table);
+	table->release();
 
 	if (allow) {
 		/* If the isolation level is high, assign a read view for the
@@ -5822,6 +5822,70 @@ static void initialize_auto_increment(dict_table_t *table, const Field& field,
   table->autoinc_mutex.wr_unlock();
 }
 
+dberr_t ha_innobase::statistics_init(dict_table_t *table, bool recalc)
+{
+  ut_ad(table->is_readable());
+  ut_ad(!table->stats_mutex_is_owner());
+
+  uint32_t stat= table->stat;
+  dberr_t err= DB_SUCCESS;
+
+  if (!recalc && dict_table_t::stat_initialized(stat));
+  else if (srv_force_recovery >= SRV_FORCE_NO_UNDO_LOG_SCAN)
+    dict_stats_empty_table(table);
+  else
+  {
+    if (dict_table_t::stats_is_persistent(stat) && !srv_read_only_mode
+#ifdef WITH_WSREP
+        && !wsrep_thd_skip_locking(m_user_thd)
+#endif
+    )
+    {
+      switch (dict_stats_persistent_storage_check(false)) {
+      case SCHEMA_OK:
+        if (recalc)
+        {
+        recalc:
+          err= dict_stats_update_persistent(table);
+          if (err == DB_SUCCESS)
+            err= dict_stats_save(table);
+        }
+        else
+        {
+          err= dict_stats_fetch_from_ps(table);
+          if (err == DB_STATS_DO_NOT_EXIST && table->stats_is_auto_recalc())
+            goto recalc;
+        }
+        if (err == DB_SUCCESS)
+          return err;
+        if (!recalc)
+          break;
+        /* fall through */
+      case SCHEMA_INVALID:
+        if (table->stats_error_printed)
+          break;
+        table->stats_error_printed = true;
+        if (opt_bootstrap)
+          break;
+        sql_print_warning("InnoDB: %s of persistent statistics requested"
+                          " for table %.*sQ.%sQ"
+                          " but the required persistent statistics storage"
+                          " is corrupted.",
+                          recalc ? "Recalculation" : "Fetch",
+                          int(table->name.dblen()), table->name.m_name,
+                          table->name.basename());
+        /* fall through */
+      case SCHEMA_NOT_EXIST:
+        err= DB_STATS_DO_NOT_EXIST;
+      }
+    }
+
+    dict_stats_update_transient(table);
+  }
+
+  return err;
+}
+
 /** Open an InnoDB table
 @param[in]	name	table name
 @return	error code
@@ -13313,7 +13377,7 @@ ha_innobase::create(const char *name, TABLE *form, HA_CREATE_INFO *create_info,
         as it is not needed and would report error due to the table
         not being readable yet. */
         if (!info.creating_stub())
-          dict_stats_update(info.table(), DICT_STATS_EMPTY_TABLE);
+          dict_stats_empty_table_and_save(info.table());
         if (!info.table()->is_temporary())
           log_write_up_to(trx->commit_lsn, true);
         info.table()->release();
@@ -13367,6 +13431,8 @@ ha_innobase::discard_or_import_tablespace(
 		DBUG_RETURN(HA_ERR_TABLE_NEEDS_UPGRADE);
 	}
 
+	ut_ad(m_prebuilt->table->stat_initialized());
+
 	if (m_prebuilt->table->space == fil_system.sys_space) {
 		ib_senderrf(
 			m_prebuilt->trx->mysql_thd, IB_LOG_LEVEL_ERROR,
@@ -13440,23 +13506,17 @@ ha_innobase::discard_or_import_tablespace(
 				    err, m_prebuilt->table->flags, NULL));
 	}
 
-	if (dict_stats_is_persistent_enabled(m_prebuilt->table)) {
-		dberr_t		ret;
+	dict_table_t* t = m_prebuilt->table;
 
-		/* Adjust the persistent statistics. */
-		ret = dict_stats_update(m_prebuilt->table,
-					DICT_STATS_RECALC_PERSISTENT);
-
-		if (ret != DB_SUCCESS) {
-			push_warning_printf(
-				ha_thd(),
-				Sql_condition::WARN_LEVEL_WARN,
-				ER_ALTER_INFO,
-				"Error updating stats for table '%s'"
-				" after table rebuild: %s",
-				m_prebuilt->table->name.m_name,
-				ut_strerr(ret));
-		}
+	if (dberr_t ret = dict_stats_update_persistent_try(t)) {
+		push_warning_printf(
+			ha_thd(),
+			Sql_condition::WARN_LEVEL_WARN,
+			ER_ALTER_INFO,
+			"Error updating stats after"
+			" ALTER TABLE %.*sQ.%sQ IMPORT TABLESPACE: %s",
+			int(t->name.dblen()), t->name.m_name,
+			t->name.basename(), ut_strerr(ret));
 	}
 
 	DBUG_RETURN(0);
@@ -13627,7 +13687,7 @@ int ha_innobase::delete_table(const char *name)
     /* This looks like the rollback of ALTER TABLE...ADD PARTITION
     that was caused by MDL timeout. We could have written undo log
     for inserting the data into the new partitions. */
-    if (table->stat_persistent != DICT_STATS_PERSISTENT_OFF)
+    if (!(table->stat & dict_table_t::STATS_PERSISTENT_OFF))
     {
       /* We do not really know if we are holding MDL_EXCLUSIVE. Even
       though this code is handling the case that we are not holding
@@ -13642,7 +13702,7 @@ int ha_innobase::delete_table(const char *name)
 
   DEBUG_SYNC(thd, "before_delete_table_stats");
 
-  if (err == DB_SUCCESS && dict_stats_is_persistent_enabled(table) &&
+  if (err == DB_SUCCESS && table->stats_is_persistent() &&
       !table->is_stats_table())
   {
     table_stats= dict_table_open_on_name(TABLE_STATS_NAME, false,
@@ -13680,8 +13740,8 @@ int ha_innobase::delete_table(const char *name)
       ut_ad(err == DB_LOCK_WAIT);
       ut_ad(trx->error_state == DB_SUCCESS);
       err= DB_SUCCESS;
-      dict_table_close(table_stats, false, thd, mdl_table);
-      dict_table_close(index_stats, false, thd, mdl_index);
+      dict_table_close(table_stats, thd, mdl_table);
+      dict_table_close(index_stats, thd, mdl_index);
       table_stats= nullptr;
       index_stats= nullptr;
     }
@@ -13755,9 +13815,9 @@ err_exit:
       purge_sys.resume_FTS();
 #endif
     if (table_stats)
-      dict_table_close(table_stats, true, thd, mdl_table);
+      dict_table_close(table_stats, thd, mdl_table);
     if (index_stats)
-      dict_table_close(index_stats, true, thd, mdl_index);
+      dict_table_close(index_stats, thd, mdl_index);
     row_mysql_unlock_data_dictionary(trx);
     if (trx != parent_trx)
       trx->free();
@@ -13787,9 +13847,9 @@ err_exit:
   std::vector<pfs_os_file_t> deleted;
   trx->commit(deleted);
   if (table_stats)
-    dict_table_close(table_stats, true, thd, mdl_table);
+    dict_table_close(table_stats, thd, mdl_table);
   if (index_stats)
-    dict_table_close(index_stats, true, thd, mdl_index);
+    dict_table_close(index_stats, thd, mdl_index);
   row_mysql_unlock_data_dictionary(trx);
   for (pfs_os_file_t d : deleted)
     os_file_close(d);
@@ -14005,18 +14065,21 @@ int ha_innobase::truncate()
     error= fts_lock_tables(trx, *ib_table);
   }
 
-  /* Wait for purge threads to stop using the table. */
-  for (uint n = 15; ib_table->get_ref_count() > 1; )
+  if (error == DB_SUCCESS)
   {
-    if (!--n)
+    /* Wait for purge threads to stop using the table. */
+    for (uint n = 15; ib_table->get_ref_count() > 1; )
     {
-      error= DB_LOCK_WAIT_TIMEOUT;
-      break;
+      if (!--n)
+      {
+        error= DB_LOCK_WAIT_TIMEOUT;
+        break;
+      }
+      std::this_thread::sleep_for(std::chrono::milliseconds(50));
     }
-    std::this_thread::sleep_for(std::chrono::milliseconds(50));
   }
 
-  if (error == DB_SUCCESS && dict_stats_is_persistent_enabled(ib_table) &&
+  if (error == DB_SUCCESS && ib_table->stats_is_persistent() &&
       !ib_table->is_stats_table())
   {
     table_stats= dict_table_open_on_name(TABLE_STATS_NAME, false,
@@ -14106,7 +14169,7 @@ int ha_innobase::truncate()
 
   if (!err)
   {
-    dict_stats_update(m_prebuilt->table, DICT_STATS_EMPTY_TABLE);
+    dict_stats_empty_table_and_save(m_prebuilt->table);
     log_write_up_to(trx->commit_lsn, true);
     row_prebuilt_t *prebuilt= m_prebuilt;
     uchar *upd_buf= m_upd_buf;
@@ -14138,13 +14201,49 @@ int ha_innobase::truncate()
   mem_heap_free(heap);
 
   if (table_stats)
-    dict_table_close(table_stats, false, m_user_thd, mdl_table);
+    dict_table_close(table_stats, m_user_thd, mdl_table);
   if (index_stats)
-    dict_table_close(index_stats, false, m_user_thd, mdl_index);
+    dict_table_close(index_stats, m_user_thd, mdl_index);
 
   DBUG_RETURN(err);
 }
 
+/** Deinitialize InnoDB persistent statistics, forcing them
+to be reloaded on subsequent ha_innobase::open().
+@param t  table for which the cached STATS_PERSISTENT are to be evicted */
+static void stats_deinit(dict_table_t *t) noexcept
+{
+  ut_ad(dict_sys.frozen());
+  ut_ad(t->get_ref_count() == 0);
+
+  if (t->is_temporary() || t->no_rollback())
+    return;
+
+  t->stats_mutex_lock();
+  t->stat= t->stat & ~dict_table_t::STATS_INITIALIZED;
+  MEM_UNDEFINED(&t->stat_n_rows, sizeof t->stat_n_rows);
+  MEM_UNDEFINED(&t->stat_clustered_index_size,
+                sizeof t->stat_clustered_index_size);
+  MEM_UNDEFINED(&t->stat_sum_of_other_index_sizes,
+                sizeof t->stat_sum_of_other_index_sizes);
+  MEM_UNDEFINED(&t->stat_modified_counter, sizeof t->stat_modified_counter);
+#ifdef HAVE_valgrind
+  for (dict_index_t *i= dict_table_get_first_index(t); i;
+       i= dict_table_get_next_index(i))
+  {
+    MEM_UNDEFINED(i->stat_n_diff_key_vals,
+                  i->n_uniq * sizeof *i->stat_n_diff_key_vals);
+    MEM_UNDEFINED(i->stat_n_sample_sizes,
+                  i->n_uniq * sizeof *i->stat_n_sample_sizes);
+    MEM_UNDEFINED(i->stat_n_non_null_key_vals,
+                  i->n_uniq * sizeof *i->stat_n_non_null_key_vals);
+    MEM_UNDEFINED(&i->stat_index_size, sizeof i->stat_index_size);
+    MEM_UNDEFINED(&i->stat_n_leaf_pages, sizeof i->stat_n_leaf_pages);
+  }
+#endif /* HAVE_valgrind */
+  t->stats_mutex_unlock();
+}
+
 /*********************************************************************//**
 Renames an InnoDB table.
 @return 0 or error code */
@@ -14178,15 +14277,20 @@ ha_innobase::rename_table(
 	dberr_t error = DB_SUCCESS;
 	const bool from_temp = dict_table_t::is_temporary_name(norm_from);
 
+	dict_table_t* t;
+
 	if (from_temp) {
 		/* There is no need to lock any FOREIGN KEY child tables. */
-	} else if (dict_table_t *table = dict_table_open_on_name(
-		    norm_from, false, DICT_ERR_IGNORE_FK_NOKEY)) {
-		error = lock_table_children(table, trx);
-		if (error == DB_SUCCESS) {
-			error = lock_table_for_trx(table, trx, LOCK_X);
+		t = nullptr;
+	} else {
+		t = dict_table_open_on_name(
+			norm_from, false, DICT_ERR_IGNORE_FK_NOKEY);
+		if (t) {
+			error = lock_table_children(t, trx);
+			if (error == DB_SUCCESS) {
+				error = lock_table_for_trx(t, trx, LOCK_X);
+			}
 		}
-		table->release();
 	}
 
 	if (strcmp(norm_from, TABLE_STATS_NAME)
@@ -14227,10 +14331,8 @@ ha_innobase::rename_table(
 				we cannot lock the tables, when the
 				table is being renamed from from a
 				temporary name. */
-				dict_table_close(table_stats, false, thd,
-						 mdl_table);
-				dict_table_close(index_stats, false, thd,
-						 mdl_index);
+				dict_table_close(table_stats, thd, mdl_table);
+				dict_table_close(index_stats, thd, mdl_index);
 				table_stats = nullptr;
 				index_stats = nullptr;
 			}
@@ -14272,16 +14374,27 @@ ha_innobase::rename_table(
 
 	if (error == DB_SUCCESS) {
 		trx->flush_log_later = true;
+		if (t) {
+			ut_ad(dict_sys.frozen());
+			if (UNIV_LIKELY(t->release())) {
+				stats_deinit(t);
+			} else {
+				ut_ad("unexpected references" == 0);
+			}
+		}
 		innobase_commit_low(trx);
 	} else {
+		if (t) {
+			t->release();
+		}
 		trx->rollback();
 	}
 
 	if (table_stats) {
-		dict_table_close(table_stats, true, thd, mdl_table);
+		dict_table_close(table_stats, thd, mdl_table);
 	}
 	if (index_stats) {
-		dict_table_close(index_stats, true, thd, mdl_index);
+		dict_table_close(index_stats, thd, mdl_index);
 	}
 	row_mysql_unlock_data_dictionary(trx);
 	if (error == DB_SUCCESS) {
@@ -14295,10 +14408,10 @@ ha_innobase::rename_table(
 		during DDL operations, because the duplicate key would
 		exist in metadata tables, not in the user table. */
 		my_error(ER_TABLE_EXISTS_ERROR, MYF(0), to);
-		error = DB_ERROR;
+		DBUG_RETURN(HA_ERR_GENERIC);
 	} else if (error == DB_LOCK_WAIT_TIMEOUT) {
 		my_error(ER_LOCK_WAIT_TIMEOUT, MYF(0));
-		error = DB_LOCK_WAIT;
+		DBUG_RETURN(HA_ERR_GENERIC);
 	}
 
 	DBUG_RETURN(convert_error_code_to_mysql(error, 0, NULL));
@@ -14514,7 +14627,7 @@ ha_innobase::scan_time()
 
 	ulint	stat_clustered_index_size;
         IO_AND_CPU_COST cost;
-	ut_a(m_prebuilt->table->stat_initialized);
+	ut_ad(m_prebuilt->table->stat_initialized());
 
 	stat_clustered_index_size =
 		m_prebuilt->table->stat_clustered_index_size;
@@ -14670,7 +14783,7 @@ innodb_rec_per_key(
 	rec_per_key_t	rec_per_key;
 	ib_uint64_t	n_diff;
 
-	ut_a(index->table->stat_initialized);
+	ut_ad(index->table->stat_initialized());
 
 	ut_ad(i < dict_index_get_n_unique(index));
 	ut_ad(!dict_index_is_spatial(index));
@@ -14808,57 +14921,75 @@ ha_innobase::info_low(
 	ib_table = m_prebuilt->table;
 	DBUG_ASSERT(ib_table->get_ref_count() > 0);
 
-	if (!ib_table->is_readable()) {
+	if (!ib_table->is_readable()
+	    || srv_force_recovery >= SRV_FORCE_NO_UNDO_LOG_SCAN) {
 		dict_stats_empty_table(ib_table);
-	}
+        } else if (flag & HA_STATUS_TIME) {
+		stats.update_time = ib_table->update_time;
+		if (!is_analyze && !innobase_stats_on_metadata) {
+			goto stats_fetch;
+		}
 
-	if (flag & HA_STATUS_TIME) {
-		if (is_analyze || innobase_stats_on_metadata) {
+		dberr_t ret;
+		m_prebuilt->trx->op_info = "updating table statistics";
 
-			dict_stats_upd_option_t	opt;
-			dberr_t			ret;
-
-			m_prebuilt->trx->op_info = "updating table statistics";
-
-			if (dict_stats_is_persistent_enabled(ib_table)) {
-				if (is_analyze) {
-					if (!srv_read_only_mode) {
-						dict_stats_recalc_pool_del(
-							ib_table->id, false);
-					}
-					opt = DICT_STATS_RECALC_PERSISTENT;
-				} else {
-					/* This is e.g. 'SHOW INDEXES', fetch
-					the persistent stats from disk. */
-					opt = DICT_STATS_FETCH_ONLY_IF_NOT_IN_MEMORY;
-				}
+		if (ib_table->stats_is_persistent()
+		    && !srv_read_only_mode
+		    && dict_stats_persistent_storage_check(false)
+		    == SCHEMA_OK) {
+			if (is_analyze) {
+				dict_stats_recalc_pool_del(ib_table->id,
+							   false);
+recalc:
+				ret = statistics_init(ib_table, is_analyze);
 			} else {
-				opt = DICT_STATS_RECALC_TRANSIENT;
+				/* This is e.g. 'SHOW INDEXES' */
+				ret = statistics_init(ib_table, is_analyze);
+				switch (ret) {
+				case DB_SUCCESS:
+					break;
+				default:
+					goto error;
+				case DB_STATS_DO_NOT_EXIST:
+					if (!ib_table
+					    ->stats_is_auto_recalc()) {
+						break;
+					}
+
+					if (opt_bootstrap) {
+						break;
+					}
+#ifdef WITH_WSREP
+					if (wsrep_thd_skip_locking(
+						    m_user_thd)) {
+						break;
+					}
+#endif
+					is_analyze = true;
+					goto recalc;
+				}
 			}
-
-			ret = dict_stats_update(ib_table, opt);
-
+		} else {
+			ret = dict_stats_update_transient(ib_table);
 			if (ret != DB_SUCCESS) {
+error:
 				m_prebuilt->trx->op_info = "";
 				DBUG_RETURN(HA_ERR_GENERIC);
 			}
-
-			m_prebuilt->trx->op_info =
-				"returning various info to MariaDB";
 		}
 
-
-		stats.update_time = (ulong) ib_table->update_time;
+		m_prebuilt->trx->op_info = "returning various info to MariaDB";
+	} else {
+stats_fetch:
+		statistics_init(ib_table, false);
 	}
 
-	dict_stats_init(ib_table);
-
 	if (flag & HA_STATUS_VARIABLE) {
 
 		ulint	stat_clustered_index_size;
 		ulint	stat_sum_of_other_index_sizes;
 
-		ut_a(ib_table->stat_initialized);
+		ut_ad(ib_table->stat_initialized());
 
 #if !defined NO_ELISION && !defined SUX_LOCK_GENERIC
 		if (xbegin()) {
@@ -15012,7 +15143,7 @@ ha_innobase::info_low(
 		auto _ = make_scope_exit([ib_table]() {
 			ib_table->stats_shared_unlock(); });
 
-		ut_a(ib_table->stat_initialized);
+		ut_ad(ib_table->stat_initialized());
 
 		for (uint i = 0; i < table->s->keys; i++) {
 			ulong	j;
@@ -15629,7 +15760,7 @@ get_foreign_key_info(
 					<< foreign->foreign_table_name;
  			}
 		} else {
-			dict_table_close(ref_table, true);
+			ref_table->release();
 		}
 	}
 
@@ -15860,8 +15991,7 @@ ha_innobase::extra(
 			/* During copy alter operation, InnoDB
 			updates the stats only for non-persistent
 			tables. */
-			if (!dict_stats_is_persistent_enabled(
-					m_prebuilt->table)) {
+			if (!m_prebuilt->table->stats_is_persistent()) {
 				dict_stats_update_if_needed(
 					m_prebuilt->table, *trx);
 			}
@@ -17591,7 +17721,7 @@ static int innodb_ft_aux_table_validate(THD *thd, st_mysql_sys_var*,
 			    table_name, false, DICT_ERR_IGNORE_NONE)) {
 			const table_id_t id = dict_table_has_fts_index(table)
 				? table->id : 0;
-			dict_table_close(table);
+			table->release();
 			if (id) {
 				innodb_ft_aux_table_id = id;
 				if (table_name == buf) {
@@ -18624,7 +18754,7 @@ static void innodb_log_file_size_update(THD *thd, st_mysql_sys_var*,
                     " innodb_log_buffer_size=%u", MYF(0), log_sys.buf_size);
   else
   {
-    switch (log_sys.resize_start(*static_cast<const ulonglong*>(save))) {
+    switch (log_sys.resize_start(*static_cast<const ulonglong*>(save), thd)) {
     case log_t::RESIZE_NO_CHANGE:
       break;
     case log_t::RESIZE_IN_PROGRESS:
@@ -18636,12 +18766,11 @@ static void innodb_log_file_size_update(THD *thd, st_mysql_sys_var*,
       ib_senderrf(thd, IB_LOG_LEVEL_ERROR, ER_CANT_CREATE_HANDLER_FILE);
       break;
     case log_t::RESIZE_STARTED:
-      const lsn_t start{log_sys.resize_in_progress()};
       for (timespec abstime;;)
       {
         if (thd_kill_level(thd))
         {
-          log_sys.resize_abort();
+          log_sys.resize_abort(thd);
           break;
         }
 
@@ -18656,13 +18785,15 @@ static void innodb_log_file_size_update(THD *thd, st_mysql_sys_var*,
           resizing= log_sys.resize_in_progress();
         }
         mysql_mutex_unlock(&buf_pool.flush_list_mutex);
-        if (start > log_sys.get_lsn())
+        if (!resizing || !log_sys.resize_running(thd))
+          break;
+        if (resizing > log_sys.get_lsn())
         {
           ut_ad(!log_sys.is_mmap());
           /* The server is almost idle. Write dummy FILE_CHECKPOINT records
           to ensure that the log resizing will complete. */
           log_sys.latch.wr_lock(SRW_LOCK_CALL);
-          while (start > log_sys.get_lsn())
+          while (resizing > log_sys.get_lsn())
           {
             mtr_t mtr;
             mtr.start();
@@ -18670,8 +18801,6 @@ static void innodb_log_file_size_update(THD *thd, st_mysql_sys_var*,
           }
           log_sys.latch.wr_unlock();
         }
-        if (!resizing || resizing > start /* only wait for our resize */)
-          break;
       }
     }
   }
@@ -19193,12 +19322,12 @@ static MYSQL_SYSVAR_BOOL(stats_on_metadata, innobase_stats_on_metadata,
   " SHOW TABLE STATUS for tables that use transient statistics (off by default)",
   NULL, NULL, FALSE);
 
-static MYSQL_SYSVAR_ULONGLONG(stats_transient_sample_pages,
+static MYSQL_SYSVAR_UINT(stats_transient_sample_pages,
   srv_stats_transient_sample_pages,
   PLUGIN_VAR_RQCMDARG,
   "The number of leaf index pages to sample when calculating transient"
   " statistics (if persistent statistics are not used, default 8)",
-  NULL, NULL, 8, 1, ~0ULL, 0);
+  NULL, NULL, 8, 1, ~0U, 0);
 
 static MYSQL_SYSVAR_BOOL(stats_persistent, srv_stats_persistent,
   PLUGIN_VAR_OPCMDARG,
@@ -19214,12 +19343,12 @@ static MYSQL_SYSVAR_BOOL(stats_auto_recalc, srv_stats_auto_recalc,
   " new statistics)",
   NULL, NULL, TRUE);
 
-static MYSQL_SYSVAR_ULONGLONG(stats_persistent_sample_pages,
+static MYSQL_SYSVAR_UINT(stats_persistent_sample_pages,
   srv_stats_persistent_sample_pages,
   PLUGIN_VAR_RQCMDARG,
   "The number of leaf index pages to sample when calculating persistent"
   " statistics (by ANALYZE, default 20)",
-  NULL, NULL, 20, 1, ~0ULL, 0);
+  NULL, NULL, 20, 1, ~0U, 0);
 
 static MYSQL_SYSVAR_ULONGLONG(stats_modified_counter, srv_stats_modified_counter,
   PLUGIN_VAR_RQCMDARG,
diff --git a/storage/innobase/handler/ha_innodb.h b/storage/innobase/handler/ha_innodb.h
index 05b29ab4517..3e961f011bd 100644
--- a/storage/innobase/handler/ha_innodb.h
+++ b/storage/innobase/handler/ha_innodb.h
@@ -95,6 +95,9 @@ public:
 
 	int open(const char *name, int mode, uint test_if_locked) override;
 
+	/** Fetch or recalculate InnoDB table statistics */
+	dberr_t statistics_init(dict_table_t *table, bool recalc);
+
 	handler* clone(const char *name, MEM_ROOT *mem_root) override;
 
 	int close(void) override;
diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc
index c9288a6ea8a..dd07d891bce 100644
--- a/storage/innobase/handler/handler0alter.cc
+++ b/storage/innobase/handler/handler0alter.cc
@@ -7523,10 +7523,11 @@ error_handled:
 		}
 	}
 
-	/* n_ref_count must be 1, because background threads cannot
+	/* n_ref_count must be 1 (+ InnoDB_share),
+	because background threads cannot
 	be executing on this very table as we are
 	holding MDL_EXCLUSIVE. */
-	ut_ad(ctx->online || user_table->get_ref_count() == 1);
+	ut_ad(ctx->online || ((user_table->get_ref_count() - 1) <= 1));
 
 	if (new_clustered) {
 		online_retry_drop_indexes_low(user_table, ctx->trx);
@@ -11165,7 +11166,10 @@ alter_stats_norebuild(
 	DBUG_ENTER("alter_stats_norebuild");
 	DBUG_ASSERT(!ctx->need_rebuild());
 
-	if (!dict_stats_is_persistent_enabled(ctx->new_table)) {
+	auto stat = ctx->new_table->stat;
+
+	if (!dict_table_t::stat_initialized(stat)
+	    || !dict_table_t::stats_is_persistent(stat)) {
 		DBUG_VOID_RETURN;
 	}
 
@@ -11174,7 +11178,6 @@ alter_stats_norebuild(
 		DBUG_ASSERT(index->table == ctx->new_table);
 
 		if (!(index->type & DICT_FTS)) {
-			dict_stats_init(ctx->new_table);
 			dict_stats_update_for_index(index);
 		}
 	}
@@ -11199,12 +11202,15 @@ alter_stats_rebuild(
 {
 	DBUG_ENTER("alter_stats_rebuild");
 
-	if (!table->space
-	    || !dict_stats_is_persistent_enabled(table)) {
+	if (!table->space || !table->stats_is_persistent()
+	    || dict_stats_persistent_storage_check(false) != SCHEMA_OK) {
 		DBUG_VOID_RETURN;
 	}
 
-	dberr_t	ret = dict_stats_update(table, DICT_STATS_RECALC_PERSISTENT);
+	dberr_t	ret = dict_stats_update_persistent(table);
+	if (ret == DB_SUCCESS) {
+		ret = dict_stats_save(table);
+	}
 
 	if (ret != DB_SUCCESS) {
 		push_warning_printf(
@@ -11317,6 +11323,13 @@ ha_innobase::commit_inplace_alter_table(
 		/* A rollback is being requested. So far we may at
 		most have created stubs for ADD INDEX or a copy of the
 		table for rebuild. */
+#if 0 /* FIXME: is there a better way for innodb.innodb-index-online? */
+		lock_shared_ha_data();
+		auto share = static_cast<InnoDB_share*>(get_ha_share_ptr());
+		set_ha_share_ptr(nullptr);
+		unlock_shared_ha_data();
+		delete share;
+#endif
 		DBUG_RETURN(rollback_inplace_alter_table(
 				    ha_alter_info, table, m_prebuilt));
 	}
@@ -11586,12 +11599,10 @@ err_index:
 	}
 	if (error != DB_SUCCESS) {
 		if (table_stats) {
-			dict_table_close(table_stats, false, m_user_thd,
-					 mdl_table);
+			dict_table_close(table_stats, m_user_thd, mdl_table);
 		}
 		if (index_stats) {
-			dict_table_close(index_stats, false, m_user_thd,
-					 mdl_index);
+			dict_table_close(index_stats, m_user_thd, mdl_index);
 		}
 		my_error_innodb(error, table_share->table_name.str, 0);
 		if (fts_exist) {
@@ -11627,11 +11638,11 @@ fail:
 			trx->rollback();
 			ut_ad(!trx->fts_trx);
 			if (table_stats) {
-				dict_table_close(table_stats, true, m_user_thd,
+				dict_table_close(table_stats, m_user_thd,
 						 mdl_table);
 			}
 			if (index_stats) {
-				dict_table_close(index_stats, true, m_user_thd,
+				dict_table_close(index_stats, m_user_thd,
 						 mdl_index);
 			}
 			row_mysql_unlock_data_dictionary(trx);
@@ -11685,10 +11696,10 @@ fail:
 	}
 
 	if (table_stats) {
-		dict_table_close(table_stats, true, m_user_thd, mdl_table);
+		dict_table_close(table_stats, m_user_thd, mdl_table);
 	}
 	if (index_stats) {
-		dict_table_close(index_stats, true, m_user_thd, mdl_index);
+		dict_table_close(index_stats, m_user_thd, mdl_index);
 	}
 
 	/* Commit or roll back the changes to the data dictionary. */
diff --git a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc
index 16ff1fd76de..71e98bfa224 100644
--- a/storage/innobase/handler/i_s.cc
+++ b/storage/innobase/handler/i_s.cc
@@ -2223,7 +2223,7 @@ i_s_fts_deleted_generic_fill(
 		DBUG_RETURN(0);
 	} else if (!dict_table_has_fts_index(user_table)
 		   || !user_table->is_readable()) {
-		dict_table_close(user_table, false, thd, mdl_ticket);
+		dict_table_close(user_table, thd, mdl_ticket);
 		DBUG_RETURN(0);
 	}
 
@@ -2238,7 +2238,7 @@ i_s_fts_deleted_generic_fill(
 
 	fts_table_fetch_doc_ids(trx, &fts_table, deleted);
 
-	dict_table_close(user_table, false, thd, mdl_ticket);
+	dict_table_close(user_table, thd, mdl_ticket);
 
 	trx->free();
 
@@ -2571,7 +2571,7 @@ i_s_fts_index_cache_fill(
 	}
 
 	if (!user_table->fts || !user_table->fts->cache) {
-		dict_table_close(user_table, false, thd, mdl_ticket);
+		dict_table_close(user_table, thd, mdl_ticket);
 		DBUG_RETURN(0);
 	}
 
@@ -2596,7 +2596,7 @@ i_s_fts_index_cache_fill(
 	}
 
 	mysql_mutex_unlock(&cache->lock);
-	dict_table_close(user_table, false, thd, mdl_ticket);
+	dict_table_close(user_table, thd, mdl_ticket);
 
 	DBUG_RETURN(ret);
 }
@@ -3013,7 +3013,7 @@ i_s_fts_index_table_fill(
 		}
 	}
 
-	dict_table_close(user_table, false, thd, mdl_ticket);
+	dict_table_close(user_table, thd, mdl_ticket);
 
 	ut_free(conv_str.f_str);
 
@@ -3138,7 +3138,7 @@ i_s_fts_config_fill(
 	}
 
 	if (!dict_table_has_fts_index(user_table)) {
-		dict_table_close(user_table, false, thd, mdl_ticket);
+		dict_table_close(user_table, thd, mdl_ticket);
 		DBUG_RETURN(0);
 	}
 
@@ -3195,7 +3195,7 @@ i_s_fts_config_fill(
 
 	fts_sql_commit(trx);
 
-	dict_table_close(user_table, false, thd, mdl_ticket);
+	dict_table_close(user_table, thd, mdl_ticket);
 
 	trx->free();
 
@@ -4765,9 +4765,9 @@ i_s_dict_fill_sys_tablestats(THD* thd, dict_table_t *table,
 
     OK(field_store_string(fields[SYS_TABLESTATS_NAME],
                           table->name.m_name));
-    OK(fields[SYS_TABLESTATS_INIT]->store(table->stat_initialized, true));
+    OK(fields[SYS_TABLESTATS_INIT]->store(table->stat_initialized(), true));
 
-    if (table->stat_initialized)
+    if (table->stat_initialized())
     {
       OK(fields[SYS_TABLESTATS_NROW]->store(table->stat_n_rows, true));
 
diff --git a/storage/innobase/include/dict0dict.h b/storage/innobase/include/dict0dict.h
index f8148bc6baa..4a7fb63f318 100644
--- a/storage/innobase/include/dict0dict.h
+++ b/storage/innobase/include/dict0dict.h
@@ -146,21 +146,21 @@ dict_table_open_on_id(table_id_t table_id, bool dict_locked,
                       MDL_ticket **mdl= nullptr)
   MY_ATTRIBUTE((warn_unused_result));
 
-/** Decrement the count of open handles */
-void dict_table_close(dict_table_t *table);
+/** Release a metadata lock.
+@param thd    connection that holds mdl
+@param mdl    metadata lock, or nullptr */
+void mdl_release(THD *thd, MDL_ticket *mdl) noexcept;
 
-/** Decrements the count of open handles of a table.
-@param[in,out]	table		table
-@param[in]	dict_locked	whether dict_sys.latch is being held
-@param[in]	thd		thread to release MDL
-@param[in]	mdl		metadata lock or NULL if the thread is a
-				foreground one. */
-void
-dict_table_close(
-	dict_table_t*	table,
-	bool		dict_locked,
-	THD*		thd = NULL,
-	MDL_ticket*	mdl = NULL);
+/** Release a table reference and a metadata lock.
+@param table  referenced table
+@param thd    connection that holds mdl
+@param mdl    metadata lock, or nullptr */
+inline void dict_table_close(dict_table_t* table, THD *thd, MDL_ticket *mdl)
+  noexcept
+{
+  table->release();
+  mdl_release(thd, mdl);
+}
 
 /*********************************************************************//**
 Gets the minimum number of bytes per character.
@@ -672,7 +672,7 @@ TPOOL_SUPPRESS_TSAN
 @return estimated number of rows */
 inline uint64_t dict_table_get_n_rows(const dict_table_t *table)
 {
-  ut_ad(table->stat_initialized);
+  ut_ad(table->stat_initialized());
   return table->stat_n_rows;
 }
 
diff --git a/storage/innobase/include/dict0dict.inl b/storage/innobase/include/dict0dict.inl
index af50d09698d..9a6eaaea9b0 100644
--- a/storage/innobase/include/dict0dict.inl
+++ b/storage/innobase/include/dict0dict.inl
@@ -1076,8 +1076,8 @@ dict_table_is_file_per_table(
 /** Acquire the table handle. */
 inline void dict_table_t::acquire()
 {
-  ut_ad(dict_sys.frozen());
-  n_ref_count++;
+  ut_d(const auto old=) n_ref_count++;
+  ut_ad(old || dict_sys.frozen());
 }
 
 /** Release the table handle.
diff --git a/storage/innobase/include/dict0mem.h b/storage/innobase/include/dict0mem.h
index 02a9d1cc668..f8b619f30ff 100644
--- a/storage/innobase/include/dict0mem.h
+++ b/storage/innobase/include/dict0mem.h
@@ -1133,15 +1133,12 @@ struct dict_index_t {
 				is indexed from 0 to n_uniq-1); This
 				is used when innodb_stats_method is
 				"nulls_ignored". */
-	ulint		stat_index_size;
+	uint32_t	stat_index_size;
 				/*!< approximate index size in
 				database pages */
-	ulint		stat_n_leaf_pages;
+	uint32_t	stat_n_leaf_pages;
 				/*!< approximate number of leaf pages in the
 				index tree */
-	bool		stats_error_printed;
-				/*!< has persistent statistics error printed
-				for this index ? */
 	/* @} */
 private:
   /** R-tree split sequence number */
@@ -2381,63 +2378,32 @@ public:
 	/** Statistics for query optimization. Mostly protected by
 	dict_sys.latch and stats_mutex_lock(). @{ */
 
-	/** TRUE if statistics have been calculated the first time after
-	database startup or table creation. */
-	unsigned				stat_initialized:1;
-
 	/** Timestamp of last recalc of the stats. */
 	time_t					stats_last_recalc;
 
-	/** The two bits below are set in the 'stat_persistent' member. They
-	have the following meaning:
-	1. _ON=0, _OFF=0, no explicit persistent stats setting for this table,
-	the value of the global srv_stats_persistent is used to determine
-	whether the table has persistent stats enabled or not
-	2. _ON=0, _OFF=1, persistent stats are explicitly disabled for this
-	table, regardless of the value of the global srv_stats_persistent
-	3. _ON=1, _OFF=0, persistent stats are explicitly enabled for this
-	table, regardless of the value of the global srv_stats_persistent
-	4. _ON=1, _OFF=1, not allowed, we assert if this ever happens. */
-	#define DICT_STATS_PERSISTENT_ON	(1 << 1)
-	#define DICT_STATS_PERSISTENT_OFF	(1 << 2)
+  static constexpr uint32_t STATS_INITIALIZED= 1U;
+  static constexpr uint32_t STATS_PERSISTENT_ON= 1U << 1;
+  static constexpr uint32_t STATS_PERSISTENT_OFF= 1U << 2;
+  static constexpr uint32_t STATS_AUTO_RECALC_ON= 1U << 3;
+  static constexpr uint32_t STATS_AUTO_RECALC_OFF= 1U << 4;
 
-	/** Indicates whether the table uses persistent stats or not. See
-	DICT_STATS_PERSISTENT_ON and DICT_STATS_PERSISTENT_OFF. */
-	ib_uint32_t				stat_persistent;
+  /** flags for index cardinality statistics */
+  Atomic_relaxed<uint32_t> stat;
+  /** Approximate clustered index size in database pages. */
+  uint32_t stat_clustered_index_size;
+  /** Approximate size of other indexes in database pages. */
+  uint32_t stat_sum_of_other_index_sizes;
 
-	/** The two bits below are set in the 'stats_auto_recalc' member. They
-	have the following meaning:
-	1. _ON=0, _OFF=0, no explicit auto recalc setting for this table, the
-	value of the global srv_stats_persistent_auto_recalc is used to
-	determine whether the table has auto recalc enabled or not
-	2. _ON=0, _OFF=1, auto recalc is explicitly disabled for this table,
-	regardless of the value of the global srv_stats_persistent_auto_recalc
-	3. _ON=1, _OFF=0, auto recalc is explicitly enabled for this table,
-	regardless of the value of the global srv_stats_persistent_auto_recalc
-	4. _ON=1, _OFF=1, not allowed, we assert if this ever happens. */
-	#define DICT_STATS_AUTO_RECALC_ON	(1 << 1)
-	#define DICT_STATS_AUTO_RECALC_OFF	(1 << 2)
 
-	/** Indicates whether the table uses automatic recalc for persistent
-	stats or not. See DICT_STATS_AUTO_RECALC_ON and
-	DICT_STATS_AUTO_RECALC_OFF. */
-	ib_uint32_t				stats_auto_recalc;
-
-	/** The number of pages to sample for this table during persistent
-	stats estimation. If this is 0, then the value of the global
-	srv_stats_persistent_sample_pages will be used instead. */
-	ulint					stats_sample_pages;
+  /** The number of pages to sample for this table during persistent
+  stats estimation. If this is 0, then the value of the global
+  srv_stats_persistent_sample_pages will be used instead. */
+  uint32_t stats_sample_pages;
 
 	/** Approximate number of rows in the table. We periodically calculate
 	new estimates. */
 	ib_uint64_t				stat_n_rows;
 
-	/** Approximate clustered index size in database pages. */
-	ulint					stat_clustered_index_size;
-
-	/** Approximate size of other indexes in database pages. */
-	ulint					stat_sum_of_other_index_sizes;
-
 	/** How many rows are modified since last stats recalc. When a row is
 	inserted, updated, or deleted, we add 1 to this number; we calculate
 	new estimates for the table and the indexes if the table has changed
@@ -2447,7 +2413,7 @@ public:
 	ib_uint64_t				stat_modified_counter;
 
 	bool		stats_error_printed;
-				/*!< Has persistent stats error beein
+				/*!< Has persistent stats error been
 				already printed for this table ? */
 	/* @} */
 
@@ -2576,6 +2542,35 @@ public:
   /** @return the index for that starts with a specific column */
   dict_index_t *get_index(const dict_col_t &col) const;
 
+  /** @return whether the statistics are initialized */
+  static bool stat_initialized(uint32_t stat) noexcept
+  { return stat & STATS_INITIALIZED; }
+
+  /** @return whether STATS_PERSISTENT is enabled */
+  static bool stats_is_persistent(uint32_t stat) noexcept
+  {
+    ut_ad(~(stat & (STATS_PERSISTENT_ON | STATS_PERSISTENT_OFF)));
+    if (stat & STATS_PERSISTENT_ON) return true;
+    return !(stat & STATS_PERSISTENT_OFF) && srv_stats_persistent;
+  }
+  /** @return whether STATS_AUTO_RECALC is enabled */
+  static bool stats_is_auto_recalc(uint32_t stat) noexcept
+  {
+    ut_ad(stat_initialized(stat));
+    ut_ad(~(stat & (STATS_AUTO_RECALC_ON | STATS_AUTO_RECALC_OFF)));
+    if (stat & STATS_AUTO_RECALC_ON) return true;
+    return !(stat & STATS_AUTO_RECALC_OFF) && srv_stats_auto_recalc;
+  }
+
+  /** @return whether the statistics are initialized */
+  bool stat_initialized() const noexcept { return stat_initialized(stat); }
+  /** @return whether STATS_PERSISTENT is enabled */
+  bool stats_is_persistent() const noexcept
+  { return stats_is_persistent(stat); }
+  /** @return whether STATS_AUTO_RECALC is enabled */
+  bool stats_is_auto_recalc() const noexcept
+  { return stats_is_auto_recalc(stat); }
+
   /** Create metadata.
   @param name     table name
   @param space    tablespace
diff --git a/storage/innobase/include/dict0stats.h b/storage/innobase/include/dict0stats.h
index 720c8e00474..ba6d66ec383 100644
--- a/storage/innobase/include/dict0stats.h
+++ b/storage/innobase/include/dict0stats.h
@@ -30,84 +30,6 @@ Created Jan 06, 2010 Vasil Dimov
 #include "dict0types.h"
 #include "trx0types.h"
 
-enum dict_stats_upd_option_t {
-	DICT_STATS_RECALC_PERSISTENT,/* (re) calculate the
-				statistics using a precise and slow
-				algo and save them to the persistent
-				storage, if the persistent storage is
-				not present then emit a warning and
-				fall back to transient stats */
-	DICT_STATS_RECALC_TRANSIENT,/* (re) calculate the statistics
-				using an imprecise quick algo
-				without saving the results
-				persistently */
-	DICT_STATS_EMPTY_TABLE,	/* Write all zeros (or 1 where it makes sense)
-				into a table and its indexes' statistics
-				members. The resulting stats correspond to an
-				empty table. If the table is using persistent
-				statistics, then they are saved on disk. */
-	DICT_STATS_FETCH_ONLY_IF_NOT_IN_MEMORY /* fetch the stats
-				from the persistent storage if the in-memory
-				structures have not been initialized yet,
-				otherwise do nothing */
-};
-
-/*********************************************************************//**
-Set the persistent statistics flag for a given table. This is set only
-in the in-memory table object and is not saved on disk. It will be read
-from the .frm file upon first open from MySQL after a server restart. */
-UNIV_INLINE
-void
-dict_stats_set_persistent(
-/*======================*/
-	dict_table_t*	table,	/*!< in/out: table */
-	ibool		ps_on,	/*!< in: persistent stats explicitly enabled */
-	ibool		ps_off)	/*!< in: persistent stats explicitly disabled */
-	MY_ATTRIBUTE((nonnull));
-
-/** @return whether persistent statistics is enabled for a given table */
-UNIV_INLINE
-bool
-dict_stats_is_persistent_enabled(const dict_table_t* table)
-	MY_ATTRIBUTE((nonnull, warn_unused_result));
-
-/*********************************************************************//**
-Set the auto recalc flag for a given table (only honored for a persistent
-stats enabled table). The flag is set only in the in-memory table object
-and is not saved in InnoDB files. It will be read from the .frm file upon
-first open from MySQL after a server restart. */
-UNIV_INLINE
-void
-dict_stats_auto_recalc_set(
-/*=======================*/
-	dict_table_t*	table,			/*!< in/out: table */
-	ibool		auto_recalc_on,		/*!< in: explicitly enabled */
-	ibool		auto_recalc_off);	/*!< in: explicitly disabled */
-
-/** @return whether auto recalc is enabled for a given table*/
-UNIV_INLINE
-bool
-dict_stats_auto_recalc_is_enabled(const dict_table_t* table)
-	MY_ATTRIBUTE((nonnull, warn_unused_result));
-
-/*********************************************************************//**
-Initialize table's stats for the first time when opening a table. */
-UNIV_INLINE
-void
-dict_stats_init(
-/*============*/
-	dict_table_t*	table);	/*!< in/out: table */
-
-/*********************************************************************//**
-Deinitialize table's stats after the last close of the table. This is
-used to detect "FLUSH TABLE" and refresh the stats upon next open. */
-UNIV_INLINE
-void
-dict_stats_deinit(
-/*==============*/
-	dict_table_t*	table)	/*!< in/out: table */
-	MY_ATTRIBUTE((nonnull));
-
 #ifdef WITH_WSREP
 /** Update the table modification counter and if necessary,
 schedule new estimates for table and index statistics to be calculated.
@@ -124,19 +46,6 @@ void dict_stats_update_if_needed_func(dict_table_t *table)
 # define dict_stats_update_if_needed(t,trx) dict_stats_update_if_needed_func(t)
 #endif
 
-/*********************************************************************//**
-Calculates new estimates for table and index statistics. The statistics
-are used in query optimization.
-@return DB_* error code or DB_SUCCESS */
-dberr_t
-dict_stats_update(
-/*==============*/
-	dict_table_t*		table,	/*!< in/out: table */
-	dict_stats_upd_option_t	stats_upd_option);
-					/*!< in: whether to (re) calc
-					the stats or to fetch them from
-					the persistent storage */
-
 /** Execute DELETE FROM mysql.innodb_table_stats
 @param database_name  database name
 @param table_name     table name
@@ -173,6 +82,50 @@ dict_stats_update_for_index(
 	dict_index_t*	index)	/*!< in/out: index */
 	MY_ATTRIBUTE((nonnull));
 
+enum dict_stats_schema_check {
+  /** The InnoDB persistent statistics tables do not exist. */
+  SCHEMA_NOT_EXIST= -1,
+  /** The schema of the InnoDB persistent statistics tables is valid. */
+  SCHEMA_OK= 0,
+  /** The schema is invalid. */
+  SCHEMA_INVALID
+};
+
+/** @return whether the persistent statistics storage is usable */
+dict_stats_schema_check
+dict_stats_persistent_storage_check(bool dict_already_locked= false) noexcept;
+
+/** Save the persistent statistics of a table or an index.
+@param table            table whose stats to save
+@param only_for_index   the index ID to save statistics for (0=all)
+@return DB_SUCCESS or error code */
+dberr_t dict_stats_save(dict_table_t* table, index_id_t index_id= 0);
+
+/** Read the stored persistent statistics of a table. */
+dberr_t dict_stats_fetch_from_ps(dict_table_t *table);
+
+/**
+Calculate new estimates for table and index statistics. This function
+is relatively quick and is used to calculate non-persistent statistics.
+@param table    table for which the non-persistent statistics are being updated
+@return error code
+@retval DB_SUCCESS_LOCKED REC if the table under bulk insert operation */
+dberr_t dict_stats_update_transient(dict_table_t *table) noexcept;
+
+/**
+Calculate new estimates for table and index statistics. This function
+is slower than dict_stats_update_transient().
+@param table    table for which the persistent statistics are being updated
+@return DB_SUCCESS or error code
+@retval DB_SUCCESS_LOCKED_REC if the table under bulk insert operation */
+dberr_t dict_stats_update_persistent(dict_table_t *table) noexcept;
+
+/**
+Try to calculate and save new estimates for persistent statistics.
+If persistent statistics are not enabled for the table or not available,
+this does nothing. */
+dberr_t dict_stats_update_persistent_try(dict_table_t *table);
+
 /** Rename a table in InnoDB persistent stats storage.
 @param old_name  old table name
 @param new_name  new table name
@@ -218,8 +171,6 @@ dict_stats_save_index_stat(
 	trx_t*		trx)
 	MY_ATTRIBUTE((nonnull(1, 3, 6, 7)));
 
-#include "dict0stats.inl"
-
 #ifdef UNIV_ENABLE_UNIT_TEST_DICT_STATS
 void test_dict_stats_all();
 #endif /* UNIV_ENABLE_UNIT_TEST_DICT_STATS */
@@ -229,4 +180,7 @@ statistics members. The resulting stats correspond to an empty table.
 @param table  table statistics to be emptied */
 void dict_stats_empty_table(dict_table_t *table);
 
+/** Clear the statistics for a table and save them if
+persistent statistics are enabled. */
+void dict_stats_empty_table_and_save(dict_table_t *table);
 #endif /* dict0stats_h */
diff --git a/storage/innobase/include/dict0stats.inl b/storage/innobase/include/dict0stats.inl
deleted file mode 100644
index dd516275156..00000000000
--- a/storage/innobase/include/dict0stats.inl
+++ /dev/null
@@ -1,219 +0,0 @@
-/*****************************************************************************
-
-Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2017, 2021, MariaDB Corporation.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
-
-*****************************************************************************/
-
-/**************************************************//**
-@file include/dict0stats.ic
-Code used for calculating and manipulating table statistics.
-
-Created Jan 23, 2012 Vasil Dimov
-*******************************************************/
-
-#include "dict0dict.h"
-#include "srv0srv.h"
-
-/*********************************************************************//**
-Set the persistent statistics flag for a given table. This is set only
-in the in-memory table object and is not saved on disk. It will be read
-from the .frm file upon first open from MySQL after a server restart. */
-UNIV_INLINE
-void
-dict_stats_set_persistent(
-/*======================*/
-	dict_table_t*	table,	/*!< in/out: table */
-	ibool		ps_on,	/*!< in: persistent stats explicitly enabled */
-	ibool		ps_off)	/*!< in: persistent stats explicitly disabled */
-{
-	/* Not allowed to have both flags set, but a CREATE or ALTER
-	statement that contains "STATS_PERSISTENT=0 STATS_PERSISTENT=1" would
-	end up having both set. In this case we clear the OFF flag. */
-	if (ps_on && ps_off) {
-		ps_off = FALSE;
-	}
-
-	ib_uint32_t	stat_persistent = 0;
-
-	if (ps_on) {
-		stat_persistent |= DICT_STATS_PERSISTENT_ON;
-	}
-
-	if (ps_off) {
-		stat_persistent |= DICT_STATS_PERSISTENT_OFF;
-	}
-
-	/* we rely on this assignment to be atomic */
-	table->stat_persistent = stat_persistent;
-}
-
-/** @return whether persistent statistics is enabled for a given table */
-UNIV_INLINE
-bool
-dict_stats_is_persistent_enabled(const dict_table_t* table)
-{
-	/* Because of the nature of this check (non-locking) it is possible
-	that a table becomes:
-	* PS-disabled immediately after this function has returned TRUE or
-	* PS-enabled immediately after this function has returned FALSE.
-	This means that it is possible that we do:
-	+ dict_stats_update(DICT_STATS_RECALC_PERSISTENT) on a table that has
-	  just been PS-disabled or
-	+ dict_stats_update(DICT_STATS_RECALC_TRANSIENT) on a table that has
-	  just been PS-enabled.
-	This is acceptable. Avoiding this would mean that we would have to
-	hold dict_sys.latch or stats_mutex_lock() like for accessing the
-	other ::stat_ members which would be too big performance penalty,
-	especially when this function is called from
-	dict_stats_update_if_needed(). */
-
-	/* we rely on this read to be atomic */
-	ib_uint32_t	stat_persistent = table->stat_persistent;
-
-	if (stat_persistent & DICT_STATS_PERSISTENT_ON) {
-		ut_ad(!(stat_persistent & DICT_STATS_PERSISTENT_OFF));
-		return(true);
-	} else if (stat_persistent & DICT_STATS_PERSISTENT_OFF) {
-		return(false);
-	} else {
-		return(srv_stats_persistent);
-	}
-}
-
-/*********************************************************************//**
-Set the auto recalc flag for a given table (only honored for a persistent
-stats enabled table). The flag is set only in the in-memory table object
-and is not saved in InnoDB files. It will be read from the .frm file upon
-first open from MySQL after a server restart. */
-UNIV_INLINE
-void
-dict_stats_auto_recalc_set(
-/*=======================*/
-	dict_table_t*	table,			/*!< in/out: table */
-	ibool		auto_recalc_on,		/*!< in: explicitly enabled */
-	ibool		auto_recalc_off)	/*!< in: explicitly disabled */
-{
-	ut_ad(!auto_recalc_on || !auto_recalc_off);
-
-	ib_uint32_t	stats_auto_recalc = 0;
-
-	if (auto_recalc_on) {
-		stats_auto_recalc |= DICT_STATS_AUTO_RECALC_ON;
-	}
-
-	if (auto_recalc_off) {
-		stats_auto_recalc |= DICT_STATS_AUTO_RECALC_OFF;
-	}
-
-	/* we rely on this assignment to be atomic */
-	table->stats_auto_recalc = stats_auto_recalc;
-}
-
-/** @return whether auto recalc is enabled for a given table*/
-UNIV_INLINE
-bool
-dict_stats_auto_recalc_is_enabled(const dict_table_t* table)
-{
-	/* we rely on this read to be atomic */
-	ib_uint32_t	stats_auto_recalc = table->stats_auto_recalc;
-
-	if (stats_auto_recalc & DICT_STATS_AUTO_RECALC_ON) {
-		ut_ad(!(stats_auto_recalc & DICT_STATS_AUTO_RECALC_OFF));
-		return(true);
-	} else if (stats_auto_recalc & DICT_STATS_AUTO_RECALC_OFF) {
-		return(false);
-	} else {
-		return(srv_stats_auto_recalc);
-	}
-}
-
-/*********************************************************************//**
-Initialize table's stats for the first time when opening a table. */
-UNIV_INLINE
-void
-dict_stats_init(
-/*============*/
-	dict_table_t*	table)	/*!< in/out: table */
-{
-	ut_ad(!table->stats_mutex_is_owner());
-
-	if (table->stat_initialized) {
-		return;
-	}
-
-	dict_stats_upd_option_t	opt;
-
-	if (dict_stats_is_persistent_enabled(table)) {
-		opt = DICT_STATS_FETCH_ONLY_IF_NOT_IN_MEMORY;
-	} else {
-		opt = DICT_STATS_RECALC_TRANSIENT;
-	}
-
-	dict_stats_update(table, opt);
-}
-
-/*********************************************************************//**
-Deinitialize table's stats after the last close of the table. This is
-used to detect "FLUSH TABLE" and refresh the stats upon next open. */
-UNIV_INLINE
-void
-dict_stats_deinit(
-/*==============*/
-	dict_table_t*	table)	/*!< in/out: table */
-{
-	ut_ad(table->stats_mutex_is_owner());
-	ut_ad(table->get_ref_count() == 0);
-
-#ifdef HAVE_valgrind
-	if (!table->stat_initialized) {
-		return;
-	}
-
-	MEM_UNDEFINED(&table->stat_n_rows, sizeof table->stat_n_rows);
-	MEM_UNDEFINED(&table->stat_clustered_index_size,
-		      sizeof table->stat_clustered_index_size);
-	MEM_UNDEFINED(&table->stat_sum_of_other_index_sizes,
-		      sizeof table->stat_sum_of_other_index_sizes);
-	MEM_UNDEFINED(&table->stat_modified_counter,
-		      sizeof table->stat_modified_counter);
-
-	dict_index_t*   index;
-
-	for (index = dict_table_get_first_index(table);
-	     index != NULL;
-	     index = dict_table_get_next_index(index)) {
-		MEM_UNDEFINED(
-			index->stat_n_diff_key_vals,
-			index->n_uniq
-			* sizeof index->stat_n_diff_key_vals[0]);
-		MEM_UNDEFINED(
-			index->stat_n_sample_sizes,
-			index->n_uniq
-			* sizeof index->stat_n_sample_sizes[0]);
-		MEM_UNDEFINED(
-			index->stat_n_non_null_key_vals,
-			index->n_uniq
-			* sizeof index->stat_n_non_null_key_vals[0]);
-		MEM_UNDEFINED(
-			&index->stat_index_size,
-			sizeof(index->stat_index_size));
-		MEM_UNDEFINED(
-			&index->stat_n_leaf_pages,
-			sizeof(index->stat_n_leaf_pages));
-	}
-#endif /* HAVE_valgrind */
-	table->stat_initialized = FALSE;
-}
diff --git a/storage/innobase/include/fsp0fsp.h b/storage/innobase/include/fsp0fsp.h
index cc50fe011f0..07398fc805f 100644
--- a/storage/innobase/include/fsp0fsp.h
+++ b/storage/innobase/include/fsp0fsp.h
@@ -355,9 +355,9 @@ and how many pages are currently used.
 @param[out]     used    number of pages that are used (not more than reserved)
 @param[in,out]  mtr     mini-transaction
 @return number of reserved pages */
-ulint fseg_n_reserved_pages(const buf_block_t &block,
-                            const fseg_header_t *header, ulint *used,
-                            mtr_t *mtr)
+uint32_t fseg_n_reserved_pages(const buf_block_t &block,
+                               const fseg_header_t *header, uint32_t *used,
+                               mtr_t *mtr) noexcept
   MY_ATTRIBUTE((nonnull));
 /**********************************************************************//**
 Allocates a single free page from a segment. This function implements
diff --git a/storage/innobase/include/log0log.h b/storage/innobase/include/log0log.h
index 8b9278bf93f..6a6d722f135 100644
--- a/storage/innobase/include/log0log.h
+++ b/storage/innobase/include/log0log.h
@@ -328,6 +328,8 @@ public:
 	/* @} */
 
 private:
+  /** the thread that initiated resize_lsn() */
+  Atomic_relaxed<void*> resize_initiator;
   /** A lock when the spin-only lock_lsn() is not being used */
   log_lsn_lock lsn_lock;
 public:
@@ -369,11 +371,17 @@ public:
 
   /** Start resizing the log and release the exclusive latch.
   @param size  requested new file_size
+  @param thd   the current thread identifier
   @return whether the resizing was started successfully */
-  resize_start_status resize_start(os_offset_t size) noexcept;
+  resize_start_status resize_start(os_offset_t size, void *thd) noexcept;
 
-  /** Abort any resize_start(). */
-  void resize_abort() noexcept;
+  /** Abort a resize_start() that we started.
+  @param thd  thread identifier that had been passed to resize_start() */
+  void resize_abort(void *thd) noexcept;
+
+  /** @return whether a particular resize_start() is in progress */
+  bool resize_running(void *thd) const noexcept
+  { return thd == resize_initiator; }
 
   /** Replicate a write to the log.
   @param lsn  start LSN
@@ -485,7 +493,7 @@ public:
 
 private:
   /** Update writer and mtr_t::finisher */
-  void writer_update() noexcept;
+  void writer_update(bool resizing) noexcept;
 
   /** Wait in append_prepare() for buffer to become available
   @tparam spin  whether to use the spin-only lock_lsn()
diff --git a/storage/innobase/include/row0row.h b/storage/innobase/include/row0row.h
index 85c18ddea74..ed364a08494 100644
--- a/storage/innobase/include/row0row.h
+++ b/storage/innobase/include/row0row.h
@@ -327,22 +327,6 @@ row_get_clust_rec(
 	mtr_t*		mtr)	/*!< in: mtr */
 	MY_ATTRIBUTE((nonnull, warn_unused_result));
 
-/** Parse the integer data from specified data, which could be
-DATA_INT, DATA_FLOAT or DATA_DOUBLE. If the value is less than 0
-and the type is not unsigned then we reset the value to 0
-@param[in]	data		data to read
-@param[in]	len		length of data
-@param[in]	mtype		mtype of data
-@param[in]	unsigned_type	if the data is unsigned
-@return the integer value from the data */
-inline
-ib_uint64_t
-row_parse_int(
-	const byte*	data,
-	ulint		len,
-	ulint		mtype,
-	bool		unsigned_type);
-
 /***************************************************************//**
 Searches an index record.
 @return whether the record was found */
diff --git a/storage/innobase/include/row0row.inl b/storage/innobase/include/row0row.inl
index e89adb581f4..0ccf00b9b45 100644
--- a/storage/innobase/include/row0row.inl
+++ b/storage/innobase/include/row0row.inl
@@ -170,52 +170,3 @@ row_build_row_ref_fast(
 		}
 	}
 }
-
-/** Parse the integer data from specified data, which could be
-DATA_INT, DATA_FLOAT or DATA_DOUBLE. If the value is less than 0
-and the type is not unsigned then we reset the value to 0
-@param[in]	data		data to read
-@param[in]	len		length of data
-@param[in]	mtype		mtype of data
-@param[in]	unsigned_type	if the data is unsigned
-@return the integer value from the data */
-ib_uint64_t
-row_parse_int(
-	const byte*	data,
-	ulint		len,
-	ulint		mtype,
-	bool		unsigned_type)
-{
-	ib_uint64_t	value = 0;
-
-	switch (mtype) {
-	case DATA_INT:
-
-		ut_a(len <= sizeof value);
-		value = mach_read_int_type(data, len, unsigned_type);
-		break;
-
-	case DATA_FLOAT:
-
-		ut_a(len == sizeof(float));
-		value = static_cast<ib_uint64_t>(mach_float_read(data));
-		break;
-
-	case DATA_DOUBLE:
-
-		ut_a(len == sizeof(double));
-		value = static_cast<ib_uint64_t>(mach_double_read(data));
-		break;
-
-	default:
-		ut_error;
-
-	}
-
-	if (!unsigned_type && static_cast<int64_t>(value) < 0) {
-		value = 0;
-	}
-
-	return(value);
-}
-
diff --git a/storage/innobase/include/row0sel.h b/storage/innobase/include/row0sel.h
index 54e4a1d283f..35e3cbe6631 100644
--- a/storage/innobase/include/row0sel.h
+++ b/storage/innobase/include/row0sel.h
@@ -182,9 +182,8 @@ dberr_t row_check_index(row_prebuilt_t *prebuilt, ulint *n_rows)
 @param[in] index	index starting with an AUTO_INCREMENT column
 @return	the largest AUTO_INCREMENT value
 @retval	0	if no records were found */
-ib_uint64_t
-row_search_max_autoinc(dict_index_t* index)
-	MY_ATTRIBUTE((nonnull, warn_unused_result));
+uint64_t row_search_max_autoinc(dict_index_t *index) noexcept
+  MY_ATTRIBUTE((nonnull, warn_unused_result));
 
 /** A structure for caching column values for prefetched rows */
 struct sel_buf_t{
diff --git a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h
index a694024406f..43174b0a9dc 100644
--- a/storage/innobase/include/srv0srv.h
+++ b/storage/innobase/include/srv0srv.h
@@ -282,9 +282,9 @@ extern uint	srv_fast_shutdown;
 
 extern ibool	srv_innodb_status;
 
-extern unsigned long long	srv_stats_transient_sample_pages;
+extern uint32_t			srv_stats_transient_sample_pages;
 extern my_bool			srv_stats_persistent;
-extern unsigned long long	srv_stats_persistent_sample_pages;
+extern uint32_t			srv_stats_persistent_sample_pages;
 extern my_bool			srv_stats_auto_recalc;
 extern my_bool			srv_stats_include_delete_marked;
 extern unsigned long long	srv_stats_modified_counter;
diff --git a/storage/innobase/log/log0log.cc b/storage/innobase/log/log0log.cc
index e609342345e..d25e6822910 100644
--- a/storage/innobase/log/log0log.cc
+++ b/storage/innobase/log/log0log.cc
@@ -352,7 +352,7 @@ bool log_t::attach(log_file_t file, os_offset_t size)
 # endif
       buf= static_cast<byte*>(ptr);
       max_buf_free= 1;
-      writer_update();
+      writer_update(false);
 # ifdef HAVE_PMEM
       if (is_pmem)
         return true;
@@ -394,7 +394,7 @@ bool log_t::attach(log_file_t file, os_offset_t size)
   TRASH_ALLOC(buf, buf_size);
   TRASH_ALLOC(flush_buf, buf_size);
   max_buf_free= buf_size / LOG_BUF_FLUSH_RATIO - LOG_BUF_FLUSH_MARGIN;
-  writer_update();
+  writer_update(false);
   memset_aligned<512>(checkpoint_buf, 0, write_size);
 
  func_exit:
@@ -594,31 +594,35 @@ void log_t::set_write_through(bool write_through)
 
 /** Start resizing the log and release the exclusive latch.
 @param size  requested new file_size
+@param thd   the current thread identifier
 @return whether the resizing was started successfully */
-log_t::resize_start_status log_t::resize_start(os_offset_t size) noexcept
+log_t::resize_start_status log_t::resize_start(os_offset_t size, void *thd)
+  noexcept
 {
   ut_ad(size >= 4U << 20);
   ut_ad(!(size & 4095));
   ut_ad(!srv_read_only_mode);
+  ut_ad(thd);
 
   log_resize_acquire();
 
-  resize_start_status status= RESIZE_NO_CHANGE;
-  lsn_t start_lsn{0};
-#ifdef HAVE_PMEM
-  bool is_pmem{false};
-#endif
+  resize_start_status status;
 
-  if (resize_in_progress())
+  if (size == file_size)
+    status= RESIZE_NO_CHANGE;
+  else if (resize_in_progress())
     status= RESIZE_IN_PROGRESS;
-  else if (size != file_size)
+  else
   {
+    lsn_t start_lsn;
     ut_ad(!resize_in_progress());
     ut_ad(!resize_log.is_opened());
     ut_ad(!resize_buf);
     ut_ad(!resize_flush_buf);
+    ut_ad(!resize_initiator);
     std::string path{get_log_file_path("ib_logfile101")};
     bool success;
+    resize_initiator= thd;
     resize_lsn.store(1, std::memory_order_relaxed);
     resize_target= 0;
     resize_log.m_file=
@@ -636,6 +640,7 @@ log_t::resize_start_status log_t::resize_start(os_offset_t size) noexcept
 #ifdef HAVE_PMEM
       else if (is_mmap())
       {
+        bool is_pmem{false};
         ptr= ::log_mmap(resize_log.m_file, is_pmem, size);
 
         if (ptr == MAP_FAILED)
@@ -685,34 +690,33 @@ log_t::resize_start_status log_t::resize_start(os_offset_t size) noexcept
         else if (!is_opened())
           resize_log.close();
 
-        writer_update();
+        resize_lsn.store(start_lsn, std::memory_order_relaxed);
+        writer_update(true);
+        log_resize_release();
+
+        mysql_mutex_lock(&buf_pool.flush_list_mutex);
+        lsn_t target_lsn= buf_pool.get_oldest_modification(0);
+        mysql_mutex_unlock(&buf_pool.flush_list_mutex);
+        buf_flush_ahead(start_lsn < target_lsn ? target_lsn + 1 : start_lsn,
+                        false);
+        return RESIZE_STARTED;
       }
-      status= success ? RESIZE_STARTED : RESIZE_FAILED;
     }
-    resize_lsn.store(start_lsn, std::memory_order_relaxed);
+    resize_initiator= nullptr;
+    resize_lsn.store(0, std::memory_order_relaxed);
+    status= RESIZE_FAILED;
   }
 
   log_resize_release();
-
-  if (start_lsn)
-  {
-    mysql_mutex_lock(&buf_pool.flush_list_mutex);
-    lsn_t target_lsn= buf_pool.get_oldest_modification(0);
-    if (start_lsn < target_lsn)
-      start_lsn= target_lsn + 1;
-    mysql_mutex_unlock(&buf_pool.flush_list_mutex);
-    buf_flush_ahead(start_lsn, false);
-  }
-
   return status;
 }
 
-/** Abort log resizing. */
-void log_t::resize_abort() noexcept
+/** Abort a resize_start() that we started. */
+void log_t::resize_abort(void *thd) noexcept
 {
   log_resize_acquire();
 
-  if (resize_in_progress() > 1)
+  if (resize_running(thd))
   {
 #ifdef HAVE_PMEM
     const bool is_mmap{this->is_mmap()};
@@ -739,11 +743,12 @@ void log_t::resize_abort() noexcept
     resize_buf= nullptr;
     resize_target= 0;
     resize_lsn.store(0, std::memory_order_relaxed);
+    resize_initiator= nullptr;
     std::string path{get_log_file_path("ib_logfile101")};
     IF_WIN(DeleteFile(path.c_str()), unlink(path.c_str()));
+    writer_update(false);
   }
 
-  writer_update();
   log_resize_release();
 }
 
@@ -1063,12 +1068,13 @@ lsn_t log_t::write_buf() noexcept
         the current LSN are generated. */
         MEM_MAKE_DEFINED(buf + length, (write_size_1 + 1) - new_buf_free);
         buf[length]= 0; /* allow recovery to catch EOF faster */
+        if (UNIV_LIKELY_NULL(re_write_buf))
+          MEM_MAKE_DEFINED(re_write_buf + length, (write_size_1 + 1) -
+                           new_buf_free);
         length&= ~write_size_1;
         memcpy_aligned<16>(flush_buf, buf + length, (new_buf_free + 15) & ~15);
         if (UNIV_LIKELY_NULL(re_write_buf))
         {
-          MEM_MAKE_DEFINED(re_write_buf + length, (write_size_1 + 1) -
-                           new_buf_free);
           memcpy_aligned<16>(resize_flush_buf, re_write_buf + length,
                              (new_buf_free + 15) & ~15);
           re_write_buf[length + new_buf_free]= 0;
@@ -1207,10 +1213,11 @@ ATTRIBUTE_COLD static lsn_t log_writer_resizing() noexcept
   return log_sys.write_buf<log_t::RESIZING>();
 }
 
-void log_t::writer_update() noexcept
+void log_t::writer_update(bool resizing) noexcept
 {
   ut_ad(latch_have_wr());
-  writer= resize_in_progress() ? log_writer_resizing : log_writer;
+  ut_ad(resizing == (resize_in_progress() > 1));
+  writer= resizing ? log_writer_resizing : log_writer;
   mtr_t::finisher_update();
 }
 
diff --git a/storage/innobase/log/log0recv.cc b/storage/innobase/log/log0recv.cc
index 2935e667329..f141c69388f 100644
--- a/storage/innobase/log/log0recv.cc
+++ b/storage/innobase/log/log0recv.cc
@@ -2417,9 +2417,11 @@ restart:
   ut_ad(log_sys.is_latest());
 
   alignas(8) byte iv[MY_AES_BLOCK_SIZE];
-  byte *decrypt_buf= storing != BACKUP
-    ? static_cast<byte*>(alloca(srv_page_size)) : nullptr;
-
+  byte *decrypt_buf=
+    static_cast<byte*>(alloca(storing == BACKUP
+                              ? 1/*type,length*/ + 5/*space_id*/ +
+                              5/*page_no*/ + 1/*rlen*/
+                              : srv_page_size));
   const lsn_t start_lsn{lsn};
 
   /* Check that the entire mini-transaction is included within the buffer */
@@ -2509,7 +2511,10 @@ restart:
   ut_d(std::set<page_id_t> modified);
 #endif
 
-  uint32_t space_id= 0, page_no= 0, last_offset= 0;
+  uint32_t space_id= 0, page_no= 0;
+  /* The end offset the last write (always 0 in storing==BACKUP).
+  The value 1 means that no "same page" record is allowed. */
+  uint last_offset= 0;
   bool got_page_op= false;
 
   for (l= begin;; l+= rlen)
@@ -2622,8 +2627,7 @@ restart:
         {
           mach_write_to_4(iv + 8, space_id);
           mach_write_to_4(iv + 12, page_no);
-          byte eb[1/*type,length*/ + 5/*space_id*/ + 5/*page_no*/ + 1/*rlen*/];
-          if (*l.copy_if_needed(iv, eb, recs, 1) == TRIM_PAGES)
+          if (*l.copy_if_needed(iv, decrypt_buf, recs, 1) == TRIM_PAGES)
             undo_space_trunc(space_id);
         }
         continue;
@@ -2672,10 +2676,10 @@ restart:
       case FREE_PAGE:
         ut_ad(freed.emplace(id).second);
         /* the next record must not be same_page */
-        last_offset= 1;
+        if (storing != BACKUP) last_offset= 1;
         goto free_or_init_page;
       case INIT_PAGE:
-        last_offset= FIL_PAGE_TYPE;
+        if (storing != BACKUP) last_offset= FIL_PAGE_TYPE;
       free_or_init_page:
         if (UNIV_UNLIKELY(rlen != 0))
           goto record_corrupted;
@@ -2707,7 +2711,8 @@ restart:
           erase(r);
           continue;
         }
-        cl= l.copy_if_needed(iv, decrypt_buf, recs, rlen);
+        if (storing == YES)
+          cl= l.copy_if_needed(iv, decrypt_buf, recs, rlen);
         break;
       case EXTENDED:
         if (storing == NO)
@@ -2721,7 +2726,8 @@ restart:
           continue;
         if (UNIV_UNLIKELY(!rlen))
           goto record_corrupted;
-        cl= l.copy_if_needed(iv, decrypt_buf, recs, rlen);
+        if (storing == YES || rlen == 1)
+          cl= l.copy_if_needed(iv, decrypt_buf, recs, rlen);
         if (rlen == 1 && *cl == TRIM_PAGES)
         {
           if (srv_is_undo_tablespace(space_id))
@@ -2745,13 +2751,13 @@ restart:
           static_assert(UT_ARR_SIZE(truncated_undo_spaces) ==
                         TRX_SYS_MAX_UNDO_SPACES, "compatibility");
           /* the next record must not be same_page */
-          last_offset= 1;
+          if (storing != BACKUP) last_offset= 1;
           continue;
         }
         /* This record applies to an undo log or index page, and it
         may be followed by subsequent WRITE or similar records for the
         same page in the same mini-transaction. */
-        last_offset= FIL_PAGE_TYPE;
+        if (storing != BACKUP) last_offset= FIL_PAGE_TYPE;
         break;
       case OPTION:
         /* OPTION records can be safely ignored in recovery */
@@ -2768,6 +2774,8 @@ restart:
       case WRITE:
       case MEMMOVE:
       case MEMSET:
+        if (storing == BACKUP)
+          continue;
         if (storing == NO && UNIV_LIKELY(page_no != 0))
           /* fil_space_set_recv_size_and_flags() is mandatory for storing==NO.
           It is only applicable to page_no == 0. Other than that, we can just
diff --git a/storage/innobase/pars/pars0pars.cc b/storage/innobase/pars/pars0pars.cc
index a800f072b0e..3e84d313129 100644
--- a/storage/innobase/pars/pars0pars.cc
+++ b/storage/innobase/pars/pars0pars.cc
@@ -783,11 +783,6 @@ pars_retrieve_table_list_defs(
 {
 	ulint		count		= 0;
 
-	if (sym_node == NULL) {
-
-		return(count);
-	}
-
 	while (sym_node) {
 		pars_retrieve_table_def(sym_node);
 
diff --git a/storage/innobase/row/row0ins.cc b/storage/innobase/row/row0ins.cc
index c5989adf52d..d2d3714c586 100644
--- a/storage/innobase/row/row0ins.cc
+++ b/storage/innobase/row/row0ins.cc
@@ -1955,7 +1955,7 @@ row_ins_check_foreign_constraints(
 				TRUE, foreign, table, ref_tuple, thr);
 
 			if (ref_table) {
-				dict_table_close(ref_table);
+				ref_table->release();
 			}
 		}
 	}
@@ -2577,12 +2577,44 @@ static bool thd_sql_is_insert(const THD *thd) noexcept
   }
 }
 
-#if defined __aarch64__&&defined __GNUC__&&__GNUC__==4&&!defined __clang__
-/* Avoid GCC 4.8.5 internal compiler error due to srw_mutex::wr_unlock().
-We would only need this for row_ins_clust_index_entry_low(),
-but GCC 4.8.5 does not support pop_options. */
-# pragma GCC optimize ("O0")
-#endif
+/** Parse the integer data from specified data, which could be
+DATA_INT, DATA_FLOAT or DATA_DOUBLE. If the value is less than 0
+and the type is not unsigned then we reset the value to 0
+@param data             data to read
+@param len              length of data
+@param mtype            main type of the column
+@param prtype           precise type of the column
+@return the integer value from the data
+@retval 0  if the value is negative or the type or length invalid */
+static uint64_t row_parse_int(const byte *data, size_t len,
+                              ulint mtype, ulint prtype) noexcept
+{
+  switch (mtype) {
+  case DATA_FLOAT:
+    if (len != sizeof(float))
+      return 0;
+    {
+      float f= mach_float_read(data);
+      return f <= 0.0 ? 0 : uint64_t(f);
+    }
+  case DATA_DOUBLE:
+    if (len != sizeof(double))
+      return 0;
+    {
+      double d= mach_double_read(data);
+      return d <= 0.0 ? 0 : uint64_t(d);
+    }
+  case DATA_INT:
+    if (len == 0 || len > 8)
+      return 0;
+    const ibool unsigned_type{prtype & DATA_UNSIGNED};
+    uint64_t value= mach_read_int_type(data, len, unsigned_type);
+    return !unsigned_type && int64_t(value) < 0 ? 0 : value;
+  }
+
+  ut_ad("invalid type" == 0);
+  return 0;
+}
 
 /***************************************************************//**
 Tries to insert an entry into a clustered index, ignoring foreign key
@@ -2669,8 +2701,7 @@ row_ins_clust_index_entry_low(
 							dfield->data),
 						dfield->len,
 						dfield->type.mtype,
-						dfield->type.prtype
-						& DATA_UNSIGNED);
+						dfield->type.prtype);
 					if (auto_inc
 					    && mode != BTR_MODIFY_TREE) {
 						mode = btr_latch_mode(
@@ -3853,3 +3884,79 @@ error_handling:
 
 	return(thr);
 }
+
+/** Read the AUTOINC column from an index record
+@param index  index of the record
+@param rec    the record
+@return value read from the first column
+@retval 0 if the value would be NULL or negative */
+static uint64_t row_read_autoinc(const dict_index_t &index, const rec_t *rec)
+  noexcept
+{
+  const dict_field_t &field= index.fields[0];
+  ut_ad(!DATA_BIG_COL(field.col));
+  ut_ad(!(rec_get_info_bits(rec, index.table->not_redundant()) &
+          (REC_INFO_MIN_REC_FLAG | REC_INFO_DELETED_FLAG)));
+  mem_heap_t *heap= nullptr;
+  rec_offs offsets_[REC_OFFS_HEADER_SIZE + 2];
+  rec_offs_init(offsets_);
+  rec_offs *offsets= rec_get_offsets(rec, &index, offsets_,
+                                     index.n_core_fields, 1, &heap);
+  ut_ad(!heap);
+
+  size_t len;
+  ut_d(size_t first_offset=) rec_get_nth_field_offs(offsets, 0, &len);
+  ut_ad(!first_offset);
+  return row_parse_int(rec, len, field.col->mtype, field.col->prtype);
+}
+
+/** Get the maximum and non-delete-marked record in an index.
+@param index    index B-tree
+@param mtr      mini-transaction (may be committed and restarted)
+@return maximum record, page s-latched in mtr
+@retval nullptr if there are no records, or if all of them are delete-marked */
+static
+const rec_t *row_search_get_max_rec(dict_index_t *index, mtr_t *mtr) noexcept
+{
+  btr_pcur_t pcur;
+  const bool desc= index->fields[0].descending;
+
+  /* Open at the high/right end (false), and init cursor */
+  if (pcur.open_leaf(desc, index, BTR_SEARCH_LEAF, mtr) != DB_SUCCESS)
+    return nullptr;
+
+  if (desc)
+  {
+    const bool comp= index->table->not_redundant();
+    while (btr_pcur_move_to_next_user_rec(&pcur, mtr))
+    {
+      const rec_t *rec= btr_pcur_get_rec(&pcur);
+      if (!rec_is_metadata(rec, comp) && !rec_get_deleted_flag(rec, comp))
+        return rec;
+    }
+    return nullptr;
+  }
+
+  do
+  {
+    const page_t *page= btr_pcur_get_page(&pcur);
+    const rec_t *rec= page_find_rec_last_not_deleted(page);
+    if (page_rec_is_user_rec_low(rec - page))
+      return rec;
+    btr_pcur_move_before_first_on_page(&pcur);
+  }
+  while (btr_pcur_move_to_prev(&pcur, mtr));
+
+  return nullptr;
+}
+
+uint64_t row_search_max_autoinc(dict_index_t *index) noexcept
+{
+  uint64_t value= 0;
+  mtr_t mtr;
+  mtr.start();
+  if (const rec_t *rec= row_search_get_max_rec(index, &mtr))
+    value= row_read_autoinc(*index, rec);
+  mtr.commit();
+  return value;
+}
diff --git a/storage/innobase/row/row0mysql.cc b/storage/innobase/row/row0mysql.cc
index 468b228d6a1..1d5a07d303c 100644
--- a/storage/innobase/row/row0mysql.cc
+++ b/storage/innobase/row/row0mysql.cc
@@ -980,7 +980,7 @@ void row_prebuilt_free(row_prebuilt_t *prebuilt)
 		rtr_clean_rtr_info(prebuilt->rtr_info, true);
 	}
 	if (prebuilt->table) {
-		dict_table_close(prebuilt->table);
+		prebuilt->table->release();
 	}
 
 	mem_heap_free(prebuilt->heap);
@@ -1598,7 +1598,7 @@ row_update_for_mysql(row_prebuilt_t* prebuilt)
 	ut_a(prebuilt->magic_n == ROW_PREBUILT_ALLOCATED);
 	ut_a(prebuilt->magic_n2 == ROW_PREBUILT_ALLOCATED);
 	ut_a(prebuilt->template_type == ROW_MYSQL_WHOLE_ROW);
-	ut_ad(table->stat_initialized);
+	ut_ad(table->stat_initialized());
 
 	if (!table->is_readable()) {
 		return row_mysql_get_table_error(trx, table);
@@ -2158,11 +2158,9 @@ row_create_index_for_mysql(
 
 		index = node->index;
 
-		ut_ad(!index == (err != DB_SUCCESS));
-
 		que_graph_free((que_t*) que_node_get_parent(thr));
 
-		if (index && (index->type & DICT_FTS)) {
+		if (err == DB_SUCCESS && (index->type & DICT_FTS)) {
 			err = fts_create_index_tables(trx, index, table->id);
 		}
 
diff --git a/storage/innobase/row/row0purge.cc b/storage/innobase/row/row0purge.cc
index bc05987c439..5e955694683 100644
--- a/storage/innobase/row/row0purge.cc
+++ b/storage/innobase/row/row0purge.cc
@@ -1516,7 +1516,7 @@ row_purge_record_func(
 	case TRX_UNDO_DEL_MARK_REC:
 		purged = row_purge_del_mark(node);
 		if (purged) {
-			if (node->table->stat_initialized
+			if (node->table->stat_initialized()
 			    && srv_stats_include_delete_marked) {
 				dict_stats_update_if_needed(
 					node->table, *thr->graph->trx);
diff --git a/storage/innobase/row/row0sel.cc b/storage/innobase/row/row0sel.cc
index 6c50ee2df7f..10df64b2abc 100644
--- a/storage/innobase/row/row0sel.cc
+++ b/storage/innobase/row/row0sel.cc
@@ -6851,123 +6851,3 @@ next_rec:
 
   goto rec_loop;
 }
-
-/*******************************************************************//**
-Read the AUTOINC column from the current row. If the value is less than
-0 and the type is not unsigned then we reset the value to 0.
-@return value read from the column */
-static
-ib_uint64_t
-row_search_autoinc_read_column(
-/*===========================*/
-	dict_index_t*	index,		/*!< in: index to read from */
-	const rec_t*	rec,		/*!< in: current rec */
-	ulint		col_no,		/*!< in: column number */
-	ulint		mtype,		/*!< in: column main type */
-	ibool		unsigned_type)	/*!< in: signed or unsigned flag */
-{
-	ulint		len;
-	const byte*	data;
-	ib_uint64_t	value;
-	mem_heap_t*	heap = NULL;
-	rec_offs	offsets_[REC_OFFS_NORMAL_SIZE];
-	rec_offs*	offsets	= offsets_;
-
-	rec_offs_init(offsets_);
-	ut_ad(page_rec_is_leaf(rec));
-
-	offsets = rec_get_offsets(rec, index, offsets, index->n_core_fields,
-				  col_no + 1, &heap);
-
-	if (rec_offs_nth_sql_null(offsets, col_no)) {
-		/* There is no non-NULL value in the auto-increment column. */
-		value = 0;
-		goto func_exit;
-	}
-
-	data = rec_get_nth_field(rec, offsets, col_no, &len);
-
-	value = row_parse_int(data, len, mtype, unsigned_type);
-
-func_exit:
-	if (UNIV_LIKELY_NULL(heap)) {
-		mem_heap_free(heap);
-	}
-
-	return(value);
-}
-
-/** Get the maximum and non-delete-marked record in an index.
-@param[in]	index	index tree
-@param[in,out]	mtr	mini-transaction (may be committed and restarted)
-@return maximum record, page s-latched in mtr
-@retval NULL if there are no records, or if all of them are delete-marked */
-static
-const rec_t*
-row_search_get_max_rec(
-	dict_index_t*	index,
-	mtr_t*		mtr)
-{
-	btr_pcur_t	pcur;
-	const rec_t*	rec;
-	const bool	desc	= index->fields[0].descending;
-
-	if (pcur.open_leaf(desc, index, BTR_SEARCH_LEAF, mtr) != DB_SUCCESS) {
-		return nullptr;
-	}
-
-	if (desc) {
-		const bool comp = index->table->not_redundant();
-		while (btr_pcur_move_to_next_user_rec(&pcur, mtr)) {
-			rec = btr_pcur_get_rec(&pcur);
-			if (rec_is_metadata(rec, *index)) {
-				continue;
-			}
-			if (!rec_get_deleted_flag(rec, comp)) {
-				goto found;
-			}
-		}
-	} else {
-		do {
-			rec = page_find_rec_last_not_deleted(
-				btr_pcur_get_page(&pcur));
-			if (page_rec_is_user_rec(rec)) {
-				goto found;
-			}
-			btr_pcur_move_before_first_on_page(&pcur);
-		} while (btr_pcur_move_to_prev(&pcur, mtr));
-	}
-
-	rec = nullptr;
-
-found:
-	ut_ad(!rec
-	      || !(rec_get_info_bits(rec, dict_table_is_comp(index->table))
-		   & (REC_INFO_MIN_REC_FLAG | REC_INFO_DELETED_FLAG)));
-	return(rec);
-}
-
-/** Read the max AUTOINC value from an index.
-@param[in] index	index starting with an AUTO_INCREMENT column
-@return	the largest AUTO_INCREMENT value
-@retval	0	if no records were found */
-ib_uint64_t
-row_search_max_autoinc(dict_index_t* index)
-{
-	const dict_field_t*	dfield = dict_index_get_nth_field(index, 0);
-
-	ib_uint64_t	value = 0;
-
-	mtr_t		mtr;
-	mtr.start();
-
-	if (const rec_t* rec = row_search_get_max_rec(index, &mtr)) {
-		value = row_search_autoinc_read_column(
-			index, rec, 0,
-			dfield->col->mtype,
-			dfield->col->prtype & DATA_UNSIGNED);
-	}
-
-	mtr.commit();
-	return(value);
-}
diff --git a/storage/innobase/row/row0uins.cc b/storage/innobase/row/row0uins.cc
index b78a2c410af..fa4ab5493e5 100644
--- a/storage/innobase/row/row0uins.cc
+++ b/storage/innobase/row/row0uins.cc
@@ -239,8 +239,7 @@ func_exit:
 	btr_pcur_commit_specify_mtr(&node->pcur, &mtr);
 
 	if (UNIV_LIKELY_NULL(table)) {
-		dict_table_close(table, dict_locked,
-				 node->trx->mysql_thd, mdl_ticket);
+		dict_table_close(table, node->trx->mysql_thd, mdl_ticket);
 	}
 
 	return(err);
@@ -435,7 +434,7 @@ close_table:
 		would probably be better to just drop all temporary
 		tables (and temporary undo log records) of the current
 		connection, instead of doing this rollback. */
-		dict_table_close(node->table, dict_locked);
+		node->table->release();
 		node->table = NULL;
 		return false;
 	} else {
@@ -597,7 +596,7 @@ row_undo_ins(
 			err = row_undo_ins_remove_clust_rec(node);
 		}
 
-		if (err == DB_SUCCESS && node->table->stat_initialized) {
+		if (err == DB_SUCCESS && node->table->stat_initialized()) {
 			/* Not protected by dict_sys.latch
 			or table->stats_mutex_lock() for
 			performance reasons, we would rather get garbage
@@ -627,8 +626,7 @@ row_undo_ins(
 		break;
 	}
 
-	dict_table_close(node->table, dict_locked);
-
+	node->table->release();
 	node->table = NULL;
 
 	return(err);
diff --git a/storage/innobase/row/row0umod.cc b/storage/innobase/row/row0umod.cc
index dc62be9c554..4b5d676477d 100644
--- a/storage/innobase/row/row0umod.cc
+++ b/storage/innobase/row/row0umod.cc
@@ -1234,7 +1234,7 @@ close_table:
 		would probably be better to just drop all temporary
 		tables (and temporary undo log records) of the current
 		connection, instead of doing this rollback. */
-		dict_table_close(node->table, dict_locked);
+		node->table->release();
 		node->table = NULL;
 		return false;
 	}
@@ -1363,7 +1363,7 @@ rollback_clust:
 		bool update_statistics
 			= !(node->cmpl_info & UPD_NODE_NO_ORD_CHANGE);
 
-		if (err == DB_SUCCESS && node->table->stat_initialized) {
+		if (err == DB_SUCCESS && node->table->stat_initialized()) {
 			switch (node->rec_type) {
 			case TRX_UNDO_UPD_EXIST_REC:
 				break;
@@ -1393,8 +1393,7 @@ rollback_clust:
 		}
 	}
 
-	dict_table_close(node->table, dict_locked);
-
+	node->table->release();
 	node->table = NULL;
 
 	return(err);
diff --git a/storage/innobase/row/row0upd.cc b/storage/innobase/row/row0upd.cc
index ecf37fbf719..43621d910a5 100644
--- a/storage/innobase/row/row0upd.cc
+++ b/storage/innobase/row/row0upd.cc
@@ -253,7 +253,7 @@ row_upd_check_references_constraints(
 				FALSE, foreign, table, entry, thr);
 
 			if (ref_table) {
-				dict_table_close(ref_table);
+				ref_table->release();
 			}
 
 			if (err != DB_SUCCESS) {
@@ -338,7 +338,7 @@ wsrep_row_upd_check_foreign_constraints(
 				TRUE, foreign, table, entry, thr);
 
 			if (opened) {
-				dict_table_close(opened);
+				opened->release();
 			}
 
 			if (err != DB_SUCCESS) {
diff --git a/storage/innobase/srv/srv0srv.cc b/storage/innobase/srv/srv0srv.cc
index 400b45e75d6..5c34b356790 100644
--- a/storage/innobase/srv/srv0srv.cc
+++ b/storage/innobase/srv/srv0srv.cc
@@ -282,13 +282,13 @@ this many index pages, there are 2 ways to calculate statistics:
   in the innodb database.
 * quick transient stats, that are used if persistent stats for the given
   table/index are not found in the innodb database */
-unsigned long long	srv_stats_transient_sample_pages;
+uint32_t	srv_stats_transient_sample_pages;
 /** innodb_stats_persistent */
 my_bool		srv_stats_persistent;
 /** innodb_stats_include_delete_marked */
 my_bool		srv_stats_include_delete_marked;
 /** innodb_stats_persistent_sample_pages */
-unsigned long long	srv_stats_persistent_sample_pages;
+uint32_t	srv_stats_persistent_sample_pages;
 /** innodb_stats_auto_recalc */
 my_bool		srv_stats_auto_recalc;
 
diff --git a/storage/innobase/trx/trx0purge.cc b/storage/innobase/trx/trx0purge.cc
index e27e87b67da..9f594108a21 100644
--- a/storage/innobase/trx/trx0purge.cc
+++ b/storage/innobase/trx/trx0purge.cc
@@ -1060,7 +1060,7 @@ static void trx_purge_close_tables(purge_node_t *node, THD *thd)
     else if (t.second.first == reinterpret_cast<dict_table_t*>(-1));
     else
     {
-      dict_table_close(t.second.first, false, thd, t.second.second);
+      dict_table_close(t.second.first, thd, t.second.second);
       t.second.first= reinterpret_cast<dict_table_t*>(-1);
     }
   }
@@ -1198,7 +1198,7 @@ dict_table_t *purge_sys_t::close_and_reopen(table_id_t id, THD *thd,
         if (t.second.first == reinterpret_cast<dict_table_t*>(-1))
         {
           if (table)
-            dict_table_close(table, false, thd, *mdl);
+            dict_table_close(table, thd, *mdl);
           goto retry;
         }
       }
diff --git a/storage/maria/ma_pagecache.c b/storage/maria/ma_pagecache.c
index 9fe262c1847..1b09fbe76f4 100644
--- a/storage/maria/ma_pagecache.c
+++ b/storage/maria/ma_pagecache.c
@@ -4726,10 +4726,10 @@ static my_bool free_block(PAGECACHE *pagecache, PAGECACHE_BLOCK_LINK *block,
 
 static int cmp_sec_link(const void *a_, const void *b_)
 {
-  PAGECACHE_BLOCK_LINK *const *a= a_;
-  PAGECACHE_BLOCK_LINK *const *b= b_;
-  return (((*a)->hash_link->pageno < (*b)->hash_link->pageno) ? -1 :
-      ((*a)->hash_link->pageno > (*b)->hash_link->pageno) ? 1 : 0);
+  const PAGECACHE_BLOCK_LINK *a= *(const PAGECACHE_BLOCK_LINK **) a_;
+  const PAGECACHE_BLOCK_LINK *b= *(const PAGECACHE_BLOCK_LINK **) b_;
+  return ((a->hash_link->pageno < b->hash_link->pageno) ? -1 :
+      (a->hash_link->pageno > b->hash_link->pageno) ? 1 : 0);
 }
 
 
diff --git a/storage/spider/ha_spider.cc b/storage/spider/ha_spider.cc
index 038609ce6c6..06f744155eb 100644
--- a/storage/spider/ha_spider.cc
+++ b/storage/spider/ha_spider.cc
@@ -465,6 +465,28 @@ static void spider_update_current_trx_ha_with_freed_share(SPIDER_SHARE *share)
   }
 }
 
+/*
+  Given an ha_spider that is being closed, reset the queued ping info
+  of SPIDER_CONN of the current spider trx that has the given
+  ha_spider as the queued_ping_spider.
+*/
+static void spider_reset_conn_queued_ping(ha_spider *spider)
+{
+  SPIDER_TRX *trx= spider_current_trx;
+  if (trx)
+  {
+    for (uint i= 0; i < trx->trx_conn_hash.records; i++)
+    {
+      SPIDER_CONN *conn= (SPIDER_CONN *) my_hash_element(&trx->trx_conn_hash, i);
+      if (conn->queued_ping_spider == spider)
+      {
+        conn->queued_ping= FALSE;
+        conn->queued_ping_spider= NULL;
+      }
+    }
+  }
+}
+
 int ha_spider::close()
 {
   int error_num= 0, roop_count;
@@ -559,6 +581,7 @@ int ha_spider::close()
     result_list.tmp_sqls = NULL;
   }
 
+  spider_reset_conn_queued_ping(this);
   spider_update_current_trx_ha_with_freed_share(share);
   spider_free_share(share);
   is_clone = FALSE;
diff --git a/storage/spider/mysql-test/spider/bugfix/r/mdev_29605.result b/storage/spider/mysql-test/spider/bugfix/r/mdev_29605.result
new file mode 100644
index 00000000000..15265d739dd
--- /dev/null
+++ b/storage/spider/mysql-test/spider/bugfix/r/mdev_29605.result
@@ -0,0 +1,19 @@
+for master_1
+for child2
+for child3
+set spider_same_server_link= 1;
+CREATE USER spider@localhost IDENTIFIED BY 'pwd';
+GRANT ALL ON test.* TO spider@localhost;
+CREATE SERVER srv FOREIGN DATA WRAPPER mysql
+OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'spider', password 'pwd');
+SET autocommit=0;
+set @old_init_connect=@@global.init_connect;
+set global init_connect="dummy";
+CREATE TABLE t ENGINE=Spider COMMENT='WRAPPER "mysql",srv "srv",TABLE "t"' AS SELECT 1;
+Got one of the listed errors
+set global init_connect=@old_init_connect;
+drop server srv;
+drop user spider@localhost;
+for master_1
+for child2
+for child3
diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_29605.test b/storage/spider/mysql-test/spider/bugfix/t/mdev_29605.test
new file mode 100644
index 00000000000..bb751c73f9b
--- /dev/null
+++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_29605.test
@@ -0,0 +1,25 @@
+--disable_query_log
+--disable_result_log
+--source ../../t/test_init.inc
+--enable_result_log
+--enable_query_log
+
+set spider_same_server_link= 1;
+CREATE USER spider@localhost IDENTIFIED BY 'pwd';
+GRANT ALL ON test.* TO spider@localhost;
+evalp CREATE SERVER srv FOREIGN DATA WRAPPER mysql
+OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'spider', password 'pwd');
+SET autocommit=0;
+set @old_init_connect=@@global.init_connect;
+set global init_connect="dummy";
+--error ER_NET_ERROR_ON_WRITE,12701
+CREATE TABLE t ENGINE=Spider COMMENT='WRAPPER "mysql",srv "srv",TABLE "t"' AS SELECT 1;
+set global init_connect=@old_init_connect;
+drop server srv;
+drop user spider@localhost;
+
+--disable_query_log
+--disable_result_log
+--source ../../t/test_deinit.inc
+--enable_result_log
+--enable_query_log
diff --git a/storage/spider/spd_db_mysql.cc b/storage/spider/spd_db_mysql.cc
index dc404d944ed..61e7dd9807f 100644
--- a/storage/spider/spd_db_mysql.cc
+++ b/storage/spider/spd_db_mysql.cc
@@ -2102,6 +2102,10 @@ int spider_db_mbase::exec_query(
     general_log_write(current_thd, COM_QUERY, tmp_query_str.ptr(),
       tmp_query_str.length());
   }
+  /* There should be a live connection to the data node */
+  DBUG_ASSERT(db_conn);
+  if (!db_conn)
+    DBUG_RETURN(HA_ERR_INTERNAL_ERROR);
   if (!spider_param_dry_access())
   {
     error_num = mysql_real_query(db_conn, query, length);