Merge branch '10.5' into 10.6

309 files changed, 12316 insertions, 3038 deletions

diff --git a/mysql-test/collections/buildbot_suites.bat b/mysql-test/collections/buildbot_suites.bat
index 0ec8e4b9939..d4a6e665840 100644
--- a/mysql-test/collections/buildbot_suites.bat
+++ b/mysql-test/collections/buildbot_suites.bat
@@ -1,4 +1,5 @@
-perl mysql-test-run.pl --verbose-restart --force --suite-timeout=120 --max-test-fail=10 --retry=3  --parallel=4 --suite=^
+if "%MTR_PARALLEL%"=="" set MTR_PARALLEL=%NUMBER_OF_PROCESSORS%
+perl mysql-test-run.pl --verbose-restart --force --suite-timeout=120 --max-test-fail=10 --retry=3  --suite=^
 vcol,gcol,perfschema,^
 main,^
 innodb,^
diff --git a/mysql-test/include/index_merge1.inc b/mysql-test/include/index_merge1.inc
index a1366af2c28..43f57375a4e 100644
--- a/mysql-test/include/index_merge1.inc
+++ b/mysql-test/include/index_merge1.inc
@@ -153,12 +153,22 @@ explain select * from t0 where
     (((key3 <7 and key7 < 6) or key5 < 2) and (key5 < 5 or key6 < 6));
 
 explain select * from t0 where
-    ((key3 <5 or key5 < 4) and (key1 < 4 or key2 < 4))
+    ((key3 < 4 or key5 < 4) and (key1 < 4 or key2 < 4))
   or
     ((key3 >=5 or key5 < 2) and (key5 < 5 or key6 < 6));
 
 explain select * from t0 force index(i1, i2, i3, i4, i5, i6 ) where
-    ((key3 <5 or key5 < 4) and (key1 < 4 or key2 < 4))
+    ((key3 < 4 or key5 < 4) and (key1 < 4 or key2 < 4))
+  or
+    ((key3 >=5 or key5 < 2) and (key5 < 5 or key6 < 6));
+
+explain select * from t0 force index(i1, i2, i3, i4, i5, i6 ) where
+    ((key3 < 5 or key5 < 4) and (key1 < 4 or key2 < 4))
+  or
+    ((key3 >=5 or key5 < 2) and (key5 < 5 or key6 < 6));
+
+explain select * from t0 force index(i1, i2, i3, i4, i5, i6 ) where
+    ((key3 < 10 or key5 < 4) and (key1 < 4 or key2 < 4))
   or
     ((key3 >=5 or key5 < 2) and (key5 < 5 or key6 < 6));
 
diff --git a/mysql-test/include/is_embedded.inc b/mysql-test/include/is_embedded.inc
index b20f21953f0..a440406edd4 100644
--- a/mysql-test/include/is_embedded.inc
+++ b/mysql-test/include/is_embedded.inc
@@ -1,5 +1,7 @@
+#
+# Check if the current used server is an embedded server#
+#
 if (`SELECT VERSION() NOT LIKE '%embedded%'`)
 {
    --skip Test requires: embedded server
 }
-
diff --git a/mysql-test/include/is_embedded_no_privileges.inc b/mysql-test/include/is_embedded_no_privileges.inc
new file mode 100644
index 00000000000..364c697c5a8
--- /dev/null
+++ b/mysql-test/include/is_embedded_no_privileges.inc
@@ -0,0 +1,16 @@
+#
+# Test that we do not have an embedded server compiled with privileges.
+# This is not a regular setup, but we are running this in buildbot for
+# testing of embedded + privileges.
+# Some funcs_1 test cannot handle this combination, which is why we have this
+# file to disable them
+#
+
+--source include/is_embedded.inc
+
+let priv=`SELECT privileges FROM information_schema.columns limit 1`;
+
+if (`SELECT "$priv" <> ""`)
+{
+   --skip Embedded server is compiled with privileges; Test disabled.
+}
diff --git a/mysql-test/include/not_windows_embedded.inc b/mysql-test/include/not_windows_embedded.inc
index 46f5e0ccfce..50ff0f80c7d 100644
--- a/mysql-test/include/not_windows_embedded.inc
+++ b/mysql-test/include/not_windows_embedded.inc
@@ -1,10 +1,8 @@
 let $is_win = `select convert(@@version_compile_os using latin1) IN ("Win32","Win64","Windows")`;
-let $is_embedded = `select version() like '%embedded%'`;
 #echo is_win: $is_win;
-#echo is_embedded: $is_embedded;
 if ($is_win)
 {
-  if ($is_embedded)
+  if(!$MYSQL_EMBEDDED)
   {
     skip Not supported with embedded on windows;
   }
diff --git a/mysql-test/lib/My/Options.pm b/mysql-test/lib/My/Options.pm
index 5827e0666a6..b3ae64cb4c2 100644
--- a/mysql-test/lib/My/Options.pm
+++ b/mysql-test/lib/My/Options.pm
@@ -142,11 +142,11 @@ sub diff {
 
 sub is_subset {
   my ($set, $subset)= @_;
-  my %cache = map { _split_option($_) } @$set;
+  my %cache = map { join('=', _split_option($_)), 1 } @$set;
 
   for (@$subset){
     my ($name, $value)= _split_option($_);
-    return 0 unless exists $cache{$name} and $cache{$name} eq $value;
+    return 0 unless $cache{"$name=$value"};
   }
 
   return 1;
diff --git a/mysql-test/main/alter_user.result b/mysql-test/main/alter_user.result
index 0bbf0aa6788..7cca2db0e5e 100644
--- a/mysql-test/main/alter_user.result
+++ b/mysql-test/main/alter_user.result
@@ -112,4 +112,14 @@ select * from mysql.user where user = 'foo';
 Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	Create_tablespace_priv	Delete_history_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections	plugin	authentication_string	password_expired	is_role	default_role	max_statement_time
 %	foo	*88C89BE093D4ECF72D039F62EBB7477EA1FD4D63	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	SPECIFIED	text	foo_issuer	foo_subject	10	20	30	40	mysql_native_password	*88C89BE093D4ECF72D039F62EBB7477EA1FD4D63	N	N		0.000000
 drop user foo;
+#
+# Bug #29882299: ALTER USER ... IDENTIFIED WITH ... BY ... SHOULD BE A PRIVILEGED OPERATION
+#
+create user foo@localhost;
+connect x,localhost,foo;
+alter user current_user identified with 'something';
+ERROR 42000: Access denied; you need (at least one of) the CREATE USER privilege(s) for this operation
+connection default;
+disconnect x;
+drop user foo@localhost;
 update mysql.global_priv set priv=@root_priv where user='root' and host='localhost';
diff --git a/mysql-test/main/alter_user.test b/mysql-test/main/alter_user.test
index 37f77c26496..95e6d732907 100644
--- a/mysql-test/main/alter_user.test
+++ b/mysql-test/main/alter_user.test
@@ -106,4 +106,15 @@ alter user foo with MAX_QUERIES_PER_HOUR 10
 select * from mysql.user where user = 'foo';
 drop user foo;
 
+--echo #
+--echo # Bug #29882299: ALTER USER ... IDENTIFIED WITH ... BY ... SHOULD BE A PRIVILEGED OPERATION
+--echo #
+create user foo@localhost;
+--connect x,localhost,foo
+--error ER_SPECIFIC_ACCESS_DENIED_ERROR
+alter user current_user identified with 'something';
+--connection default
+--disconnect x
+drop user foo@localhost;
+
 update mysql.global_priv set priv=@root_priv where user='root' and host='localhost';
diff --git a/mysql-test/main/create.result b/mysql-test/main/create.result
index 299fdfc9b41..acef8b73074 100644
--- a/mysql-test/main/create.result
+++ b/mysql-test/main/create.result
@@ -1071,58 +1071,58 @@ create table t1 like information_schema.processlist;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `ID` bigint(4) NOT NULL DEFAULT 0,
-  `USER` varchar(128) NOT NULL DEFAULT '',
-  `HOST` varchar(64) NOT NULL DEFAULT '',
-  `DB` varchar(64) DEFAULT NULL,
-  `COMMAND` varchar(16) NOT NULL DEFAULT '',
-  `TIME` int(7) NOT NULL DEFAULT 0,
-  `STATE` varchar(64) DEFAULT NULL,
-  `INFO` longtext DEFAULT NULL,
-  `TIME_MS` decimal(22,3) NOT NULL DEFAULT 0.000,
-  `STAGE` tinyint(2) NOT NULL DEFAULT 0,
-  `MAX_STAGE` tinyint(2) NOT NULL DEFAULT 0,
-  `PROGRESS` decimal(7,3) NOT NULL DEFAULT 0.000,
-  `MEMORY_USED` bigint(7) NOT NULL DEFAULT 0,
-  `MAX_MEMORY_USED` bigint(7) NOT NULL DEFAULT 0,
-  `EXAMINED_ROWS` int(7) NOT NULL DEFAULT 0,
-  `QUERY_ID` bigint(4) NOT NULL DEFAULT 0,
-  `INFO_BINARY` blob DEFAULT NULL,
-  `TID` bigint(4) NOT NULL DEFAULT 0
+  `ID` bigint(4) NOT NULL,
+  `USER` varchar(128) NOT NULL,
+  `HOST` varchar(64) NOT NULL,
+  `DB` varchar(64),
+  `COMMAND` varchar(16) NOT NULL,
+  `TIME` int(7) NOT NULL,
+  `STATE` varchar(64),
+  `INFO` longtext,
+  `TIME_MS` decimal(22,3) NOT NULL,
+  `STAGE` tinyint(2) NOT NULL,
+  `MAX_STAGE` tinyint(2) NOT NULL,
+  `PROGRESS` decimal(7,3) NOT NULL,
+  `MEMORY_USED` bigint(7) NOT NULL,
+  `MAX_MEMORY_USED` bigint(7) NOT NULL,
+  `EXAMINED_ROWS` int(7) NOT NULL,
+  `QUERY_ID` bigint(4) NOT NULL,
+  `INFO_BINARY` blob,
+  `TID` bigint(4) NOT NULL
 )  DEFAULT CHARSET=utf8mb3
 drop table t1;
 create temporary table t1 like information_schema.processlist;
 show create table t1;
 Table	Create Table
 t1	CREATE TEMPORARY TABLE `t1` (
-  `ID` bigint(4) NOT NULL DEFAULT 0,
-  `USER` varchar(128) NOT NULL DEFAULT '',
-  `HOST` varchar(64) NOT NULL DEFAULT '',
-  `DB` varchar(64) DEFAULT NULL,
-  `COMMAND` varchar(16) NOT NULL DEFAULT '',
-  `TIME` int(7) NOT NULL DEFAULT 0,
-  `STATE` varchar(64) DEFAULT NULL,
-  `INFO` longtext DEFAULT NULL,
-  `TIME_MS` decimal(22,3) NOT NULL DEFAULT 0.000,
-  `STAGE` tinyint(2) NOT NULL DEFAULT 0,
-  `MAX_STAGE` tinyint(2) NOT NULL DEFAULT 0,
-  `PROGRESS` decimal(7,3) NOT NULL DEFAULT 0.000,
-  `MEMORY_USED` bigint(7) NOT NULL DEFAULT 0,
-  `MAX_MEMORY_USED` bigint(7) NOT NULL DEFAULT 0,
-  `EXAMINED_ROWS` int(7) NOT NULL DEFAULT 0,
-  `QUERY_ID` bigint(4) NOT NULL DEFAULT 0,
-  `INFO_BINARY` blob DEFAULT NULL,
-  `TID` bigint(4) NOT NULL DEFAULT 0
+  `ID` bigint(4) NOT NULL,
+  `USER` varchar(128) NOT NULL,
+  `HOST` varchar(64) NOT NULL,
+  `DB` varchar(64),
+  `COMMAND` varchar(16) NOT NULL,
+  `TIME` int(7) NOT NULL,
+  `STATE` varchar(64),
+  `INFO` longtext,
+  `TIME_MS` decimal(22,3) NOT NULL,
+  `STAGE` tinyint(2) NOT NULL,
+  `MAX_STAGE` tinyint(2) NOT NULL,
+  `PROGRESS` decimal(7,3) NOT NULL,
+  `MEMORY_USED` bigint(7) NOT NULL,
+  `MAX_MEMORY_USED` bigint(7) NOT NULL,
+  `EXAMINED_ROWS` int(7) NOT NULL,
+  `QUERY_ID` bigint(4) NOT NULL,
+  `INFO_BINARY` blob,
+  `TID` bigint(4) NOT NULL
 )  DEFAULT CHARSET=utf8mb3
 drop table t1;
 create table t1 like information_schema.character_sets;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `CHARACTER_SET_NAME` varchar(32) NOT NULL DEFAULT '',
-  `DEFAULT_COLLATE_NAME` varchar(32) NOT NULL DEFAULT '',
-  `DESCRIPTION` varchar(60) NOT NULL DEFAULT '',
-  `MAXLEN` bigint(3) NOT NULL DEFAULT 0
+  `CHARACTER_SET_NAME` varchar(32) NOT NULL,
+  `DEFAULT_COLLATE_NAME` varchar(32) NOT NULL,
+  `DESCRIPTION` varchar(60) NOT NULL,
+  `MAXLEN` bigint(3) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
 drop table t1;
 
diff --git a/mysql-test/main/ctype_sjis.result b/mysql-test/main/ctype_sjis.result
index ffb92abb1e9..9650bd84cad 100644
--- a/mysql-test/main/ctype_sjis.result
+++ b/mysql-test/main/ctype_sjis.result
@@ -19297,6 +19297,22 @@ SET DEFAULT_STORAGE_ENGINE=Default;
 # End of 10.2 tests
 #
 #
+# Start of 10.4 tests
+#
+#
+# MDEV-26953 Assertion `!str || str != Ptr || !is_alloced()' failed in String::copy upon SELECT with sjis
+#
+SET NAMES sjis;
+CREATE TABLE t (a VARCHAR(3));
+INSERT INTO t VALUES (''),('');
+SELECT GROUP_CONCAT(PASSWORD(a)) AS f FROM t;
+f
+,
+DROP TABLE t;
+#
+# End of 10.4 tests
+#
+#
 # Start of 10.5 tests
 #
 #
@@ -19316,12 +19332,6 @@ EXECUTE IMMEDIATE _cp1257 0xD182;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '�_0143�_201A' at line 1
 SET NAMES sjis;
 #
-# End of 10.5 tests
-#
-#
-# Start of 10.5 tests
-#
-#
 # MDEV-22625 SIGSEGV in intern_find_sys_var (optimized builds)
 #
 SET NAMES sjis;
diff --git a/mysql-test/main/ctype_sjis.test b/mysql-test/main/ctype_sjis.test
index 8ca423bb7c1..ecb870242c5 100644
--- a/mysql-test/main/ctype_sjis.test
+++ b/mysql-test/main/ctype_sjis.test
@@ -262,6 +262,24 @@ let $coll_pad='sjis_bin';
 --echo #
 
 --echo #
+--echo # Start of 10.4 tests
+--echo #
+
+--echo #
+--echo # MDEV-26953 Assertion `!str || str != Ptr || !is_alloced()' failed in String::copy upon SELECT with sjis
+--echo #
+
+SET NAMES sjis;
+CREATE TABLE t (a VARCHAR(3));
+INSERT INTO t VALUES (''),('');
+SELECT GROUP_CONCAT(PASSWORD(a)) AS f FROM t;
+DROP TABLE t;
+
+--echo #
+--echo # End of 10.4 tests
+--echo #
+
+--echo #
 --echo # Start of 10.5 tests
 --echo #
 
@@ -286,16 +304,6 @@ EXECUTE IMMEDIATE _cp1257 0xD182;
 
 SET NAMES sjis;
 
-
---echo #
---echo # End of 10.5 tests
---echo #
-
-
---echo #
---echo # Start of 10.5 tests
---echo #
-
 --echo #
 --echo # MDEV-22625 SIGSEGV in intern_find_sys_var (optimized builds)
 --echo #
diff --git a/mysql-test/main/derived.result b/mysql-test/main/derived.result
index 006f41236f5..b6310f1a09f 100644
--- a/mysql-test/main/derived.result
+++ b/mysql-test/main/derived.result
@@ -1207,6 +1207,59 @@ REPLACE INTO v2 ( SELECT * FROM v4 ) UNION ( SELECT f FROM v2 );
 drop view v1,v2,v3,v4;
 drop table t1,t2,t3;
 #
+# MDEV-20325: Assertion `outer_context || !*from_field || *from_field == not_found_field' failed in Item_field::fix_outer_field | `!derived->is_excluded()' failed in TABLE_LIST::set_check_materialized | SIGEGV in st_select_lex::mark_as_dependent (optimized builds)
+#
+CREATE TABLE t1 (a INT);
+# Check that re-execution of a stored routine containing
+# a query with subquery in the FROM clause doesn't result in
+# assert failure in case the 'derived_merge' optimizer option
+# has been turned on/off
+CREATE PROCEDURE sp() SELECT * FROM (SELECT a FROM t1) tb;
+CALL sp();
+a
+SET optimizer_switch='derived_merge=off';
+# Without the patch the following statement would result in assert
+# failure
+CALL sp();
+a
+# Check the same test case for Prepared Statement
+SET optimizer_switch='derived_merge=on';
+PREPARE stmt FROM "SELECT * FROM (SELECT a FROM t1) tb";
+EXECUTE stmt;
+a
+SET optimizer_switch='derived_merge=off';
+# Without the patch the following statement would result in assert
+# failure
+EXECUTE stmt;
+a
+DEALLOCATE PREPARE stmt;
+# Here check the reverse test case - first turn off the 'derived_merge'
+# optimizer option, run the stored routine containing a query with
+# subquery in the FROM clause, then turn on the 'derived_merge'
+# optimizer option and re-execute the same stored routine to check that
+# the routine is finished successfully.
+CREATE PROCEDURE sp1() SELECT * FROM (SELECT a FROM t1) tb;
+SET optimizer_switch='derived_merge=off';
+CALL sp1();
+a
+SET optimizer_switch='derived_merge=on';
+CALL sp1();
+a
+# Check the same test case for Prepared Statement
+SET optimizer_switch='derived_merge=off';
+PREPARE stmt FROM "SELECT * FROM (SELECT a FROM t1) tb";
+EXECUTE stmt;
+a
+SET optimizer_switch='derived_merge=on';
+# Without the patch the following statement would result in assert
+# failure
+EXECUTE stmt;
+a
+DEALLOCATE PREPARE stmt;
+DROP PROCEDURE sp;
+DROP PROCEDURE sp1;
+DROP TABLE t1;
+#
 # End of 10.2 tests
 #
 #
diff --git a/mysql-test/main/derived.test b/mysql-test/main/derived.test
index 0d2efca1a26..904114e33b9 100644
--- a/mysql-test/main/derived.test
+++ b/mysql-test/main/derived.test
@@ -1043,6 +1043,57 @@ drop view v1,v2,v3,v4;
 drop table t1,t2,t3;
 
 --echo #
+--echo # MDEV-20325: Assertion `outer_context || !*from_field || *from_field == not_found_field' failed in Item_field::fix_outer_field | `!derived->is_excluded()' failed in TABLE_LIST::set_check_materialized | SIGEGV in st_select_lex::mark_as_dependent (optimized builds)
+--echo #
+CREATE TABLE t1 (a INT);
+
+--echo # Check that re-execution of a stored routine containing
+--echo # a query with subquery in the FROM clause doesn't result in
+--echo # assert failure in case the 'derived_merge' optimizer option
+--echo # has been turned on/off
+CREATE PROCEDURE sp() SELECT * FROM (SELECT a FROM t1) tb;
+CALL sp();
+SET optimizer_switch='derived_merge=off';
+--echo # Without the patch the following statement would result in assert
+--echo # failure
+CALL sp();
+
+--echo # Check the same test case for Prepared Statement
+SET optimizer_switch='derived_merge=on';
+PREPARE stmt FROM "SELECT * FROM (SELECT a FROM t1) tb";
+EXECUTE stmt;
+SET optimizer_switch='derived_merge=off';
+--echo # Without the patch the following statement would result in assert
+--echo # failure
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+--echo # Here check the reverse test case - first turn off the 'derived_merge'
+--echo # optimizer option, run the stored routine containing a query with
+--echo # subquery in the FROM clause, then turn on the 'derived_merge'
+--echo # optimizer option and re-execute the same stored routine to check that
+--echo # the routine is finished successfully.
+CREATE PROCEDURE sp1() SELECT * FROM (SELECT a FROM t1) tb;
+SET optimizer_switch='derived_merge=off';
+CALL sp1();
+SET optimizer_switch='derived_merge=on';
+CALL sp1();
+
+--echo # Check the same test case for Prepared Statement
+SET optimizer_switch='derived_merge=off';
+PREPARE stmt FROM "SELECT * FROM (SELECT a FROM t1) tb";
+EXECUTE stmt;
+SET optimizer_switch='derived_merge=on';
+--echo # Without the patch the following statement would result in assert
+--echo # failure
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+DROP PROCEDURE sp;
+DROP PROCEDURE sp1;
+DROP TABLE t1;
+
+--echo #
 --echo # End of 10.2 tests
 --echo #
 
diff --git a/mysql-test/main/derived_cond_pushdown.result b/mysql-test/main/derived_cond_pushdown.result
index b3a4dc4c253..7998ac7d4f7 100644
--- a/mysql-test/main/derived_cond_pushdown.result
+++ b/mysql-test/main/derived_cond_pushdown.result
@@ -17469,7 +17469,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	<subquery3>	eq_ref	distinct_key	distinct_key	4	func	1	
 1	PRIMARY	<derived2>	ref	key0	key0	5	test.t3.id	2	
 3	MATERIALIZED	t2	ALL	NULL	NULL	NULL	NULL	3	
-2	LATERAL DERIVED	cp2	ref	a	a	5	test.t1.a	1	Using index
+2	LATERAL DERIVED	cp2	ref	a	a	5	test.t1.a	1	Using where; Using index
 explain format=json select * from t1, (select a from t1 cp2 group by a) dt, t3
 where dt.a = t1.a and t1.a = t3.id and t1.a in (select a from t2);
 EXPLAIN
@@ -17542,6 +17542,7 @@ EXPLAIN
             "ref": ["test.t1.a"],
             "rows": 1,
             "filtered": 100,
+            "attached_condition": "cp2.a = t3.`id`",
             "using_index": true
           }
         }
@@ -17561,6 +17562,612 @@ id	a	a	id
 21	2	2	2
 deallocate prepare stmt;
 drop table t1,t2,t3;
+#
+# MDEV-MDEV-27132: Splittable derived with equality in WHERE
+#
+CREATE TABLE t1 (
+id int PRIMARY KEY
+) ENGINE=MyISAM;
+INSERT INTO t1 VALUES
+(-1),(2070),(4826),(4827),(4828),(4829),(4830),(4831),(4832),(4833),(4834),
+(4835),(4836),(4837),(4838),(4839),(4840),(4841),(4842),(4843),(4844),
+(4845),(4846),(4847),(4848),(4849),(4850),(4851),(4852),(4853),(4854),
+(4855),(4856),(4857),(4858),(4859),(4860),(4861),(4862),(4863),(4864),
+(4865),(4866),(4867),(4868),(4869),(4870),(4871),(4872),(4873),(4874),
+(4875),(4876);
+CREATE TABLE t2 (
+id int PRIMARY KEY AUTO_INCREMENT,
+deleted int(1),
+t1_id int,
+email varchar(255),
+reporting_person int(1),
+KEY t1_id (t1_id)
+) ENGINE=MyISAM;
+INSERT INTO t2 VALUES
+(1,0,2064,'1test@test.ee',1),(2,1626095588,2066,'2test@test.ee',1),
+(3,0,2066,'3test@test.ee',1),(4,0,2068,'4test@test.ee',1),
+(5,0,2068,'5test@test.ee',1),(6,0,2069,'6test@test.ee',1),(7,0,2070,'',0),
+(8,0,2070,'',0),(9,0,2071,'',0),(10,0,2071,'',0),(11,0,2072,'',0),
+(12,0,2072,'',0),(13,0,2072,'13test@test.ee',1),(14,0,2073,'14test@test.ee',1),
+(15,0,2074,'15test@test.ee',1),(16,0,2075,'16test@test.ee',1),(17,0,2075,'',0),
+(18,0,2075,'',0),(19,0,2076,'19test@test.ee',1),(20,0,2077,'',0),
+(21,0,2078,'21test@test.ee',1),(22,0,2078,'22test@test.ee',1);
+INSERT INTO t2(deleted, t1_id, email, reporting_person)
+SELECT deleted, t1_id, email, reporting_person FROM t2;
+INSERT INTO t2(deleted, t1_id, email, reporting_person)
+SELECT deleted, t1_id+10000, email, reporting_person FROM t2;
+INSERT INTO t2(deleted, t1_id, email, reporting_person)
+SELECT deleted, t1_id+20000, email, reporting_person FROM t2;
+INSERT INTO t2(deleted, t1_id, email, reporting_person)
+SELECT deleted, t1_id+40000, email, reporting_person FROM t2;
+INSERT INTO t2(deleted, t1_id, email, reporting_person)
+SELECT deleted, t1_id+80000, email, reporting_person FROM t2;
+INSERT INTO t2(deleted, t1_id, email, reporting_person)
+SELECT deleted, t1_id+160000, email, reporting_person FROM t2;
+CREATE TABLE t3 (
+id int PRIMARY KEY,
+deleted int,
+t1_id int,
+YEAR int(4),
+quarter int(1),
+KEY t1_id (t1_id,year,quarter)
+) ENGINE=MyISAM;
+INSERT INTO t3 VALUES
+(1,0,3885,2020,1),(2,0,2064,2020,1),(3,1611670734,2225,2020,1),
+(4,0,2070,2020,1),(5,1611055981,2095,2020,1),(6,1610970096,2102,2020,1),
+(7,0,3974,2020,1),(153,1609851928,3892,2020,2),(154,0,3885,2020,2),
+(155,0,2064,2020,2),(156,1611670717,2225,2020,2),(157,0,2070,2020,2),
+(317,0,2257,2020,2),(318,0,3885,2020,3),(319,0,2064,2020,3),
+(320,1611670709,2225,2020,3),(321,0,2070,2020,3),(322,0,2095,2020,3),
+(323,0,2102,2020,3),(324,0,3974,2020,3),(325,0,3886,2020,3),
+(326,1609939963,2104,2020,3),(327,0,3887,2020,3),(328,0,3888,2020,3),
+(329,0,2148,2020,3),(330,0,3889,2020,3),(331,0,3890,2020,3),
+(332,0,2179,2020,3),(333,0,2115,2020,3),(334,0,2193,2020,3),
+(335,0,2213,2020,3),(336,0,3891,2020,3),(337,1609851955,3892,2020,3),
+(338,1610447706,2232,2020,3),(339,0,2235,2020,3),(340,0,2237,2020,3),
+(341,0,3972,2020,3),(342,1610449357,2242,2020,3),(343,0,3893,2020,3),
+(344,0,2257,2020,3),(345,0,3951,2020,3),(346,0,3894,2020,3),
+(347,0,3912,2020,3),(348,0,3895,2020,3),(349,0,2301,2020,3),
+(350,0,2304,2020,3),(351,0,3896,2020,3);
+ANALYZE TABLE t1,t2,t3;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	Engine-independent statistics collected
+test.t1	analyze	status	OK
+test.t2	analyze	status	Engine-independent statistics collected
+test.t2	analyze	status	OK
+test.t3	analyze	status	Engine-independent statistics collected
+test.t3	analyze	status	OK
+set  optimizer_switch='split_materialized=on';
+SELECT t1.id
+FROM t1
+JOIN t3
+ON t3.t1_id = t1.id
+JOIN (SELECT t1_id FROM t2 WHERE reporting_person = 1 GROUP BY t1_id) tx
+ON tx.t1_id = t1.id
+WHERE t1.id BETWEEN 200 AND 100000;
+id
+EXPLAIN SELECT t1.id
+FROM t1
+JOIN t3
+ON t3.t1_id = t1.id
+JOIN (SELECT t1_id FROM t2 WHERE reporting_person = 1 GROUP BY t1_id) tx
+ON tx.t1_id = t1.id
+WHERE t1.id BETWEEN 200 AND 100000;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	t3	range	t1_id	t1_id	5	NULL	47	Using where; Using index
+1	PRIMARY	t1	eq_ref	PRIMARY	PRIMARY	4	test.t3.t1_id	1	Using index
+1	PRIMARY	<derived2>	ref	key0	key0	5	test.t3.t1_id	2	
+2	LATERAL DERIVED	t2	ref	t1_id	t1_id	5	test.t1.id	3	Using index condition; Using where
+EXPLAIN FORMAT=JSON SELECT t1.id
+FROM t1
+JOIN t3
+ON t3.t1_id = t1.id
+JOIN (SELECT t1_id FROM t2 WHERE reporting_person = 1 GROUP BY t1_id) tx
+ON tx.t1_id = t1.id
+WHERE t1.id BETWEEN 200 AND 100000;
+EXPLAIN
+{
+  "query_block": {
+    "select_id": 1,
+    "table": {
+      "table_name": "t3",
+      "access_type": "range",
+      "possible_keys": ["t1_id"],
+      "key": "t1_id",
+      "key_length": "5",
+      "used_key_parts": ["t1_id"],
+      "rows": 47,
+      "filtered": 100,
+      "attached_condition": "t3.t1_id between 200 and 100000 and t3.t1_id is not null",
+      "using_index": true
+    },
+    "table": {
+      "table_name": "t1",
+      "access_type": "eq_ref",
+      "possible_keys": ["PRIMARY"],
+      "key": "PRIMARY",
+      "key_length": "4",
+      "used_key_parts": ["id"],
+      "ref": ["test.t3.t1_id"],
+      "rows": 1,
+      "filtered": 100,
+      "using_index": true
+    },
+    "table": {
+      "table_name": "<derived2>",
+      "access_type": "ref",
+      "possible_keys": ["key0"],
+      "key": "key0",
+      "key_length": "5",
+      "used_key_parts": ["t1_id"],
+      "ref": ["test.t3.t1_id"],
+      "rows": 2,
+      "filtered": 100,
+      "materialized": {
+        "lateral": 1,
+        "query_block": {
+          "select_id": 2,
+          "table": {
+            "table_name": "t2",
+            "access_type": "ref",
+            "possible_keys": ["t1_id"],
+            "key": "t1_id",
+            "key_length": "5",
+            "used_key_parts": ["t1_id"],
+            "ref": ["test.t1.id"],
+            "rows": 3,
+            "filtered": 58.59375,
+            "index_condition": "t2.t1_id between 200 and 100000 and t2.t1_id = t3.t1_id",
+            "attached_condition": "t2.reporting_person = 1"
+          }
+        }
+      }
+    }
+  }
+}
+set  optimizer_switch='split_materialized=off';
+SELECT t1.id
+FROM t1
+JOIN t3
+ON t3.t1_id = t1.id
+JOIN (SELECT t1_id FROM t2 WHERE reporting_person = 1 GROUP BY t1_id) tx
+ON tx.t1_id = t1.id
+WHERE t1.id BETWEEN 200 AND 100000;
+id
+set  optimizer_switch='split_materialized=default';
+DROP TABLE t1,t2,t3;
+#
+# MDEV-27510: Splittable derived with grouping over two tables
+#
+CREATE TABLE ledgers (
+id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+name VARCHAR(32)
+) ENGINE=MyISAM;
+CREATE TABLE charges (
+id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+from_ledger_id BIGINT UNSIGNED NOT NULL,
+to_ledger_id BIGINT UNSIGNED NOT NULL,
+amount INT NOT NULL,
+KEY fk_charge_from_ledger (from_ledger_id),
+KEY fk_charge_to_ledger (to_ledger_id)
+) ENGINE=MyISAM;
+CREATE TABLE transactions (
+id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+ledger_id BIGINT UNSIGNED NOT NULL,
+KEY fk_transactions_ledger (ledger_id)
+) ENGINE=MyISAM;
+CREATE TABLE transaction_items (
+id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+transaction_id BIGINT UNSIGNED NOT NULL,
+charge_id BIGINT UNSIGNED,
+amount INT NOT NULL,
+KEY fk_items_transaction (transaction_id),
+KEY fk_items_charge (charge_id)
+) ENGINE=MyISAM;
+INSERT INTO ledgers (id, name) VALUES
+(1, 'Anna'), (2, 'John'), (3, 'Fred');
+INSERT INTO charges (id, from_ledger_id, to_ledger_id, amount) VALUES
+(1, 2, 1, 200), (2, 1, 2, 330), (3, 1, 2, 640), (4, 3, 1, 640), (5, 3, 2, 1000),
+(6, 3, 1, 660), (7, 2, 3, 650), (8, 3, 2, 160), (9, 2, 1, 740), (10, 3, 2, 310),
+(11, 2, 1, 640), (12, 3, 2, 240), (13, 3, 2, 340), (14, 2, 1, 720),
+(15, 2, 3, 100),
+(16, 2, 3, 980), (17, 2, 1, 80), (18, 1, 2, 760), (19, 2, 3, 740),
+(20, 2, 1, 990);
+INSERT INTO transactions (id, ledger_id) VALUES
+(2, 1), (3, 1), (5, 1), (8, 1), (12, 1), (18, 1), (22, 1), (28, 1),
+(34, 1), (35, 1),
+(40, 1), (1, 2), (4, 2), (6, 2), (10, 2), (13, 2), (16, 2), (17, 2),
+(20, 2), (21, 2),
+(24, 2), (26, 2), (27, 2), (29, 2), (31, 2), (33, 2), (36, 2), (37, 2),
+(39, 2), (7, 3),
+(9, 3), (11, 3), (14, 3), (15, 3), (19, 3), (23, 3), (25, 3), (30, 3),
+(32, 3), (38, 3);
+INSERT INTO transaction_items (id, transaction_id, charge_id, amount) VALUES
+(1, 1, 1, -200), (2, 2, 1, 200), (3, 3, 2, -330), (4, 4, 2, 330),
+(5, 5, 3, -640),
+(6, 6, 3, 640), (7, 7, 4, -640), (8, 8, 4, 640), (9, 9, 5, -1000),
+(10, 10, 5, 1000),
+(11, 11, 6, -660), (12, 12, 6, 660), (13, 13, 7, -650), (14, 14, 7, 650),
+(15, 15, 8, -160),
+(16, 16, 8, 160), (17, 17, 9, -740), (18, 18, 9, 740), (19, 19, 10, -310),
+(20, 20, 10, 310),
+(21, 21, 11, -640), (22, 22, 11, 640), (23, 23, 12, -240), (24, 24, 12, 240),
+(25, 25, 13, -340),
+(26, 26, 13, 340), (27, 27, 14, -720), (28, 28, 14, 720), (29, 29, 15, -100),
+(30, 30, 15, 100),
+(31, 31, 16, -980), (32, 32, 16, 980), (33, 33, 17, -80), (34, 34, 17, 80),
+(35, 35, 18, -760),
+(36, 36, 18, 760), (37, 37, 19, -740), (38, 38, 19, 740), (39, 39, 20, -990),
+(40, 40, 20, 990);
+ANALYZE TABLE ledgers, charges, transactions, transaction_items;
+Table	Op	Msg_type	Msg_text
+test.ledgers	analyze	status	Engine-independent statistics collected
+test.ledgers	analyze	status	OK
+test.charges	analyze	status	Engine-independent statistics collected
+test.charges	analyze	status	OK
+test.transactions	analyze	status	Engine-independent statistics collected
+test.transactions	analyze	status	OK
+test.transaction_items	analyze	status	Engine-independent statistics collected
+test.transaction_items	analyze	status	OK
+set optimizer_switch='split_materialized=on';
+SELECT
+charges.id,
+charges.from_ledger_id,
+charges.to_ledger_id,
+from_agg_items.num_rows AS from_num_rows
+FROM charges
+INNER JOIN (
+SELECT
+transactions.ledger_id,
+transaction_items.charge_id,
+count(*) as num_rows
+FROM transaction_items
+INNER JOIN transactions ON transaction_items.transaction_id = transactions.id
+GROUP BY transactions.ledger_id, transaction_items.charge_id
+) AS from_agg_items
+ON from_agg_items.charge_id = charges.id AND
+from_agg_items.ledger_id = charges.from_ledger_id
+WHERE charges.to_ledger_id = 2;
+id	from_ledger_id	to_ledger_id	from_num_rows
+2	1	2	1
+3	1	2	1
+5	3	2	1
+8	3	2	1
+10	3	2	1
+12	3	2	1
+13	3	2	1
+18	1	2	1
+EXPLAIN SELECT
+charges.id,
+charges.from_ledger_id,
+charges.to_ledger_id,
+from_agg_items.num_rows AS from_num_rows
+FROM charges
+INNER JOIN (
+SELECT
+transactions.ledger_id,
+transaction_items.charge_id,
+count(*) as num_rows
+FROM transaction_items
+INNER JOIN transactions ON transaction_items.transaction_id = transactions.id
+GROUP BY transactions.ledger_id, transaction_items.charge_id
+) AS from_agg_items
+ON from_agg_items.charge_id = charges.id AND
+from_agg_items.ledger_id = charges.from_ledger_id
+WHERE charges.to_ledger_id = 2;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	charges	ALL	PRIMARY,fk_charge_from_ledger,fk_charge_to_ledger	NULL	NULL	NULL	20	Using where
+1	PRIMARY	<derived2>	ref	key0	key0	17	test.charges.from_ledger_id,test.charges.id	2	
+2	LATERAL DERIVED	transaction_items	ref	fk_items_transaction,fk_items_charge	fk_items_charge	9	test.charges.id	2	
+2	LATERAL DERIVED	transactions	eq_ref	PRIMARY,fk_transactions_ledger	PRIMARY	8	test.transaction_items.transaction_id	1	Using where
+EXPLAIN FORMAT=JSON SELECT
+charges.id,
+charges.from_ledger_id,
+charges.to_ledger_id,
+from_agg_items.num_rows AS from_num_rows
+FROM charges
+INNER JOIN (
+SELECT
+transactions.ledger_id,
+transaction_items.charge_id,
+count(*) as num_rows
+FROM transaction_items
+INNER JOIN transactions ON transaction_items.transaction_id = transactions.id
+GROUP BY transactions.ledger_id, transaction_items.charge_id
+) AS from_agg_items
+ON from_agg_items.charge_id = charges.id AND
+from_agg_items.ledger_id = charges.from_ledger_id
+WHERE charges.to_ledger_id = 2;
+EXPLAIN
+{
+  "query_block": {
+    "select_id": 1,
+    "table": {
+      "table_name": "charges",
+      "access_type": "ALL",
+      "possible_keys": ["PRIMARY", "fk_charge_from_ledger", "fk_charge_to_ledger"],
+      "rows": 20,
+      "filtered": 40,
+      "attached_condition": "charges.to_ledger_id = 2"
+    },
+    "table": {
+      "table_name": "<derived2>",
+      "access_type": "ref",
+      "possible_keys": ["key0"],
+      "key": "key0",
+      "key_length": "17",
+      "used_key_parts": ["ledger_id", "charge_id"],
+      "ref": ["test.charges.from_ledger_id", "test.charges.id"],
+      "rows": 2,
+      "filtered": 100,
+      "materialized": {
+        "lateral": 1,
+        "query_block": {
+          "select_id": 2,
+          "table": {
+            "table_name": "transaction_items",
+            "access_type": "ref",
+            "possible_keys": ["fk_items_transaction", "fk_items_charge"],
+            "key": "fk_items_charge",
+            "key_length": "9",
+            "used_key_parts": ["charge_id"],
+            "ref": ["test.charges.id"],
+            "rows": 2,
+            "filtered": 100
+          },
+          "table": {
+            "table_name": "transactions",
+            "access_type": "eq_ref",
+            "possible_keys": ["PRIMARY", "fk_transactions_ledger"],
+            "key": "PRIMARY",
+            "key_length": "8",
+            "used_key_parts": ["id"],
+            "ref": ["test.transaction_items.transaction_id"],
+            "rows": 1,
+            "filtered": 100,
+            "attached_condition": "transactions.ledger_id = charges.from_ledger_id"
+          }
+        }
+      }
+    }
+  }
+}
+set optimizer_switch='split_materialized=off';
+SELECT
+charges.id,
+charges.from_ledger_id,
+charges.to_ledger_id,
+from_agg_items.num_rows AS from_num_rows
+FROM charges
+INNER JOIN (
+SELECT
+transactions.ledger_id,
+transaction_items.charge_id,
+count(*) as num_rows
+FROM transaction_items
+INNER JOIN transactions ON transaction_items.transaction_id = transactions.id
+GROUP BY transactions.ledger_id, transaction_items.charge_id
+) AS from_agg_items
+ON from_agg_items.charge_id = charges.id AND
+from_agg_items.ledger_id = charges.from_ledger_id
+WHERE charges.to_ledger_id = 2;
+id	from_ledger_id	to_ledger_id	from_num_rows
+2	1	2	1
+3	1	2	1
+5	3	2	1
+8	3	2	1
+10	3	2	1
+12	3	2	1
+13	3	2	1
+18	1	2	1
+EXPLAIN SELECT
+charges.id,
+charges.from_ledger_id,
+charges.to_ledger_id,
+from_agg_items.num_rows AS from_num_rows
+FROM charges
+INNER JOIN (
+SELECT
+transactions.ledger_id,
+transaction_items.charge_id,
+count(*) as num_rows
+FROM transaction_items
+INNER JOIN transactions ON transaction_items.transaction_id = transactions.id
+GROUP BY transactions.ledger_id, transaction_items.charge_id
+) AS from_agg_items
+ON from_agg_items.charge_id = charges.id AND
+from_agg_items.ledger_id = charges.from_ledger_id
+WHERE charges.to_ledger_id = 2;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	charges	ALL	PRIMARY,fk_charge_from_ledger,fk_charge_to_ledger	NULL	NULL	NULL	20	Using where
+1	PRIMARY	<derived2>	ref	key0	key0	17	test.charges.from_ledger_id,test.charges.id	4	
+2	DERIVED	transaction_items	ALL	fk_items_transaction	NULL	NULL	NULL	40	Using temporary; Using filesort
+2	DERIVED	transactions	eq_ref	PRIMARY	PRIMARY	8	test.transaction_items.transaction_id	1	
+INSERT INTO charges (id, from_ledger_id, to_ledger_id, amount) VALUES
+(101, 4, 2, 100), (102, 7, 2, 200);
+set optimizer_switch='split_materialized=on';
+SELECT
+charges.id,
+charges.from_ledger_id,
+charges.to_ledger_id,
+from_agg_items.num_rows AS from_num_rows
+FROM charges
+LEFT JOIN (
+SELECT
+transactions.ledger_id,
+transaction_items.charge_id,
+count(*) as num_rows
+FROM transaction_items
+INNER JOIN transactions ON transaction_items.transaction_id = transactions.id
+GROUP BY transactions.ledger_id, transaction_items.charge_id
+) AS from_agg_items
+ON from_agg_items.charge_id = charges.id AND
+from_agg_items.ledger_id = charges.from_ledger_id
+WHERE charges.to_ledger_id = 2;
+id	from_ledger_id	to_ledger_id	from_num_rows
+2	1	2	1
+3	1	2	1
+5	3	2	1
+8	3	2	1
+10	3	2	1
+12	3	2	1
+13	3	2	1
+18	1	2	1
+101	4	2	NULL
+102	7	2	NULL
+EXPLAIN SELECT
+charges.id,
+charges.from_ledger_id,
+charges.to_ledger_id,
+from_agg_items.num_rows AS from_num_rows
+FROM charges
+LEFT JOIN (
+SELECT
+transactions.ledger_id,
+transaction_items.charge_id,
+count(*) as num_rows
+FROM transaction_items
+INNER JOIN transactions ON transaction_items.transaction_id = transactions.id
+GROUP BY transactions.ledger_id, transaction_items.charge_id
+) AS from_agg_items
+ON from_agg_items.charge_id = charges.id AND
+from_agg_items.ledger_id = charges.from_ledger_id
+WHERE charges.to_ledger_id = 2;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	charges	ALL	fk_charge_to_ledger	NULL	NULL	NULL	20	Using where
+1	PRIMARY	<derived2>	ref	key0	key0	18	test.charges.from_ledger_id,test.charges.id	2	
+2	LATERAL DERIVED	transaction_items	ref	fk_items_transaction,fk_items_charge	fk_items_charge	9	test.charges.id	2	
+2	LATERAL DERIVED	transactions	eq_ref	PRIMARY,fk_transactions_ledger	PRIMARY	8	test.transaction_items.transaction_id	1	Using where
+EXPLAIN FORMAT=JSON SELECT
+charges.id,
+charges.from_ledger_id,
+charges.to_ledger_id,
+from_agg_items.num_rows AS from_num_rows
+FROM charges
+LEFT JOIN (
+SELECT
+transactions.ledger_id,
+transaction_items.charge_id,
+count(*) as num_rows
+FROM transaction_items
+INNER JOIN transactions ON transaction_items.transaction_id = transactions.id
+GROUP BY transactions.ledger_id, transaction_items.charge_id
+) AS from_agg_items
+ON from_agg_items.charge_id = charges.id AND
+from_agg_items.ledger_id = charges.from_ledger_id
+WHERE charges.to_ledger_id = 2;
+EXPLAIN
+{
+  "query_block": {
+    "select_id": 1,
+    "table": {
+      "table_name": "charges",
+      "access_type": "ALL",
+      "possible_keys": ["fk_charge_to_ledger"],
+      "rows": 20,
+      "filtered": 50,
+      "attached_condition": "charges.to_ledger_id = 2"
+    },
+    "table": {
+      "table_name": "<derived2>",
+      "access_type": "ref",
+      "possible_keys": ["key0"],
+      "key": "key0",
+      "key_length": "18",
+      "used_key_parts": ["ledger_id", "charge_id"],
+      "ref": ["test.charges.from_ledger_id", "test.charges.id"],
+      "rows": 2,
+      "filtered": 100,
+      "materialized": {
+        "lateral": 1,
+        "query_block": {
+          "select_id": 2,
+          "table": {
+            "table_name": "transaction_items",
+            "access_type": "ref",
+            "possible_keys": ["fk_items_transaction", "fk_items_charge"],
+            "key": "fk_items_charge",
+            "key_length": "9",
+            "used_key_parts": ["charge_id"],
+            "ref": ["test.charges.id"],
+            "rows": 2,
+            "filtered": 100
+          },
+          "table": {
+            "table_name": "transactions",
+            "access_type": "eq_ref",
+            "possible_keys": ["PRIMARY", "fk_transactions_ledger"],
+            "key": "PRIMARY",
+            "key_length": "8",
+            "used_key_parts": ["id"],
+            "ref": ["test.transaction_items.transaction_id"],
+            "rows": 1,
+            "filtered": 100,
+            "attached_condition": "transactions.ledger_id = charges.from_ledger_id"
+          }
+        }
+      }
+    }
+  }
+}
+set optimizer_switch='split_materialized=off';
+SELECT
+charges.id,
+charges.from_ledger_id,
+charges.to_ledger_id,
+from_agg_items.num_rows AS from_num_rows
+FROM charges
+LEFT JOIN (
+SELECT
+transactions.ledger_id,
+transaction_items.charge_id,
+count(*) as num_rows
+FROM transaction_items
+INNER JOIN transactions ON transaction_items.transaction_id = transactions.id
+GROUP BY transactions.ledger_id, transaction_items.charge_id
+) AS from_agg_items
+ON from_agg_items.charge_id = charges.id AND
+from_agg_items.ledger_id = charges.from_ledger_id
+WHERE charges.to_ledger_id = 2;
+id	from_ledger_id	to_ledger_id	from_num_rows
+2	1	2	1
+3	1	2	1
+5	3	2	1
+8	3	2	1
+10	3	2	1
+12	3	2	1
+13	3	2	1
+18	1	2	1
+101	4	2	NULL
+102	7	2	NULL
+EXPLAIN SELECT
+charges.id,
+charges.from_ledger_id,
+charges.to_ledger_id,
+from_agg_items.num_rows AS from_num_rows
+FROM charges
+LEFT JOIN (
+SELECT
+transactions.ledger_id,
+transaction_items.charge_id,
+count(*) as num_rows
+FROM transaction_items
+INNER JOIN transactions ON transaction_items.transaction_id = transactions.id
+GROUP BY transactions.ledger_id, transaction_items.charge_id
+) AS from_agg_items
+ON from_agg_items.charge_id = charges.id AND
+from_agg_items.ledger_id = charges.from_ledger_id
+WHERE charges.to_ledger_id = 2;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	charges	ALL	fk_charge_to_ledger	NULL	NULL	NULL	20	Using where
+1	PRIMARY	<derived2>	ref	key0	key0	18	test.charges.from_ledger_id,test.charges.id	4	
+2	DERIVED	transaction_items	ALL	fk_items_transaction	NULL	NULL	NULL	40	Using temporary; Using filesort
+2	DERIVED	transactions	eq_ref	PRIMARY	PRIMARY	8	test.transaction_items.transaction_id	1	
+set optimizer_switch='split_materialized=default';
+DROP TABLE transaction_items;
+DROP TABLE transactions;
+DROP TABLE charges;
+DROP TABLE ledgers;
 # End of 10.3 tests
 #
 # MDEV-18679: materialized view with SELECT S containing materialized
diff --git a/mysql-test/main/derived_cond_pushdown.test b/mysql-test/main/derived_cond_pushdown.test
index d738ed33128..39e82210e4c 100644
--- a/mysql-test/main/derived_cond_pushdown.test
+++ b/mysql-test/main/derived_cond_pushdown.test
@@ -3629,6 +3629,248 @@ deallocate prepare stmt;
 
 drop table t1,t2,t3;
 
+--echo #
+--echo # MDEV-MDEV-27132: Splittable derived with equality in WHERE
+--echo #
+
+CREATE TABLE t1 (
+  id int PRIMARY KEY
+) ENGINE=MyISAM;
+
+INSERT INTO t1 VALUES
+(-1),(2070),(4826),(4827),(4828),(4829),(4830),(4831),(4832),(4833),(4834),
+(4835),(4836),(4837),(4838),(4839),(4840),(4841),(4842),(4843),(4844),
+(4845),(4846),(4847),(4848),(4849),(4850),(4851),(4852),(4853),(4854),
+(4855),(4856),(4857),(4858),(4859),(4860),(4861),(4862),(4863),(4864),
+(4865),(4866),(4867),(4868),(4869),(4870),(4871),(4872),(4873),(4874),
+(4875),(4876);
+
+CREATE TABLE t2 (
+  id int PRIMARY KEY AUTO_INCREMENT,
+  deleted int(1),
+  t1_id int,
+  email varchar(255),
+  reporting_person int(1),
+  KEY t1_id (t1_id)
+) ENGINE=MyISAM;
+
+INSERT INTO t2 VALUES
+(1,0,2064,'1test@test.ee',1),(2,1626095588,2066,'2test@test.ee',1),
+(3,0,2066,'3test@test.ee',1),(4,0,2068,'4test@test.ee',1),
+(5,0,2068,'5test@test.ee',1),(6,0,2069,'6test@test.ee',1),(7,0,2070,'',0),
+(8,0,2070,'',0),(9,0,2071,'',0),(10,0,2071,'',0),(11,0,2072,'',0),
+(12,0,2072,'',0),(13,0,2072,'13test@test.ee',1),(14,0,2073,'14test@test.ee',1),
+(15,0,2074,'15test@test.ee',1),(16,0,2075,'16test@test.ee',1),(17,0,2075,'',0),
+(18,0,2075,'',0),(19,0,2076,'19test@test.ee',1),(20,0,2077,'',0),
+(21,0,2078,'21test@test.ee',1),(22,0,2078,'22test@test.ee',1);
+
+INSERT INTO t2(deleted, t1_id, email, reporting_person)
+  SELECT deleted, t1_id, email, reporting_person FROM t2;
+INSERT INTO t2(deleted, t1_id, email, reporting_person)
+  SELECT deleted, t1_id+10000, email, reporting_person FROM t2;
+INSERT INTO t2(deleted, t1_id, email, reporting_person)
+  SELECT deleted, t1_id+20000, email, reporting_person FROM t2;
+INSERT INTO t2(deleted, t1_id, email, reporting_person)
+  SELECT deleted, t1_id+40000, email, reporting_person FROM t2;
+INSERT INTO t2(deleted, t1_id, email, reporting_person)
+  SELECT deleted, t1_id+80000, email, reporting_person FROM t2;
+INSERT INTO t2(deleted, t1_id, email, reporting_person)
+  SELECT deleted, t1_id+160000, email, reporting_person FROM t2;
+
+CREATE TABLE t3 (
+  id int PRIMARY KEY,
+  deleted int,
+  t1_id int,
+  YEAR int(4),
+  quarter int(1),
+  KEY t1_id (t1_id,year,quarter)
+) ENGINE=MyISAM;
+
+INSERT INTO t3 VALUES
+(1,0,3885,2020,1),(2,0,2064,2020,1),(3,1611670734,2225,2020,1),
+(4,0,2070,2020,1),(5,1611055981,2095,2020,1),(6,1610970096,2102,2020,1),
+(7,0,3974,2020,1),(153,1609851928,3892,2020,2),(154,0,3885,2020,2),
+(155,0,2064,2020,2),(156,1611670717,2225,2020,2),(157,0,2070,2020,2),
+(317,0,2257,2020,2),(318,0,3885,2020,3),(319,0,2064,2020,3),
+(320,1611670709,2225,2020,3),(321,0,2070,2020,3),(322,0,2095,2020,3),
+(323,0,2102,2020,3),(324,0,3974,2020,3),(325,0,3886,2020,3),
+(326,1609939963,2104,2020,3),(327,0,3887,2020,3),(328,0,3888,2020,3),
+(329,0,2148,2020,3),(330,0,3889,2020,3),(331,0,3890,2020,3),
+(332,0,2179,2020,3),(333,0,2115,2020,3),(334,0,2193,2020,3),
+(335,0,2213,2020,3),(336,0,3891,2020,3),(337,1609851955,3892,2020,3),
+(338,1610447706,2232,2020,3),(339,0,2235,2020,3),(340,0,2237,2020,3),
+(341,0,3972,2020,3),(342,1610449357,2242,2020,3),(343,0,3893,2020,3),
+(344,0,2257,2020,3),(345,0,3951,2020,3),(346,0,3894,2020,3),
+(347,0,3912,2020,3),(348,0,3895,2020,3),(349,0,2301,2020,3),
+(350,0,2304,2020,3),(351,0,3896,2020,3);
+
+ANALYZE TABLE t1,t2,t3;
+
+let $q=
+SELECT t1.id
+FROM t1
+     JOIN t3
+     ON t3.t1_id = t1.id
+     JOIN (SELECT t1_id FROM t2 WHERE reporting_person = 1 GROUP BY t1_id) tx
+     ON tx.t1_id = t1.id
+WHERE t1.id BETWEEN 200 AND 100000;
+
+set  optimizer_switch='split_materialized=on';
+
+eval $q;
+eval EXPLAIN $q;
+eval EXPLAIN FORMAT=JSON $q;
+
+set  optimizer_switch='split_materialized=off';
+
+eval $q;
+
+set  optimizer_switch='split_materialized=default';
+
+DROP TABLE t1,t2,t3;
+
+--echo #
+--echo # MDEV-27510: Splittable derived with grouping over two tables
+--echo #
+
+CREATE TABLE ledgers (
+  id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  name VARCHAR(32)
+) ENGINE=MyISAM;
+
+CREATE TABLE charges (
+  id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  from_ledger_id BIGINT UNSIGNED NOT NULL,
+  to_ledger_id BIGINT UNSIGNED NOT NULL,
+  amount INT NOT NULL,
+  KEY fk_charge_from_ledger (from_ledger_id),
+  KEY fk_charge_to_ledger (to_ledger_id)
+) ENGINE=MyISAM;
+
+CREATE TABLE transactions (
+  id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  ledger_id BIGINT UNSIGNED NOT NULL,
+  KEY fk_transactions_ledger (ledger_id)
+) ENGINE=MyISAM;
+
+CREATE TABLE transaction_items (
+  id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  transaction_id BIGINT UNSIGNED NOT NULL,
+  charge_id BIGINT UNSIGNED,
+  amount INT NOT NULL,
+  KEY fk_items_transaction (transaction_id),
+  KEY fk_items_charge (charge_id)
+) ENGINE=MyISAM;
+
+INSERT INTO ledgers (id, name) VALUES
+(1, 'Anna'), (2, 'John'), (3, 'Fred');
+
+INSERT INTO charges (id, from_ledger_id, to_ledger_id, amount) VALUES
+(1, 2, 1, 200), (2, 1, 2, 330), (3, 1, 2, 640), (4, 3, 1, 640), (5, 3, 2, 1000),
+(6, 3, 1, 660), (7, 2, 3, 650), (8, 3, 2, 160), (9, 2, 1, 740), (10, 3, 2, 310),
+(11, 2, 1, 640), (12, 3, 2, 240), (13, 3, 2, 340), (14, 2, 1, 720),
+(15, 2, 3, 100),
+(16, 2, 3, 980), (17, 2, 1, 80), (18, 1, 2, 760), (19, 2, 3, 740),
+(20, 2, 1, 990);
+
+INSERT INTO transactions (id, ledger_id) VALUES
+(2, 1), (3, 1), (5, 1), (8, 1), (12, 1), (18, 1), (22, 1), (28, 1),
+(34, 1), (35, 1),
+(40, 1), (1, 2), (4, 2), (6, 2), (10, 2), (13, 2), (16, 2), (17, 2),
+(20, 2), (21, 2),
+(24, 2), (26, 2), (27, 2), (29, 2), (31, 2), (33, 2), (36, 2), (37, 2),
+(39, 2), (7, 3),
+(9, 3), (11, 3), (14, 3), (15, 3), (19, 3), (23, 3), (25, 3), (30, 3),
+(32, 3), (38, 3);
+
+INSERT INTO transaction_items (id, transaction_id, charge_id, amount) VALUES
+(1, 1, 1, -200), (2, 2, 1, 200), (3, 3, 2, -330), (4, 4, 2, 330),
+(5, 5, 3, -640),
+(6, 6, 3, 640), (7, 7, 4, -640), (8, 8, 4, 640), (9, 9, 5, -1000),
+(10, 10, 5, 1000),
+(11, 11, 6, -660), (12, 12, 6, 660), (13, 13, 7, -650), (14, 14, 7, 650),
+(15, 15, 8, -160),
+(16, 16, 8, 160), (17, 17, 9, -740), (18, 18, 9, 740), (19, 19, 10, -310),
+(20, 20, 10, 310),
+(21, 21, 11, -640), (22, 22, 11, 640), (23, 23, 12, -240), (24, 24, 12, 240),
+(25, 25, 13, -340),
+(26, 26, 13, 340), (27, 27, 14, -720), (28, 28, 14, 720), (29, 29, 15, -100),
+(30, 30, 15, 100),
+(31, 31, 16, -980), (32, 32, 16, 980), (33, 33, 17, -80), (34, 34, 17, 80),
+(35, 35, 18, -760),
+(36, 36, 18, 760), (37, 37, 19, -740), (38, 38, 19, 740), (39, 39, 20, -990),
+(40, 40, 20, 990);
+
+ANALYZE TABLE ledgers, charges, transactions, transaction_items;
+
+let $q=
+SELECT
+    charges.id,
+    charges.from_ledger_id,
+    charges.to_ledger_id,
+    from_agg_items.num_rows AS from_num_rows
+FROM charges
+INNER JOIN (
+    SELECT
+        transactions.ledger_id,
+        transaction_items.charge_id,
+        count(*) as num_rows
+    FROM transaction_items
+    INNER JOIN transactions ON transaction_items.transaction_id = transactions.id
+    GROUP BY transactions.ledger_id, transaction_items.charge_id
+) AS from_agg_items
+ON from_agg_items.charge_id = charges.id AND
+   from_agg_items.ledger_id = charges.from_ledger_id
+WHERE charges.to_ledger_id = 2;
+
+set optimizer_switch='split_materialized=on';
+eval $q;
+eval EXPLAIN $q;
+eval EXPLAIN FORMAT=JSON $q;
+
+set optimizer_switch='split_materialized=off';
+eval $q;
+eval EXPLAIN $q;
+
+INSERT INTO charges (id, from_ledger_id, to_ledger_id, amount) VALUES
+(101, 4, 2, 100), (102, 7, 2, 200);
+
+let $q1=
+SELECT
+    charges.id,
+    charges.from_ledger_id,
+    charges.to_ledger_id,
+    from_agg_items.num_rows AS from_num_rows
+FROM charges
+LEFT JOIN (
+    SELECT
+        transactions.ledger_id,
+        transaction_items.charge_id,
+        count(*) as num_rows
+    FROM transaction_items
+    INNER JOIN transactions ON transaction_items.transaction_id = transactions.id
+    GROUP BY transactions.ledger_id, transaction_items.charge_id
+) AS from_agg_items
+ON from_agg_items.charge_id = charges.id AND
+   from_agg_items.ledger_id = charges.from_ledger_id
+WHERE charges.to_ledger_id = 2;
+
+set optimizer_switch='split_materialized=on';
+eval $q1;
+eval EXPLAIN $q1;
+eval EXPLAIN FORMAT=JSON $q1;
+
+set optimizer_switch='split_materialized=off';
+eval $q1;
+eval EXPLAIN $q1;
+
+set optimizer_switch='split_materialized=default';
+
+DROP TABLE transaction_items;
+DROP TABLE transactions;
+DROP TABLE charges;
+DROP TABLE ledgers;
+
 --echo # End of 10.3 tests
 
 --echo #
diff --git a/mysql-test/main/derived_split_innodb.result b/mysql-test/main/derived_split_innodb.result
index 21921d86dab..74876836a53 100644
--- a/mysql-test/main/derived_split_innodb.result
+++ b/mysql-test/main/derived_split_innodb.result
@@ -242,5 +242,49 @@ drop table t1,t2,t3;
 set optimizer_switch='split_materialized=default';
 set use_stat_tables=default;
 set optimizer_use_condition_selectivity=default;
+#
+# MDEV-26337: subquery with groupby and ROLLUP returns incorrect results 
+#  (The testcase is taken from testcase for MDEV-13389 due to it being
+#   much smaller)
+#
+create table t3 (a int, b int, c char(127), index idx_b(b)) engine=myisam;
+insert into t3 values
+(8,11,'aa'), (5,15,'cc'), (1,14,'bb'), (2,12,'aa'), (7,17,'cc'),
+(7,18,'aa'), (2,11,'aa'), (7,10,'bb'), (3,11,'dd'), (4,12,'ee'),
+(5,14,'dd'), (9,12,'ee');
+create table t4 (a int, b int, c char(127), index idx(a,c)) engine=myisam;
+insert into t4 values
+(7,10,'cc'), (1,20,'aa'), (2,23,'bb'), (7,18,'cc'), (1,30,'bb'),
+(4,71,'xx'), (3,15,'aa'), (7,82,'aa'), (8,12,'dd'), (4,15,'aa'),
+(11,33,'yy'), (10,42,'zz'), (4,53,'xx'), (10,17,'yy'), (7,12,'cc'),
+(8,20,'dd'), (7,32,'bb'), (1,50,'aa'), (3,40,'bb'), (3,77,'aa');
+insert into t4 select a+10, b+10, concat(c,'f') from t4;
+analyze table t3,t4;
+Table	Op	Msg_type	Msg_text
+test.t3	analyze	status	Engine-independent statistics collected
+test.t3	analyze	status	OK
+test.t4	analyze	status	Engine-independent statistics collected
+test.t4	analyze	status	OK
+# This should use a plan with LATERAL DERIVED:
+explain select t3.a,t3.c,t.max,t.min
+from t3 join
+(select a, c, max(b) max, min(b) min from t4 group by a,c) t
+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	2	
+2	LATERAL DERIVED	t4	ref	idx	idx	133	test.t3.a,test.t3.c	1	
+# ... and if one adds WITH ROLLUP, then LATERAL DERIVED is no longer used:
+explain select t3.a,t3.c,t.max,t.min
+from t3 join
+(select a, c, max(b) max, min(b) min from t4 group by a,c with rollup) t
+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	
+2	DERIVED	t4	ALL	NULL	NULL	NULL	NULL	40	Using filesort
+drop table t3, t4;
 # End of 10.3 tests
 SET GLOBAL innodb_stats_persistent=@save_innodb_stats_persistent;
diff --git a/mysql-test/main/derived_split_innodb.test b/mysql-test/main/derived_split_innodb.test
index de25fd8e3d3..1ebe27cd12c 100644
--- a/mysql-test/main/derived_split_innodb.test
+++ b/mysql-test/main/derived_split_innodb.test
@@ -195,6 +195,42 @@ set optimizer_switch='split_materialized=default';
 set use_stat_tables=default;
 set optimizer_use_condition_selectivity=default;
 
+--echo #
+--echo # MDEV-26337: subquery with groupby and ROLLUP returns incorrect results 
+--echo #  (The testcase is taken from testcase for MDEV-13389 due to it being
+--echo #   much smaller)
+--echo #
+
+create table t3 (a int, b int, c char(127), index idx_b(b)) engine=myisam;
+insert into t3 values
+(8,11,'aa'), (5,15,'cc'), (1,14,'bb'), (2,12,'aa'), (7,17,'cc'),
+(7,18,'aa'), (2,11,'aa'), (7,10,'bb'), (3,11,'dd'), (4,12,'ee'),
+(5,14,'dd'), (9,12,'ee');
+create table t4 (a int, b int, c char(127), index idx(a,c)) engine=myisam;
+insert into t4 values
+(7,10,'cc'), (1,20,'aa'), (2,23,'bb'), (7,18,'cc'), (1,30,'bb'),
+(4,71,'xx'), (3,15,'aa'), (7,82,'aa'), (8,12,'dd'), (4,15,'aa'),
+(11,33,'yy'), (10,42,'zz'), (4,53,'xx'), (10,17,'yy'), (7,12,'cc'),
+(8,20,'dd'), (7,32,'bb'), (1,50,'aa'), (3,40,'bb'), (3,77,'aa');
+insert into t4 select a+10, b+10, concat(c,'f') from t4;
+analyze table t3,t4;
+
+--echo # This should use a plan with LATERAL DERIVED:
+explain select t3.a,t3.c,t.max,t.min
+from t3 join
+(select a, c, max(b) max, min(b) min from t4 group by a,c) t
+on t3.a=t.a and t3.c=t.c
+where t3.b > 15;
+
+--echo # ... and if one adds WITH ROLLUP, then LATERAL DERIVED is no longer used:
+explain select t3.a,t3.c,t.max,t.min
+from t3 join
+(select a, c, max(b) max, min(b) min from t4 group by a,c with rollup) t
+on t3.a=t.a and t3.c=t.c
+where t3.b > 15;
+
+drop table t3, t4;
+
 --echo # End of 10.3 tests
 
 SET GLOBAL innodb_stats_persistent=@save_innodb_stats_persistent;
diff --git a/mysql-test/main/derived_view.result b/mysql-test/main/derived_view.result
index 3c13cc976aa..46b04201d74 100644
--- a/mysql-test/main/derived_view.result
+++ b/mysql-test/main/derived_view.result
@@ -2383,8 +2383,6 @@ SELECT * FROM t1;
 a
 1
 1
-1
-1
 drop table t1,t2;
 set optimizer_switch=@save968720_optimizer_switch;
 #
@@ -3500,4 +3498,134 @@ a
 7
 drop view v1;
 drop table t1;
+#
+# MDEV-24454  Second execution of SELECT containing set function
+# MDEV-25086: whose only argument is an outer reference to a column
+#             of mergeable view/derived/table/CTE
+#
+create table t1 (a int);
+create table t2 (b int);
+insert into t1 values (3), (1), (3);
+insert into t2 values (70), (30), (70);
+create view v1 as select * from t2;
+prepare stmt from "
+select (select sum(b) from t1 where a=1) as r from v1;
+";
+execute stmt;
+r
+170
+execute stmt;
+r
+170
+deallocate prepare stmt;
+prepare stmt from "
+select (select sum(b) from t1 where a=1) as r from (select * from t2) dt;
+";
+execute stmt;
+r
+170
+execute stmt;
+r
+170
+deallocate prepare stmt;
+prepare stmt from "
+with cte as (select * from t2)
+select (select sum(b) from t1 where a=1) as r from cte;
+";
+execute stmt;
+r
+170
+execute stmt;
+r
+170
+deallocate prepare stmt;
+prepare stmt from "
+select (select sum(b) from t1 where a=1) as r
+from (select * from v1 where b > 50) dt;
+";
+execute stmt;
+r
+140
+execute stmt;
+r
+140
+deallocate prepare stmt;
+prepare stmt from "
+select (select sum(b) from t1 where a=1) as r
+from (select * from (select * from t2) dt1 where b > 50) dt;
+";
+execute stmt;
+r
+140
+execute stmt;
+r
+140
+deallocate prepare stmt;
+prepare stmt from "
+with cte as (select * from (select * from t2) dt1 where b > 50)
+select (select sum(b) from t1 where a=1) as r from cte;
+";
+execute stmt;
+r
+140
+execute stmt;
+r
+140
+deallocate prepare stmt;
+create procedure sp1()
+begin
+select (select sum(b) from t1 where a=1) as r from v1;
+end |
+call sp1();
+r
+170
+call sp1();
+r
+170
+drop procedure sp1;
+create procedure sp1()
+begin
+select (select sum(b) from t1 where a=1) as r from (select * from t2) dt;
+end |
+call sp1();
+r
+170
+call sp1();
+r
+170
+drop procedure sp1;
+create procedure sp1()
+begin
+with cte as (select * from t2)
+select (select sum(b) from t1 where a=1) as r from cte;
+end |
+call sp1();
+r
+170
+call sp1();
+r
+170
+drop procedure sp1;
+drop view v1;
+drop table t1,t2;
+CREATE TABLE t1(f0 INT);
+INSERT INTO t1 VALUES (3);
+CREATE VIEW v1 AS SELECT f0 AS f1 FROM t1;
+CREATE VIEW v2 AS
+SELECT
+(SELECT GROUP_CONCAT(v1.f1 SEPARATOR ', ') FROM v1 n) AS f2,
+GROUP_CONCAT('aa' SEPARATOR ', ') AS f3
+FROM v1;
+CREATE VIEW v3 AS SELECT * FROM v2;
+CREATE PROCEDURE p1()
+SELECT * FROM v3;
+CALL p1();
+f2	f3
+3	aa
+CALL p1();
+f2	f3
+3	aa
+DROP PROCEDURE p1;
+DROP VIEW v1,v2,v3;
+DROP TABLE t1;
 # End of 10.2 tests
diff --git a/mysql-test/main/derived_view.test b/mysql-test/main/derived_view.test
index 9ab1ddd3a76..584bde2d75d 100644
--- a/mysql-test/main/derived_view.test
+++ b/mysql-test/main/derived_view.test
@@ -2289,4 +2289,115 @@ select * from ((select a from t1 limit 2) order by a desc) dt;
 drop view v1;
 drop table t1;
 
+--echo #
+--echo # MDEV-24454  Second execution of SELECT containing set function
+--echo # MDEV-25086: whose only argument is an outer reference to a column
+--echo #             of mergeable view/derived/table/CTE
+--echo #
+
+create table t1 (a int);
+create table t2 (b int);
+insert into t1 values (3), (1), (3);
+insert into t2 values (70), (30), (70);
+create view v1 as select * from t2;
+
+prepare stmt from "
+select (select sum(b) from t1 where a=1) as r from v1;
+";
+execute stmt;
+execute stmt;
+deallocate prepare stmt;
+
+prepare stmt from "
+select (select sum(b) from t1 where a=1) as r from (select * from t2) dt;
+";
+execute stmt;
+execute stmt;
+deallocate prepare stmt;
+
+prepare stmt from "
+with cte as (select * from t2)
+select (select sum(b) from t1 where a=1) as r from cte;
+";
+execute stmt;
+execute stmt;
+deallocate prepare stmt;
+
+prepare stmt from "
+select (select sum(b) from t1 where a=1) as r
+from (select * from v1 where b > 50) dt;
+";
+execute stmt;
+execute stmt;
+deallocate prepare stmt;
+
+prepare stmt from "
+select (select sum(b) from t1 where a=1) as r
+from (select * from (select * from t2) dt1 where b > 50) dt;
+";
+execute stmt;
+execute stmt;
+deallocate prepare stmt;
+
+prepare stmt from "
+with cte as (select * from (select * from t2) dt1 where b > 50)
+select (select sum(b) from t1 where a=1) as r from cte;
+";
+execute stmt;
+execute stmt;
+deallocate prepare stmt;
+
+--delimiter |
+create procedure sp1()
+begin
+select (select sum(b) from t1 where a=1) as r from v1;
+end |
+--delimiter ;
+call sp1();
+call sp1();
+drop procedure sp1;
+
+--delimiter |
+create procedure sp1()
+begin
+select (select sum(b) from t1 where a=1) as r from (select * from t2) dt;
+end |
+--delimiter ;
+call sp1();
+call sp1();
+drop procedure sp1;
+
+--delimiter |
+create procedure sp1()
+begin
+with cte as (select * from t2)
+select (select sum(b) from t1 where a=1) as r from cte;
+end |
+--delimiter ;
+call sp1();
+call sp1();
+drop procedure sp1;
+
+drop view v1;
+drop table t1,t2;
+
+CREATE TABLE t1(f0 INT);
+INSERT INTO t1 VALUES (3);
+CREATE VIEW v1 AS SELECT f0 AS f1 FROM t1;
+CREATE VIEW v2 AS
+SELECT
+  (SELECT GROUP_CONCAT(v1.f1 SEPARATOR ', ') FROM v1 n) AS f2,
+  GROUP_CONCAT('aa' SEPARATOR ', ') AS f3
+FROM v1;
+CREATE VIEW v3 AS SELECT * FROM v2;
+
+CREATE PROCEDURE p1()
+  SELECT * FROM v3;
+CALL p1();
+CALL p1();
+
+DROP PROCEDURE p1;
+DROP VIEW v1,v2,v3;
+DROP TABLE t1;
+
 --echo # End of 10.2 tests
diff --git a/mysql-test/main/events_embedded.test b/mysql-test/main/events_embedded.test
index 9922ea6dfee..f6921f302bf 100644
--- a/mysql-test/main/events_embedded.test
+++ b/mysql-test/main/events_embedded.test
@@ -2,4 +2,3 @@
 
 --error 1193
 set global event_scheduler=ON;
-
diff --git a/mysql-test/main/explain_innodb.result b/mysql-test/main/explain_innodb.result
new file mode 100644
index 00000000000..b46665c279c
--- /dev/null
+++ b/mysql-test/main/explain_innodb.result
@@ -0,0 +1,20 @@
+#
+# MDEV-26249: Crash in in Explain_node::print_explain_for_children while writing to the slow query log
+#
+set @sql_tmp=@@slow_query_log;
+SET GLOBAL slow_query_log = 1;
+SET long_query_time = 0.000000;
+SET log_slow_verbosity = 'explain';
+CREATE TABLE t1 ( id varchar(50), KEY (id)) engine=innodb;
+SELECT * FROM (SELECT id FROM t1 GROUP BY id) dt WHERE 1=0;
+id
+select 1;
+1
+1
+explain
+SELECT * FROM (SELECT id FROM t1 GROUP BY id) dt WHERE 1=0;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE
+2	DERIVED	t1	range	NULL	id	53	NULL	2	Using index for group-by
+SET GLOBAL slow_query_log = @sql_tmp;
+drop table t1;
diff --git a/mysql-test/main/explain_innodb.test b/mysql-test/main/explain_innodb.test
new file mode 100644
index 00000000000..2c29a6e26da
--- /dev/null
+++ b/mysql-test/main/explain_innodb.test
@@ -0,0 +1,20 @@
+--echo #
+--echo # MDEV-26249: Crash in in Explain_node::print_explain_for_children while writing to the slow query log
+--echo #
+
+--source include/have_innodb.inc
+
+set @sql_tmp=@@slow_query_log;
+SET GLOBAL slow_query_log = 1;
+SET long_query_time = 0.000000;
+SET log_slow_verbosity = 'explain';
+
+CREATE TABLE t1 ( id varchar(50), KEY (id)) engine=innodb;
+SELECT * FROM (SELECT id FROM t1 GROUP BY id) dt WHERE 1=0;
+select 1;
+
+explain
+SELECT * FROM (SELECT id FROM t1 GROUP BY id) dt WHERE 1=0;
+
+SET GLOBAL slow_query_log = @sql_tmp;
+drop table t1;
diff --git a/mysql-test/main/func_default.result b/mysql-test/main/func_default.result
index 9699f0795e3..8721270ca1c 100644
--- a/mysql-test/main/func_default.result
+++ b/mysql-test/main/func_default.result
@@ -29,6 +29,9 @@ INSERT INTO t1 VALUES (1, 'one'), (2, 'two'), (3, 'three');
 SELECT s, 32 AS mi FROM t1 GROUP BY s HAVING DEFAULT(mi) IS NULL;
 ERROR HY000: Field 'mi' doesn't have a default value
 DROP TABLE t1;
+#
+# Start of 10.2 tests
+#
 set timestamp=unix_timestamp('2001-01-01 10:20:30.123456');
 create table t1 (a int default 1, b int default (a+1),
 c varchar(100) default 'foo', d text default 'bar',
@@ -40,3 +43,121 @@ default(a)	default(b)	default(c)	default(d)	default(e)	default(f)
 1	2	foo	bar	2001-01-01 10:20:30	2001-01-01 10:20:30.120000
 1	11	foo	bar	2001-01-01 10:20:30	2001-01-01 10:20:30.120000
 drop table t1;
+#
+# MDEV-21639 DEFAULT(col) evaluates to a bad value in WHERE clause
+#
+CREATE TABLE t1 (a BIGINT NOT NULL DEFAULT (IF(false,UNIX_TIMESTAMP(),10)));
+INSERT INTO t1 VALUES (10000);
+SELECT
+a,
+DEFAULT(a),
+CASE WHEN a THEN DEFAULT(a) END AS c,
+CASE WHEN a THEN DEFAULT(a) END = 10 AS ce
+FROM t1;
+a	DEFAULT(a)	c	ce
+10000	10	10	1
+SELECT a FROM t1 WHERE CASE WHEN a THEN DEFAULT(a) END=10;
+a
+10000
+DROP TABLE t1;
+CREATE TABLE t1 (a DOUBLE NOT NULL DEFAULT (IF(false,UNIX_TIMESTAMP(),10)));
+INSERT INTO t1 VALUES (10000);
+SELECT
+a,
+DEFAULT(a),
+CASE WHEN a THEN DEFAULT(a) END AS c,
+CASE WHEN a THEN DEFAULT(a) END = 10 AS ce
+FROM t1;
+a	DEFAULT(a)	c	ce
+10000	10	10	1
+SELECT a FROM t1 WHERE CASE WHEN a THEN DEFAULT(a) END=10;
+a
+10000
+DROP TABLE t1;
+CREATE TABLE t1 (a DECIMAL(10,0) NOT NULL DEFAULT (IF(false,UNIX_TIMESTAMP(),10)));
+INSERT INTO t1 VALUES (10000);
+SELECT
+a,
+DEFAULT(a),
+CASE WHEN a THEN DEFAULT(a) END AS c,
+CASE WHEN a THEN DEFAULT(a) END = 10 AS ce
+FROM t1;
+a	DEFAULT(a)	c	ce
+10000	10	10	1
+SELECT a FROM t1 WHERE CASE WHEN a THEN DEFAULT(a) END=10;
+a
+10000
+DROP TABLE t1;
+CREATE TABLE t1 (a VARCHAR(32) NOT NULL DEFAULT (IF(false,UNIX_TIMESTAMP(),10)));
+INSERT INTO t1 VALUES (10000);
+SELECT
+a,
+DEFAULT(a),
+CASE WHEN a THEN DEFAULT(a) END AS c,
+CASE WHEN a THEN DEFAULT(a) END = '10' AS ce
+FROM t1;
+a	DEFAULT(a)	c	ce
+10000	10	10	1
+SELECT a FROM t1 WHERE CASE WHEN a THEN DEFAULT(a) END='10';
+a
+10000
+DROP TABLE t1;
+CREATE TABLE t1 (a DATE NOT NULL DEFAULT (IF(false,UNIX_TIMESTAMP()%10,DATE'2001-01-01')));
+INSERT INTO t1 VALUES ('2000-01-01');
+SELECT
+a,
+DEFAULT(a),
+CASE WHEN a THEN DEFAULT(a) END AS c,
+CASE WHEN a THEN DEFAULT(a) END = '2001-01-01' AS ce
+FROM t1;
+a	DEFAULT(a)	c	ce
+2000-01-01	2001-01-01	2001-01-01	1
+SELECT a FROM t1 WHERE CASE WHEN a THEN DEFAULT(a) END='2001-01-01';
+a
+2000-01-01
+DROP TABLE t1;
+CREATE TABLE t1 (a TIME NOT NULL DEFAULT (IF(false,UNIX_TIMESTAMP()%10,TIME'10:20:30')));
+INSERT INTO t1 VALUES ('10:00:00');
+SELECT
+a,
+DEFAULT(a),
+CASE WHEN a THEN DEFAULT(a) END AS c,
+CASE WHEN a THEN DEFAULT(a) END = '10:20:30' AS ce
+FROM t1;
+a	DEFAULT(a)	c	ce
+10:00:00	10:20:30	10:20:30	1
+SELECT a FROM t1 WHERE CASE WHEN a THEN DEFAULT(a) END='10:20:30';
+a
+10:00:00
+DROP TABLE t1;
+CREATE TABLE t1 (a DATETIME NOT NULL DEFAULT (IF(false,UNIX_TIMESTAMP(),TIMESTAMP'2001-01-01 10:20:30')));
+INSERT INTO t1 VALUES ('2000-01-01 10:00:00');
+SELECT
+a,
+DEFAULT(a),
+CASE WHEN a THEN DEFAULT(a) END AS c,
+CASE WHEN a THEN DEFAULT(a) END = '2001-01-01 10:20:30' AS ce
+FROM t1;
+a	DEFAULT(a)	c	ce
+2000-01-01 10:00:00	2001-01-01 10:20:30	2001-01-01 10:20:30	1
+SELECT a FROM t1 WHERE CASE WHEN a THEN DEFAULT(a) END='2001-01-01 10:20:30';
+a
+2000-01-01 10:00:00
+DROP TABLE t1;
+CREATE TABLE t1 (a INT NOT NULL DEFAULT (IF(false,UNIX_TIMESTAMP(),FALSE)));
+INSERT INTO t1 VALUES (10);
+SELECT
+a,
+DEFAULT(a),
+CASE WHEN a THEN DEFAULT(a) END AS c,
+CASE WHEN a THEN DEFAULT(a) END IS FALSE AS ce
+FROM t1;
+a	DEFAULT(a)	c	ce
+10	0	0	1
+SELECT a FROM t1 WHERE CASE WHEN a THEN DEFAULT(a) END IS FALSE;
+a
+10
+DROP TABLE t1;
+#
+# End of 10.2 tests
+#
diff --git a/mysql-test/main/func_default.test b/mysql-test/main/func_default.test
index 332bfca021f..cba7842c68f 100644
--- a/mysql-test/main/func_default.test
+++ b/mysql-test/main/func_default.test
@@ -34,9 +34,9 @@ INSERT INTO t1 VALUES (1, 'one'), (2, 'two'), (3, 'three');
 SELECT s, 32 AS mi FROM t1 GROUP BY s HAVING DEFAULT(mi) IS NULL;
 DROP TABLE t1;
 
-#
-# 10.2 tests
-#
+--echo #
+--echo # Start of 10.2 tests
+--echo #
 
 set timestamp=unix_timestamp('2001-01-01 10:20:30.123456');
 create table t1 (a int default 1, b int default (a+1),
@@ -46,3 +46,99 @@ insert t1 () values ();
 insert t1 (a) values (10);
 select default(a),default(b),default(c),default(d),default(e),default(f) from t1;
 drop table t1;
+
+--echo #
+--echo # MDEV-21639 DEFAULT(col) evaluates to a bad value in WHERE clause
+--echo #
+
+CREATE TABLE t1 (a BIGINT NOT NULL DEFAULT (IF(false,UNIX_TIMESTAMP(),10)));
+INSERT INTO t1 VALUES (10000);
+SELECT
+  a,
+  DEFAULT(a),
+  CASE WHEN a THEN DEFAULT(a) END AS c,
+  CASE WHEN a THEN DEFAULT(a) END = 10 AS ce
+FROM t1;
+SELECT a FROM t1 WHERE CASE WHEN a THEN DEFAULT(a) END=10;
+DROP TABLE t1;
+
+CREATE TABLE t1 (a DOUBLE NOT NULL DEFAULT (IF(false,UNIX_TIMESTAMP(),10)));
+INSERT INTO t1 VALUES (10000);
+SELECT
+  a,
+  DEFAULT(a),
+  CASE WHEN a THEN DEFAULT(a) END AS c,
+  CASE WHEN a THEN DEFAULT(a) END = 10 AS ce
+FROM t1;
+SELECT a FROM t1 WHERE CASE WHEN a THEN DEFAULT(a) END=10;
+DROP TABLE t1;
+
+CREATE TABLE t1 (a DECIMAL(10,0) NOT NULL DEFAULT (IF(false,UNIX_TIMESTAMP(),10)));
+INSERT INTO t1 VALUES (10000);
+SELECT
+  a,
+  DEFAULT(a),
+  CASE WHEN a THEN DEFAULT(a) END AS c,
+  CASE WHEN a THEN DEFAULT(a) END = 10 AS ce
+FROM t1;
+SELECT a FROM t1 WHERE CASE WHEN a THEN DEFAULT(a) END=10;
+DROP TABLE t1;
+
+CREATE TABLE t1 (a VARCHAR(32) NOT NULL DEFAULT (IF(false,UNIX_TIMESTAMP(),10)));
+INSERT INTO t1 VALUES (10000);
+SELECT
+  a,
+  DEFAULT(a),
+  CASE WHEN a THEN DEFAULT(a) END AS c,
+  CASE WHEN a THEN DEFAULT(a) END = '10' AS ce
+FROM t1;
+SELECT a FROM t1 WHERE CASE WHEN a THEN DEFAULT(a) END='10';
+DROP TABLE t1;
+
+CREATE TABLE t1 (a DATE NOT NULL DEFAULT (IF(false,UNIX_TIMESTAMP()%10,DATE'2001-01-01')));
+INSERT INTO t1 VALUES ('2000-01-01');
+SELECT
+  a,
+  DEFAULT(a),
+  CASE WHEN a THEN DEFAULT(a) END AS c,
+  CASE WHEN a THEN DEFAULT(a) END = '2001-01-01' AS ce
+FROM t1;
+SELECT a FROM t1 WHERE CASE WHEN a THEN DEFAULT(a) END='2001-01-01';
+DROP TABLE t1;
+
+CREATE TABLE t1 (a TIME NOT NULL DEFAULT (IF(false,UNIX_TIMESTAMP()%10,TIME'10:20:30')));
+INSERT INTO t1 VALUES ('10:00:00');
+SELECT
+  a,
+  DEFAULT(a),
+  CASE WHEN a THEN DEFAULT(a) END AS c,
+  CASE WHEN a THEN DEFAULT(a) END = '10:20:30' AS ce
+FROM t1;
+SELECT a FROM t1 WHERE CASE WHEN a THEN DEFAULT(a) END='10:20:30';
+DROP TABLE t1;
+
+CREATE TABLE t1 (a DATETIME NOT NULL DEFAULT (IF(false,UNIX_TIMESTAMP(),TIMESTAMP'2001-01-01 10:20:30')));
+INSERT INTO t1 VALUES ('2000-01-01 10:00:00');
+SELECT
+  a,
+  DEFAULT(a),
+  CASE WHEN a THEN DEFAULT(a) END AS c,
+  CASE WHEN a THEN DEFAULT(a) END = '2001-01-01 10:20:30' AS ce
+FROM t1;
+SELECT a FROM t1 WHERE CASE WHEN a THEN DEFAULT(a) END='2001-01-01 10:20:30';
+DROP TABLE t1;
+
+CREATE TABLE t1 (a INT NOT NULL DEFAULT (IF(false,UNIX_TIMESTAMP(),FALSE)));
+INSERT INTO t1 VALUES (10);
+SELECT
+  a,
+  DEFAULT(a),
+  CASE WHEN a THEN DEFAULT(a) END AS c,
+  CASE WHEN a THEN DEFAULT(a) END IS FALSE AS ce
+FROM t1;
+SELECT a FROM t1 WHERE CASE WHEN a THEN DEFAULT(a) END IS FALSE;
+DROP TABLE t1;
+
+--echo #
+--echo # End of 10.2 tests
+--echo #
diff --git a/mysql-test/main/func_group.result b/mysql-test/main/func_group.result
index 177f0950a77..6530bbd5893 100644
--- a/mysql-test/main/func_group.result
+++ b/mysql-test/main/func_group.result
@@ -604,7 +604,7 @@ AME	AME
 explain 
 select min(a1) from t1 where a1 > 'KKK' or a1 < 'XXX';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	PRIMARY	PRIMARY	0	NULL	15	Using where; Using index
+1	SIMPLE	t1	index	PRIMARY	PRIMARY	3	NULL	15	Using where; Using index
 explain 
 select min(a1) from t1 where (a1 < 'KKK' or a1 > 'KKK');
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
diff --git a/mysql-test/main/func_json.result b/mysql-test/main/func_json.result
index 6edb27c14b8..bf6b2efaabc 100644
--- a/mysql-test/main/func_json.result
+++ b/mysql-test/main/func_json.result
@@ -940,6 +940,24 @@ SELECT JSON_REPLACE( JSON_DETAILED('["x"]'), '$.a', 'xx' );
 JSON_REPLACE( JSON_DETAILED('["x"]'), '$.a', 'xx' )
 ["x"]
 #
+# MDEV-18284 JSON casting using JSON_COMPACT doesn't always work
+#            with values from subqueries
+#
+CREATE TABLE json_test(a JSON, b JSON);
+INSERT INTO json_test VALUES ("[1,2,3]", '{"a":"foo"}');
+SELECT * FROM json_test;
+a	b
+[1,2,3]	{"a":"foo"}
+SELECT json_object("a", json_compact(a), "b", b)
+FROM (SELECT * FROM json_test) AS json_test_values;
+json_object("a", json_compact(a), "b", b)
+{"a": [1,2,3], "b": {"a":"foo"}}
+SELECT json_object("a", json_compact(a), "b", json_compact(b))
+FROM (SELECT * FROM json_test) AS json_test_values;
+json_object("a", json_compact(a), "b", json_compact(b))
+{"a": [1,2,3], "b": {"a":"foo"}}
+DROP TABLE json_test;
+#
 # End of 10.2 tests
 #
 #
@@ -1388,6 +1406,15 @@ id	materials
 DROP TABLE t1;
 DROP TABLE t2;
 #
+# MDEV-27018 IF and COALESCE lose "json" property
+#
+SELECT json_object('a', if(1, json_object('b', 'c'), json_object('e', 'f')));
+json_object('a', if(1, json_object('b', 'c'), json_object('e', 'f')))
+{"a": {"b": "c"}}
+SELECT json_object('a', coalesce(json_object('b', 'c')));
+json_object('a', coalesce(json_object('b', 'c')))
+{"a": {"b": "c"}}
+#
 # MDEV-26054 Server crashes in Item_func_json_arrayagg::get_str_from_field
 #
 CREATE TABLE t (a VARCHAR(8));
diff --git a/mysql-test/main/func_json.test b/mysql-test/main/func_json.test
index e62c780702f..0b1fce3a509 100644
--- a/mysql-test/main/func_json.test
+++ b/mysql-test/main/func_json.test
@@ -558,6 +558,21 @@ SELECT
 SELECT JSON_REPLACE( JSON_DETAILED('["x"]'), '$.a', 'xx' );
 
 --echo #
+--echo # MDEV-18284 JSON casting using JSON_COMPACT doesn't always work
+--echo #            with values from subqueries
+--echo #
+
+CREATE TABLE json_test(a JSON, b JSON);
+INSERT INTO json_test VALUES ("[1,2,3]", '{"a":"foo"}');
+SELECT * FROM json_test;
+
+SELECT json_object("a", json_compact(a), "b", b)
+  FROM (SELECT * FROM json_test) AS json_test_values;
+SELECT json_object("a", json_compact(a), "b", json_compact(b))
+  FROM (SELECT * FROM json_test) AS json_test_values;
+DROP TABLE json_test;
+
+--echo #
 --echo # End of 10.2 tests
 --echo #
 
@@ -880,6 +895,14 @@ DROP TABLE t1;
 DROP TABLE t2;
 
 --echo #
+--echo # MDEV-27018 IF and COALESCE lose "json" property
+--echo #
+
+SELECT json_object('a', if(1, json_object('b', 'c'), json_object('e', 'f')));
+SELECT json_object('a', coalesce(json_object('b', 'c')));
+
+
+--echo #
 --echo # MDEV-26054 Server crashes in Item_func_json_arrayagg::get_str_from_field
 --echo #
 
diff --git a/mysql-test/main/func_str.result b/mysql-test/main/func_str.result
index ce54d3e85a1..799fd1933dd 100644
--- a/mysql-test/main/func_str.result
+++ b/mysql-test/main/func_str.result
@@ -5028,6 +5028,59 @@ SELECT NULL IN (RIGHT(AES_ENCRYPT('foo','bar'), LAST_INSERT_ID()), 'qux');
 NULL IN (RIGHT(AES_ENCRYPT('foo','bar'), LAST_INSERT_ID()), 'qux')
 NULL
 #
+# Bug#31374305 - FORMAT() NOT DISPLAYING WHOLE NUMBER SIDE CORRECTLY
+#                FOR ES_MX AND ES_ES LOCALES
+#
+CREATE PROCEDURE load_locale_format_table()
+BEGIN
+DECLARE locale_list VARCHAR(1000) DEFAULT '
+  es_AR,es_BO,es_CL,es_CO,es_CR,es_DO,es_EC,es_ES,es_GT,es_HN,
+  es_MX,es_NI,es_PA,es_PE,es_PR,es_PY,es_SV,es_US,es_UY,es_VE';
+SET @fmt_stmt = 'INSERT INTO locale_format VALUES
+                   (?, FORMAT(12131254123412541,2,?));';
+PREPARE stmt FROM @fmt_stmt;
+WHILE locale_list != '' DO
+/* get the first locale from the list */
+SET @locale =
+TRIM(REPLACE((SUBSTRING_INDEX(locale_list, ',', 1)), '\n',''));
+EXECUTE stmt USING @locale, @locale;
+/* remove the first locale from the list */
+IF LOCATE(',', locale_list) > 0 THEN
+SET locale_list =
+SUBSTRING(locale_list, LOCATE(',', locale_list) + 1);
+ELSE
+SET locale_list = '';
+END IF;
+END WHILE;
+DEALLOCATE PREPARE stmt;
+END|
+CREATE TABLE locale_format(locale VARCHAR(10), formatted_string VARCHAR(100));
+CALL load_locale_format_table();
+SELECT * FROM locale_format;
+locale	formatted_string
+es_AR	12.131.254.123.412.541,00
+es_BO	12.131.254.123.412.541,00
+es_CL	12.131.254.123.412.541,00
+es_CO	12.131.254.123.412.541,00
+es_CR	12 131 254 123 412 541,00
+es_DO	12,131,254,123,412,541.00
+es_EC	12.131.254.123.412.541,00
+es_ES	12.131.254.123.412.541,00
+es_GT	12,131,254,123,412,541.00
+es_HN	12,131,254,123,412,541.00
+es_MX	12,131,254,123,412,541.00
+es_NI	12,131,254,123,412,541.00
+es_PA	12,131,254,123,412,541.00
+es_PE	12,131,254,123,412,541.00
+es_PR	12,131,254,123,412,541.00
+es_PY	12.131.254.123.412.541,00
+es_SV	12,131,254,123,412,541.00
+es_US	12,131,254,123,412,541.00
+es_UY	12.131.254.123.412.541,00
+es_VE	12.131.254.123.412.541,00
+DROP PROCEDURE load_locale_format_table;
+DROP TABLE locale_format;
+#
 # End of 10.2 tests
 #
 #
diff --git a/mysql-test/main/func_str.test b/mysql-test/main/func_str.test
index 432bc64f769..bbdcead280f 100644
--- a/mysql-test/main/func_str.test
+++ b/mysql-test/main/func_str.test
@@ -2000,6 +2000,42 @@ DROP TABLE t1;
 
 SELECT NULL IN (RIGHT(AES_ENCRYPT('foo','bar'), LAST_INSERT_ID()), 'qux');
 
+--echo #
+--echo # Bug#31374305 - FORMAT() NOT DISPLAYING WHOLE NUMBER SIDE CORRECTLY
+--echo #                FOR ES_MX AND ES_ES LOCALES
+--echo #
+
+DELIMITER |;
+CREATE PROCEDURE load_locale_format_table()
+BEGIN
+  DECLARE locale_list VARCHAR(1000) DEFAULT '
+  es_AR,es_BO,es_CL,es_CO,es_CR,es_DO,es_EC,es_ES,es_GT,es_HN,
+  es_MX,es_NI,es_PA,es_PE,es_PR,es_PY,es_SV,es_US,es_UY,es_VE';
+  SET @fmt_stmt = 'INSERT INTO locale_format VALUES
+                   (?, FORMAT(12131254123412541,2,?));';
+  PREPARE stmt FROM @fmt_stmt;
+  WHILE locale_list != '' DO
+    /* get the first locale from the list */
+    SET @locale =
+          TRIM(REPLACE((SUBSTRING_INDEX(locale_list, ',', 1)), '\n',''));
+    EXECUTE stmt USING @locale, @locale;
+    /* remove the first locale from the list */
+    IF LOCATE(',', locale_list) > 0 THEN
+      SET locale_list =
+      SUBSTRING(locale_list, LOCATE(',', locale_list) + 1);
+    ELSE
+      SET locale_list = '';
+    END IF;
+  END WHILE;
+  DEALLOCATE PREPARE stmt;
+END|
+DELIMITER ;|
+
+CREATE TABLE locale_format(locale VARCHAR(10), formatted_string VARCHAR(100));
+CALL load_locale_format_table();
+SELECT * FROM locale_format;
+DROP PROCEDURE load_locale_format_table;
+DROP TABLE locale_format;
 
 --echo #
 --echo # End of 10.2 tests
diff --git a/mysql-test/main/func_system.result b/mysql-test/main/func_system.result
index 6d80a439030..e435fc61986 100644
--- a/mysql-test/main/func_system.result
+++ b/mysql-test/main/func_system.result
@@ -46,7 +46,7 @@ create table t1 (version char(60)) select database(), user(), version() as 'vers
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `database()` varchar(34) CHARACTER SET utf8mb3 DEFAULT NULL,
+  `database()` varchar(64) CHARACTER SET utf8mb3 DEFAULT NULL,
   `user()` varchar(384) CHARACTER SET utf8mb3 DEFAULT NULL,
   `version` char(60) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
@@ -95,3 +95,21 @@ select left(concat(a,version()),1) from t1;
 left(concat(a,version()),1)
 a
 drop table t1;
+#
+# Start of 10.2 tests
+#
+
+MDEV-27544 database() function under UNION ALL truncates results to 34 characters
+
+
+SET NAMES utf8;
+create database betäubungsmittelverschreibungsverordnung;
+use betäubungsmittelverschreibungsverordnung;
+select database() as "database" union all select database();
+database
+betäubungsmittelverschreibungsverordnung
+betäubungsmittelverschreibungsverordnung
+drop database betäubungsmittelverschreibungsverordnung;
+#
+# End of 10.2 tests
+#
diff --git a/mysql-test/main/func_system.test b/mysql-test/main/func_system.test
index fa09e81a300..d9f2bda750a 100644
--- a/mysql-test/main/func_system.test
+++ b/mysql-test/main/func_system.test
@@ -55,3 +55,23 @@ select left(concat(a,version()),1) from t1;
 drop table t1;
 
 # End of 4.1 tests
+
+--echo #
+--echo # Start of 10.2 tests
+--echo #
+
+--echo
+--echo MDEV-27544 database() function under UNION ALL truncates results to 34 characters
+--echo
+--echo
+
+SET NAMES utf8;
+create database betäubungsmittelverschreibungsverordnung;
+use betäubungsmittelverschreibungsverordnung;
+select database() as "database" union all select database();
+drop database betäubungsmittelverschreibungsverordnung;
+
+
+--echo #
+--echo # End of 10.2 tests
+--echo #
diff --git a/mysql-test/main/gis.result b/mysql-test/main/gis.result
index 2756dffff17..f941447a677 100644
--- a/mysql-test/main/gis.result
+++ b/mysql-test/main/gis.result
@@ -1746,27 +1746,27 @@ drop table t1;
 SHOW CREATE TABLE information_schema.geometry_columns;
 Table	Create Table
 GEOMETRY_COLUMNS	CREATE TEMPORARY TABLE `GEOMETRY_COLUMNS` (
-  `F_TABLE_CATALOG` varchar(512) NOT NULL DEFAULT '',
-  `F_TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `F_TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `F_GEOMETRY_COLUMN` varchar(64) NOT NULL DEFAULT '',
-  `G_TABLE_CATALOG` varchar(512) NOT NULL DEFAULT '',
-  `G_TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `G_TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `G_GEOMETRY_COLUMN` varchar(64) NOT NULL DEFAULT '',
-  `STORAGE_TYPE` tinyint(2) NOT NULL DEFAULT 0,
-  `GEOMETRY_TYPE` int(7) NOT NULL DEFAULT 0,
-  `COORD_DIMENSION` tinyint(2) NOT NULL DEFAULT 0,
-  `MAX_PPR` tinyint(2) NOT NULL DEFAULT 0,
-  `SRID` smallint(5) NOT NULL DEFAULT 0
+  `F_TABLE_CATALOG` varchar(512) NOT NULL,
+  `F_TABLE_SCHEMA` varchar(64) NOT NULL,
+  `F_TABLE_NAME` varchar(64) NOT NULL,
+  `F_GEOMETRY_COLUMN` varchar(64) NOT NULL,
+  `G_TABLE_CATALOG` varchar(512) NOT NULL,
+  `G_TABLE_SCHEMA` varchar(64) NOT NULL,
+  `G_TABLE_NAME` varchar(64) NOT NULL,
+  `G_GEOMETRY_COLUMN` varchar(64) NOT NULL,
+  `STORAGE_TYPE` tinyint(2) NOT NULL,
+  `GEOMETRY_TYPE` int(7) NOT NULL,
+  `COORD_DIMENSION` tinyint(2) NOT NULL,
+  `MAX_PPR` tinyint(2) NOT NULL,
+  `SRID` smallint(5) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
 SHOW CREATE TABLE information_schema.spatial_ref_sys;
 Table	Create Table
 SPATIAL_REF_SYS	CREATE TEMPORARY TABLE `SPATIAL_REF_SYS` (
-  `SRID` smallint(5) NOT NULL DEFAULT 0,
-  `AUTH_NAME` varchar(512) NOT NULL DEFAULT '',
-  `AUTH_SRID` int(5) NOT NULL DEFAULT 0,
-  `SRTEXT` varchar(2048) NOT NULL DEFAULT ''
+  `SRID` smallint(5) NOT NULL,
+  `AUTH_NAME` varchar(512) NOT NULL,
+  `AUTH_SRID` int(5) NOT NULL,
+  `SRTEXT` varchar(2048) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
 create table t1(g GEOMETRY, pt POINT);
 create table t2(g LINESTRING, pl POLYGON);
diff --git a/mysql-test/main/group_min_max.result b/mysql-test/main/group_min_max.result
index c7164fcc74c..22f8ec6f851 100644
--- a/mysql-test/main/group_min_max.result
+++ b/mysql-test/main/group_min_max.result
@@ -2080,19 +2080,19 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 explain extended select a1,a2,min(b),max(b) from t1
 where (a1 = 'b' or a1 = 'd' or a1 = 'a' or a1 = 'c') and (a2 > 'a') and (c > 'a111') group by a1,a2;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	range	idx_t1_0,idx_t1_1,idx_t1_2	idx_t1_1	130	NULL	276	99.22	Using where; Using index
+1	SIMPLE	t1	range	idx_t1_0,idx_t1_1,idx_t1_2	idx_t1_1	130	NULL	276	97.06	Using where; Using index
 Warnings:
 Note	1003	select `test`.`t1`.`a1` AS `a1`,`test`.`t1`.`a2` AS `a2`,min(`test`.`t1`.`b`) AS `min(b)`,max(`test`.`t1`.`b`) AS `max(b)` from `test`.`t1` where (`test`.`t1`.`a1` = 'b' or `test`.`t1`.`a1` = 'd' or `test`.`t1`.`a1` = 'a' or `test`.`t1`.`a1` = 'c') and `test`.`t1`.`a2` > 'a' and `test`.`t1`.`c` > 'a111' group by `test`.`t1`.`a1`,`test`.`t1`.`a2`
 explain extended select a1,a2,b,min(c),max(c) from t1
 where (a1 = 'b' or a1 = 'd' or a1 = 'a' or a1 = 'c') and (a2 > 'a') and (d > 'xy2') group by a1,a2,b;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	ALL	idx_t1_0,idx_t1_1,idx_t1_2	NULL	NULL	NULL	512	40.43	Using where; Using temporary; Using filesort
+1	SIMPLE	t1	ALL	idx_t1_0,idx_t1_1,idx_t1_2	NULL	NULL	NULL	512	39.55	Using where; Using temporary; Using filesort
 Warnings:
 Note	1003	select `test`.`t1`.`a1` AS `a1`,`test`.`t1`.`a2` AS `a2`,`test`.`t1`.`b` AS `b`,min(`test`.`t1`.`c`) AS `min(c)`,max(`test`.`t1`.`c`) AS `max(c)` from `test`.`t1` where (`test`.`t1`.`a1` = 'b' or `test`.`t1`.`a1` = 'd' or `test`.`t1`.`a1` = 'a' or `test`.`t1`.`a1` = 'c') and `test`.`t1`.`a2` > 'a' and `test`.`t1`.`d` > 'xy2' group by `test`.`t1`.`a1`,`test`.`t1`.`a2`,`test`.`t1`.`b`
 explain extended select a1,a2,b,c from t1
 where (a1 = 'b' or a1 = 'd' or a1 = 'a' or a1 = 'c') and (a2 > 'a') and (d > 'xy2') group by a1,a2,b,c;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	ALL	idx_t1_0,idx_t1_1,idx_t1_2	NULL	NULL	NULL	512	40.43	Using where; Using temporary; Using filesort
+1	SIMPLE	t1	ALL	idx_t1_0,idx_t1_1,idx_t1_2	NULL	NULL	NULL	512	39.55	Using where; Using temporary; Using filesort
 Warnings:
 Note	1003	select `test`.`t1`.`a1` AS `a1`,`test`.`t1`.`a2` AS `a2`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c` from `test`.`t1` where (`test`.`t1`.`a1` = 'b' or `test`.`t1`.`a1` = 'd' or `test`.`t1`.`a1` = 'a' or `test`.`t1`.`a1` = 'c') and `test`.`t1`.`a2` > 'a' and `test`.`t1`.`d` > 'xy2' group by `test`.`t1`.`a1`,`test`.`t1`.`a2`,`test`.`t1`.`b`,`test`.`t1`.`c`
 explain select a1,a2,b,max(c),min(c) from t2 where (a2 = 'a') and (b = 'b') or (b < 'b') group by a1;
@@ -2100,7 +2100,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t2	index	NULL	idx_t2_1	163	NULL	548	Using where; Using index
 explain extended select a1,a2,b from t1 where (a1 = 'b' or a1 = 'd' or a1 = 'a' or a1 = 'c') and (a2 > 'a') and (c > 'a111') group by a1,a2,b;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	range	idx_t1_0,idx_t1_1,idx_t1_2	idx_t1_1	130	NULL	276	99.22	Using where; Using index
+1	SIMPLE	t1	range	idx_t1_0,idx_t1_1,idx_t1_2	idx_t1_1	130	NULL	276	97.06	Using where; Using index
 Warnings:
 Note	1003	select `test`.`t1`.`a1` AS `a1`,`test`.`t1`.`a2` AS `a2`,`test`.`t1`.`b` AS `b` from `test`.`t1` where (`test`.`t1`.`a1` = 'b' or `test`.`t1`.`a1` = 'd' or `test`.`t1`.`a1` = 'a' or `test`.`t1`.`a1` = 'c') and `test`.`t1`.`a2` > 'a' and `test`.`t1`.`c` > 'a111' group by `test`.`t1`.`a1`,`test`.`t1`.`a2`,`test`.`t1`.`b`
 explain select a1,a2,min(b),c from t2 where (a2 = 'a') and (c = 'a111') group by a1;
diff --git a/mysql-test/main/index_merge_myisam.result b/mysql-test/main/index_merge_myisam.result
index 053239b7fb1..846d73c58d7 100644
--- a/mysql-test/main/index_merge_myisam.result
+++ b/mysql-test/main/index_merge_myisam.result
@@ -180,17 +180,29 @@ or
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t0	index_merge	i1,i2,i3,i5,i6,i7	i3,i5	4,4	NULL	9	Using sort_union(i3,i5); Using where
 explain select * from t0 where
-((key3 <5 or key5 < 4) and (key1 < 4 or key2 < 4))
+((key3 < 4 or key5 < 4) and (key1 < 4 or key2 < 4))
 or
 ((key3 >=5 or key5 < 2) and (key5 < 5 or key6 < 6));
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t0	ALL	i1,i2,i3,i5,i6	NULL	NULL	NULL	1024	Using where
 explain select * from t0 force index(i1, i2, i3, i4, i5, i6 ) where
-((key3 <5 or key5 < 4) and (key1 < 4 or key2 < 4))
+((key3 < 4 or key5 < 4) and (key1 < 4 or key2 < 4))
+or
+((key3 >=5 or key5 < 2) and (key5 < 5 or key6 < 6));
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t0	index_merge	i1,i2,i3,i5,i6	i3,i5	4,4	NULL	1024	Using sort_union(i3,i5); Using where
+explain select * from t0 force index(i1, i2, i3, i4, i5, i6 ) where
+((key3 < 5 or key5 < 4) and (key1 < 4 or key2 < 4))
 or
 ((key3 >=5 or key5 < 2) and (key5 < 5 or key6 < 6));
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t0	index_merge	i1,i2,i3,i5,i6	i3,i5	0,4	NULL	1024	Using sort_union(i3,i5); Using where
+1	SIMPLE	t0	ALL	i1,i2,i3,i5,i6	NULL	NULL	NULL	1024	Using where
+explain select * from t0 force index(i1, i2, i3, i4, i5, i6 ) where
+((key3 < 10 or key5 < 4) and (key1 < 4 or key2 < 4))
+or
+((key3 >=5 or key5 < 2) and (key5 < 5 or key6 < 6));
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t0	ALL	i1,i2,i3,i5,i6	NULL	NULL	NULL	1024	Using where
 select * from t0 where key1 < 5 or key8 < 4 order by key1;
 key1	key2	key3	key4	key5	key6	key7	key8
 1	1	1	1	1	1	1	1023
@@ -1690,7 +1702,7 @@ SELECT  * FROM t1 FORCE KEY (PRIMARY , i , c1 , c2)
 WHERE pk = 255 OR i = 22 OR (pk  IN (1 , 136) AND c2  IN ('c' , 'w') AND (c1
 NOT BETWEEN 'e' AND 'i' OR  c2 > 'g'))  OR (pk is not null and (pk <1 or pk>1))  ;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	index_merge	PRIMARY,c1,i,c2	PRIMARY,i	0,5	NULL	69	Using sort_union(PRIMARY,i); Using where
+1	SIMPLE	t1	ALL	PRIMARY,c1,i,c2	NULL	NULL	NULL	69	Using where
 DROP TABLE t1;
 set optimizer_switch= @optimizer_switch_save;
 #
diff --git a/mysql-test/main/information_schema.result b/mysql-test/main/information_schema.result
index c497112f2ab..de9ff8d8e4d 100644
--- a/mysql-test/main/information_schema.result
+++ b/mysql-test/main/information_schema.result
@@ -230,7 +230,7 @@ Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
 Insert_priv	enum('N','Y')	utf8mb3_general_ci	NO		N		select,insert,update,references	
 show full columns from v1;
 Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
-c	varchar(64)	utf8mb3_general_ci	NO				select,insert,update,references	
+c	varchar(64)	utf8mb3_general_ci	NO		NULL		select,insert,update,references	
 select * from information_schema.COLUMNS where table_name="t1"
 and column_name= "a";
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT	IS_GENERATED	GENERATION_EXPRESSION
@@ -609,19 +609,19 @@ drop table t1;
 SHOW CREATE TABLE INFORMATION_SCHEMA.character_sets;
 Table	Create Table
 CHARACTER_SETS	CREATE TEMPORARY TABLE `CHARACTER_SETS` (
-  `CHARACTER_SET_NAME` varchar(32) NOT NULL DEFAULT '',
-  `DEFAULT_COLLATE_NAME` varchar(32) NOT NULL DEFAULT '',
-  `DESCRIPTION` varchar(60) NOT NULL DEFAULT '',
-  `MAXLEN` bigint(3) NOT NULL DEFAULT 0
+  `CHARACTER_SET_NAME` varchar(32) NOT NULL,
+  `DEFAULT_COLLATE_NAME` varchar(32) NOT NULL,
+  `DESCRIPTION` varchar(60) NOT NULL,
+  `MAXLEN` bigint(3) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
 set names latin2;
 SHOW CREATE TABLE INFORMATION_SCHEMA.character_sets;
 Table	Create Table
 CHARACTER_SETS	CREATE TEMPORARY TABLE `CHARACTER_SETS` (
-  `CHARACTER_SET_NAME` varchar(32) NOT NULL DEFAULT '',
-  `DEFAULT_COLLATE_NAME` varchar(32) NOT NULL DEFAULT '',
-  `DESCRIPTION` varchar(60) NOT NULL DEFAULT '',
-  `MAXLEN` bigint(3) NOT NULL DEFAULT 0
+  `CHARACTER_SET_NAME` varchar(32) NOT NULL,
+  `DEFAULT_COLLATE_NAME` varchar(32) NOT NULL,
+  `DESCRIPTION` varchar(60) NOT NULL,
+  `MAXLEN` bigint(3) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
 set names latin1;
 create table t1 select * from information_schema.CHARACTER_SETS
@@ -633,10 +633,10 @@ alter table t1 default character set utf8;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `CHARACTER_SET_NAME` varchar(32) NOT NULL DEFAULT '',
-  `DEFAULT_COLLATE_NAME` varchar(32) NOT NULL DEFAULT '',
-  `DESCRIPTION` varchar(60) NOT NULL DEFAULT '',
-  `MAXLEN` bigint(3) NOT NULL DEFAULT 0
+  `CHARACTER_SET_NAME` varchar(32) NOT NULL,
+  `DEFAULT_COLLATE_NAME` varchar(32) NOT NULL,
+  `DESCRIPTION` varchar(60) NOT NULL,
+  `MAXLEN` bigint(3) NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
 drop table t1;
 create view v1 as select * from information_schema.TABLES;
@@ -2499,5 +2499,30 @@ select * from t1 where (name, len) in (select  name, len from information_schema
 name	len
 drop table t1;
 #
+# MDEV-20254 Problems with EMPTY_STRING_IS_NULL and I_S tables
+#
+SET SQL_MODE= 'EMPTY_STRING_IS_NULL';
+CREATE OR REPLACE TABLE t1 AS SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE 1 = 0;
+SHOW returned: CREATE TABLE `t1` (
+  `TABLE_NAME` varchar(64) CHARACTER SET utf8mb3 NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+DROP TABLE t1;
+CREATE TABLE `t1` (
+  `TABLE_NAME` varchar(64) CHARACTER SET utf8mb3 NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `TABLE_NAME` varchar(64) CHARACTER SET utf8mb3 NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+DROP TABLE t1;
+SET SQL_MODE=DEFAULT;
+SET SQL_MODE= 'EMPTY_STRING_IS_NULL';
+CREATE OR REPLACE TABLE t1 AS SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE 1 = 0;
+DROP TABLE t1;
+# Executing the statement returned from SHOW CREATE TABLE
+DROP TABLE t1;
+SET SQL_MODE=DEFAULT;
+#
 # End of 10.3 tests
 #
diff --git a/mysql-test/main/information_schema.test b/mysql-test/main/information_schema.test
index 59f657f4403..d8c23e1f673 100644
--- a/mysql-test/main/information_schema.test
+++ b/mysql-test/main/information_schema.test
@@ -2073,5 +2073,38 @@ select * from t1 where (name, len) in (select  name, len from information_schema
 drop table t1;
 
 --echo #
+--echo # MDEV-20254 Problems with EMPTY_STRING_IS_NULL and I_S tables
+--echo #
+
+# Test one column with detailed output
+
+SET SQL_MODE= 'EMPTY_STRING_IS_NULL';
+CREATE OR REPLACE TABLE t1 AS SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE 1 = 0;
+--let $myvar= query_get_value(SHOW CREATE TABLE test.t1, Create Table, 1)
+--echo SHOW returned: $myvar
+DROP TABLE t1;
+--eval $myvar
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+SET SQL_MODE=DEFAULT;
+
+# Test all columns without detailed output.
+# Just make sure the SHOW CREATE TABLE result
+# can be passed back to the server without errors.
+
+SET SQL_MODE= 'EMPTY_STRING_IS_NULL';
+CREATE OR REPLACE TABLE t1 AS SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE 1 = 0;
+--let $myvar= query_get_value(SHOW CREATE TABLE test.t1, Create Table, 1)
+DROP TABLE t1;
+--disable_query_log
+--echo # Executing the statement returned from SHOW CREATE TABLE
+--eval $myvar
+--enable_query_log
+DROP TABLE t1;
+SET SQL_MODE=DEFAULT;
+
+
+
+--echo #
 --echo # End of 10.3 tests
 --echo #
diff --git a/mysql-test/main/information_schema_inno.result b/mysql-test/main/information_schema_inno.result
index d952e4372ca..c81631728f0 100644
--- a/mysql-test/main/information_schema_inno.result
+++ b/mysql-test/main/information_schema_inno.result
@@ -1,4 +1,3 @@
-DROP TABLE IF EXISTS t1,t2,t3;
 CREATE TABLE t1 (id INT NOT NULL, PRIMARY KEY (id)) ENGINE=INNODB;
 CREATE TABLE t2 (id INT PRIMARY KEY, t1_id INT, INDEX par_ind (t1_id, id),
 FOREIGN KEY (t1_id) REFERENCES t1(id)  ON DELETE CASCADE,
diff --git a/mysql-test/main/information_schema_inno.test b/mysql-test/main/information_schema_inno.test
index 3cdbb8111d9..6c50ff3ece0 100644
--- a/mysql-test/main/information_schema_inno.test
+++ b/mysql-test/main/information_schema_inno.test
@@ -1,8 +1,6 @@
 -- source include/testdb_only.inc
 -- source include/have_innodb.inc
---disable_warnings
-DROP TABLE IF EXISTS t1,t2,t3;
---enable_warnings
+-- source include/have_symlink.inc
 
 #
 # Test for KEY_COLUMN_USAGE & TABLE_CONSTRAINTS tables
diff --git a/mysql-test/main/information_schema_parameters.result b/mysql-test/main/information_schema_parameters.result
index fd2be07326c..c0f2eda5427 100644
--- a/mysql-test/main/information_schema_parameters.result
+++ b/mysql-test/main/information_schema_parameters.result
@@ -3,22 +3,22 @@ USE INFORMATION_SCHEMA;
 SHOW CREATE TABLE INFORMATION_SCHEMA.PARAMETERS;
 Table	Create Table
 PARAMETERS	CREATE TEMPORARY TABLE `PARAMETERS` (
-  `SPECIFIC_CATALOG` varchar(512) NOT NULL DEFAULT '',
-  `SPECIFIC_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `SPECIFIC_NAME` varchar(64) NOT NULL DEFAULT '',
-  `ORDINAL_POSITION` int(21) NOT NULL DEFAULT 0,
-  `PARAMETER_MODE` varchar(5) DEFAULT NULL,
-  `PARAMETER_NAME` varchar(64) DEFAULT NULL,
-  `DATA_TYPE` varchar(64) NOT NULL DEFAULT '',
-  `CHARACTER_MAXIMUM_LENGTH` int(21) DEFAULT NULL,
-  `CHARACTER_OCTET_LENGTH` int(21) DEFAULT NULL,
-  `NUMERIC_PRECISION` int(21) DEFAULT NULL,
-  `NUMERIC_SCALE` int(21) DEFAULT NULL,
-  `DATETIME_PRECISION` bigint(21) unsigned DEFAULT NULL,
-  `CHARACTER_SET_NAME` varchar(64) DEFAULT NULL,
-  `COLLATION_NAME` varchar(64) DEFAULT NULL,
-  `DTD_IDENTIFIER` longtext NOT NULL DEFAULT '',
-  `ROUTINE_TYPE` varchar(9) NOT NULL DEFAULT ''
+  `SPECIFIC_CATALOG` varchar(512) NOT NULL,
+  `SPECIFIC_SCHEMA` varchar(64) NOT NULL,
+  `SPECIFIC_NAME` varchar(64) NOT NULL,
+  `ORDINAL_POSITION` int(21) NOT NULL,
+  `PARAMETER_MODE` varchar(5),
+  `PARAMETER_NAME` varchar(64),
+  `DATA_TYPE` varchar(64) NOT NULL,
+  `CHARACTER_MAXIMUM_LENGTH` int(21),
+  `CHARACTER_OCTET_LENGTH` int(21),
+  `NUMERIC_PRECISION` int(21),
+  `NUMERIC_SCALE` int(21),
+  `DATETIME_PRECISION` bigint(21) unsigned,
+  `CHARACTER_SET_NAME` varchar(64),
+  `COLLATION_NAME` varchar(64),
+  `DTD_IDENTIFIER` longtext NOT NULL,
+  `ROUTINE_TYPE` varchar(9) NOT NULL
 )  DEFAULT CHARSET=utf8mb3
 SELECT * FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -29,7 +29,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	PARAMETERS
 COLUMN_NAME	SPECIFIC_CATALOG
 ORDINAL_POSITION	1
-COLUMN_DEFAULT	''
+COLUMN_DEFAULT	NULL
 IS_NULLABLE	NO
 DATA_TYPE	varchar
 CHARACTER_MAXIMUM_LENGTH	512
@@ -51,7 +51,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	PARAMETERS
 COLUMN_NAME	SPECIFIC_SCHEMA
 ORDINAL_POSITION	2
-COLUMN_DEFAULT	''
+COLUMN_DEFAULT	NULL
 IS_NULLABLE	NO
 DATA_TYPE	varchar
 CHARACTER_MAXIMUM_LENGTH	64
@@ -73,7 +73,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	PARAMETERS
 COLUMN_NAME	SPECIFIC_NAME
 ORDINAL_POSITION	3
-COLUMN_DEFAULT	''
+COLUMN_DEFAULT	NULL
 IS_NULLABLE	NO
 DATA_TYPE	varchar
 CHARACTER_MAXIMUM_LENGTH	64
@@ -95,7 +95,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	PARAMETERS
 COLUMN_NAME	ORDINAL_POSITION
 ORDINAL_POSITION	4
-COLUMN_DEFAULT	0
+COLUMN_DEFAULT	NULL
 IS_NULLABLE	NO
 DATA_TYPE	int
 CHARACTER_MAXIMUM_LENGTH	NULL
@@ -161,7 +161,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	PARAMETERS
 COLUMN_NAME	DATA_TYPE
 ORDINAL_POSITION	7
-COLUMN_DEFAULT	''
+COLUMN_DEFAULT	NULL
 IS_NULLABLE	NO
 DATA_TYPE	varchar
 CHARACTER_MAXIMUM_LENGTH	64
@@ -337,7 +337,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	PARAMETERS
 COLUMN_NAME	DTD_IDENTIFIER
 ORDINAL_POSITION	15
-COLUMN_DEFAULT	''
+COLUMN_DEFAULT	NULL
 IS_NULLABLE	NO
 DATA_TYPE	longtext
 CHARACTER_MAXIMUM_LENGTH	4294967295
@@ -359,7 +359,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	PARAMETERS
 COLUMN_NAME	ROUTINE_TYPE
 ORDINAL_POSITION	16
-COLUMN_DEFAULT	''
+COLUMN_DEFAULT	NULL
 IS_NULLABLE	NO
 DATA_TYPE	varchar
 CHARACTER_MAXIMUM_LENGTH	9
@@ -378,13 +378,13 @@ IS_GENERATED	NEVER
 GENERATION_EXPRESSION	NULL
 DESCRIBE INFORMATION_SCHEMA.PARAMETERS;
 Field	Type	Null	Key	Default	Extra
-SPECIFIC_CATALOG	varchar(512)	NO			
-SPECIFIC_SCHEMA	varchar(64)	NO			
-SPECIFIC_NAME	varchar(64)	NO			
-ORDINAL_POSITION	int(21)	NO		0	
+SPECIFIC_CATALOG	varchar(512)	NO		NULL	
+SPECIFIC_SCHEMA	varchar(64)	NO		NULL	
+SPECIFIC_NAME	varchar(64)	NO		NULL	
+ORDINAL_POSITION	int(21)	NO		NULL	
 PARAMETER_MODE	varchar(5)	YES		NULL	
 PARAMETER_NAME	varchar(64)	YES		NULL	
-DATA_TYPE	varchar(64)	NO			
+DATA_TYPE	varchar(64)	NO		NULL	
 CHARACTER_MAXIMUM_LENGTH	int(21)	YES		NULL	
 CHARACTER_OCTET_LENGTH	int(21)	YES		NULL	
 NUMERIC_PRECISION	int(21)	YES		NULL	
@@ -392,8 +392,8 @@ NUMERIC_SCALE	int(21)	YES		NULL
 DATETIME_PRECISION	bigint(21) unsigned	YES		NULL	
 CHARACTER_SET_NAME	varchar(64)	YES		NULL	
 COLLATION_NAME	varchar(64)	YES		NULL	
-DTD_IDENTIFIER	longtext	NO			
-ROUTINE_TYPE	varchar(9)	NO			
+DTD_IDENTIFIER	longtext	NO		NULL	
+ROUTINE_TYPE	varchar(9)	NO		NULL	
 # ========== parameters.2 ==========
 DROP DATABASE IF EXISTS i_s_parameters_test;
 CREATE DATABASE i_s_parameters_test;
diff --git a/mysql-test/main/information_schema_routines.result b/mysql-test/main/information_schema_routines.result
index 9f1f1f16bcf..6f9b4c7e6aa 100644
--- a/mysql-test/main/information_schema_routines.result
+++ b/mysql-test/main/information_schema_routines.result
@@ -5,37 +5,37 @@ USE INFORMATION_SCHEMA;
 SHOW CREATE TABLE INFORMATION_SCHEMA.ROUTINES;
 Table	Create Table
 ROUTINES	CREATE TEMPORARY TABLE `ROUTINES` (
-  `SPECIFIC_NAME` varchar(64) NOT NULL DEFAULT '',
-  `ROUTINE_CATALOG` varchar(512) NOT NULL DEFAULT '',
-  `ROUTINE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `ROUTINE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `ROUTINE_TYPE` varchar(13) NOT NULL DEFAULT '',
-  `DATA_TYPE` varchar(64) NOT NULL DEFAULT '',
-  `CHARACTER_MAXIMUM_LENGTH` int(21) DEFAULT NULL,
-  `CHARACTER_OCTET_LENGTH` int(21) DEFAULT NULL,
-  `NUMERIC_PRECISION` int(21) DEFAULT NULL,
-  `NUMERIC_SCALE` int(21) DEFAULT NULL,
-  `DATETIME_PRECISION` bigint(21) unsigned DEFAULT NULL,
-  `CHARACTER_SET_NAME` varchar(64) DEFAULT NULL,
-  `COLLATION_NAME` varchar(64) DEFAULT NULL,
-  `DTD_IDENTIFIER` longtext DEFAULT NULL,
-  `ROUTINE_BODY` varchar(8) NOT NULL DEFAULT '',
-  `ROUTINE_DEFINITION` longtext DEFAULT NULL,
-  `EXTERNAL_NAME` varchar(64) DEFAULT NULL,
-  `EXTERNAL_LANGUAGE` varchar(64) DEFAULT NULL,
-  `PARAMETER_STYLE` varchar(8) NOT NULL DEFAULT '',
-  `IS_DETERMINISTIC` varchar(3) NOT NULL DEFAULT '',
-  `SQL_DATA_ACCESS` varchar(64) NOT NULL DEFAULT '',
-  `SQL_PATH` varchar(64) DEFAULT NULL,
-  `SECURITY_TYPE` varchar(7) NOT NULL DEFAULT '',
-  `CREATED` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `LAST_ALTERED` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `SQL_MODE` varchar(8192) NOT NULL DEFAULT '',
-  `ROUTINE_COMMENT` longtext NOT NULL DEFAULT '',
-  `DEFINER` varchar(384) NOT NULL DEFAULT '',
-  `CHARACTER_SET_CLIENT` varchar(32) NOT NULL DEFAULT '',
-  `COLLATION_CONNECTION` varchar(32) NOT NULL DEFAULT '',
-  `DATABASE_COLLATION` varchar(32) NOT NULL DEFAULT ''
+  `SPECIFIC_NAME` varchar(64) NOT NULL,
+  `ROUTINE_CATALOG` varchar(512) NOT NULL,
+  `ROUTINE_SCHEMA` varchar(64) NOT NULL,
+  `ROUTINE_NAME` varchar(64) NOT NULL,
+  `ROUTINE_TYPE` varchar(13) NOT NULL,
+  `DATA_TYPE` varchar(64) NOT NULL,
+  `CHARACTER_MAXIMUM_LENGTH` int(21),
+  `CHARACTER_OCTET_LENGTH` int(21),
+  `NUMERIC_PRECISION` int(21),
+  `NUMERIC_SCALE` int(21),
+  `DATETIME_PRECISION` bigint(21) unsigned,
+  `CHARACTER_SET_NAME` varchar(64),
+  `COLLATION_NAME` varchar(64),
+  `DTD_IDENTIFIER` longtext,
+  `ROUTINE_BODY` varchar(8) NOT NULL,
+  `ROUTINE_DEFINITION` longtext,
+  `EXTERNAL_NAME` varchar(64),
+  `EXTERNAL_LANGUAGE` varchar(64),
+  `PARAMETER_STYLE` varchar(8) NOT NULL,
+  `IS_DETERMINISTIC` varchar(3) NOT NULL,
+  `SQL_DATA_ACCESS` varchar(64) NOT NULL,
+  `SQL_PATH` varchar(64),
+  `SECURITY_TYPE` varchar(7) NOT NULL,
+  `CREATED` datetime NOT NULL,
+  `LAST_ALTERED` datetime NOT NULL,
+  `SQL_MODE` varchar(8192) NOT NULL,
+  `ROUTINE_COMMENT` longtext NOT NULL,
+  `DEFINER` varchar(384) NOT NULL,
+  `CHARACTER_SET_CLIENT` varchar(32) NOT NULL,
+  `COLLATION_CONNECTION` varchar(32) NOT NULL,
+  `DATABASE_COLLATION` varchar(32) NOT NULL
 )  DEFAULT CHARSET=utf8mb3
 SELECT * FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -46,7 +46,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 COLUMN_NAME	SPECIFIC_NAME
 ORDINAL_POSITION	1
-COLUMN_DEFAULT	''
+COLUMN_DEFAULT	NULL
 IS_NULLABLE	NO
 DATA_TYPE	varchar
 CHARACTER_MAXIMUM_LENGTH	64
@@ -68,7 +68,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 COLUMN_NAME	ROUTINE_CATALOG
 ORDINAL_POSITION	2
-COLUMN_DEFAULT	''
+COLUMN_DEFAULT	NULL
 IS_NULLABLE	NO
 DATA_TYPE	varchar
 CHARACTER_MAXIMUM_LENGTH	512
@@ -90,7 +90,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 COLUMN_NAME	ROUTINE_SCHEMA
 ORDINAL_POSITION	3
-COLUMN_DEFAULT	''
+COLUMN_DEFAULT	NULL
 IS_NULLABLE	NO
 DATA_TYPE	varchar
 CHARACTER_MAXIMUM_LENGTH	64
@@ -112,7 +112,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 COLUMN_NAME	ROUTINE_NAME
 ORDINAL_POSITION	4
-COLUMN_DEFAULT	''
+COLUMN_DEFAULT	NULL
 IS_NULLABLE	NO
 DATA_TYPE	varchar
 CHARACTER_MAXIMUM_LENGTH	64
@@ -134,7 +134,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 COLUMN_NAME	ROUTINE_TYPE
 ORDINAL_POSITION	5
-COLUMN_DEFAULT	''
+COLUMN_DEFAULT	NULL
 IS_NULLABLE	NO
 DATA_TYPE	varchar
 CHARACTER_MAXIMUM_LENGTH	13
@@ -156,7 +156,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 COLUMN_NAME	DATA_TYPE
 ORDINAL_POSITION	6
-COLUMN_DEFAULT	''
+COLUMN_DEFAULT	NULL
 IS_NULLABLE	NO
 DATA_TYPE	varchar
 CHARACTER_MAXIMUM_LENGTH	64
@@ -354,7 +354,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 COLUMN_NAME	ROUTINE_BODY
 ORDINAL_POSITION	15
-COLUMN_DEFAULT	''
+COLUMN_DEFAULT	NULL
 IS_NULLABLE	NO
 DATA_TYPE	varchar
 CHARACTER_MAXIMUM_LENGTH	8
@@ -442,7 +442,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 COLUMN_NAME	PARAMETER_STYLE
 ORDINAL_POSITION	19
-COLUMN_DEFAULT	''
+COLUMN_DEFAULT	NULL
 IS_NULLABLE	NO
 DATA_TYPE	varchar
 CHARACTER_MAXIMUM_LENGTH	8
@@ -464,7 +464,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 COLUMN_NAME	IS_DETERMINISTIC
 ORDINAL_POSITION	20
-COLUMN_DEFAULT	''
+COLUMN_DEFAULT	NULL
 IS_NULLABLE	NO
 DATA_TYPE	varchar
 CHARACTER_MAXIMUM_LENGTH	3
@@ -486,7 +486,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 COLUMN_NAME	SQL_DATA_ACCESS
 ORDINAL_POSITION	21
-COLUMN_DEFAULT	''
+COLUMN_DEFAULT	NULL
 IS_NULLABLE	NO
 DATA_TYPE	varchar
 CHARACTER_MAXIMUM_LENGTH	64
@@ -530,7 +530,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 COLUMN_NAME	SECURITY_TYPE
 ORDINAL_POSITION	23
-COLUMN_DEFAULT	''
+COLUMN_DEFAULT	NULL
 IS_NULLABLE	NO
 DATA_TYPE	varchar
 CHARACTER_MAXIMUM_LENGTH	7
@@ -552,7 +552,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 COLUMN_NAME	CREATED
 ORDINAL_POSITION	24
-COLUMN_DEFAULT	'0000-00-00 00:00:00'
+COLUMN_DEFAULT	NULL
 IS_NULLABLE	NO
 DATA_TYPE	datetime
 CHARACTER_MAXIMUM_LENGTH	NULL
@@ -574,7 +574,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 COLUMN_NAME	LAST_ALTERED
 ORDINAL_POSITION	25
-COLUMN_DEFAULT	'0000-00-00 00:00:00'
+COLUMN_DEFAULT	NULL
 IS_NULLABLE	NO
 DATA_TYPE	datetime
 CHARACTER_MAXIMUM_LENGTH	NULL
@@ -596,7 +596,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 COLUMN_NAME	SQL_MODE
 ORDINAL_POSITION	26
-COLUMN_DEFAULT	''
+COLUMN_DEFAULT	NULL
 IS_NULLABLE	NO
 DATA_TYPE	varchar
 CHARACTER_MAXIMUM_LENGTH	8192
@@ -618,7 +618,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 COLUMN_NAME	ROUTINE_COMMENT
 ORDINAL_POSITION	27
-COLUMN_DEFAULT	''
+COLUMN_DEFAULT	NULL
 IS_NULLABLE	NO
 DATA_TYPE	longtext
 CHARACTER_MAXIMUM_LENGTH	4294967295
@@ -640,7 +640,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 COLUMN_NAME	DEFINER
 ORDINAL_POSITION	28
-COLUMN_DEFAULT	''
+COLUMN_DEFAULT	NULL
 IS_NULLABLE	NO
 DATA_TYPE	varchar
 CHARACTER_MAXIMUM_LENGTH	384
@@ -662,7 +662,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 COLUMN_NAME	CHARACTER_SET_CLIENT
 ORDINAL_POSITION	29
-COLUMN_DEFAULT	''
+COLUMN_DEFAULT	NULL
 IS_NULLABLE	NO
 DATA_TYPE	varchar
 CHARACTER_MAXIMUM_LENGTH	32
@@ -684,7 +684,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 COLUMN_NAME	COLLATION_CONNECTION
 ORDINAL_POSITION	30
-COLUMN_DEFAULT	''
+COLUMN_DEFAULT	NULL
 IS_NULLABLE	NO
 DATA_TYPE	varchar
 CHARACTER_MAXIMUM_LENGTH	32
@@ -706,7 +706,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 COLUMN_NAME	DATABASE_COLLATION
 ORDINAL_POSITION	31
-COLUMN_DEFAULT	''
+COLUMN_DEFAULT	NULL
 IS_NULLABLE	NO
 DATA_TYPE	varchar
 CHARACTER_MAXIMUM_LENGTH	32
@@ -725,12 +725,12 @@ IS_GENERATED	NEVER
 GENERATION_EXPRESSION	NULL
 DESCRIBE INFORMATION_SCHEMA.ROUTINES;
 Field	Type	Null	Key	Default	Extra
-SPECIFIC_NAME	varchar(64)	NO			
-ROUTINE_CATALOG	varchar(512)	NO			
-ROUTINE_SCHEMA	varchar(64)	NO			
-ROUTINE_NAME	varchar(64)	NO			
-ROUTINE_TYPE	varchar(13)	NO			
-DATA_TYPE	varchar(64)	NO			
+SPECIFIC_NAME	varchar(64)	NO		NULL	
+ROUTINE_CATALOG	varchar(512)	NO		NULL	
+ROUTINE_SCHEMA	varchar(64)	NO		NULL	
+ROUTINE_NAME	varchar(64)	NO		NULL	
+ROUTINE_TYPE	varchar(13)	NO		NULL	
+DATA_TYPE	varchar(64)	NO		NULL	
 CHARACTER_MAXIMUM_LENGTH	int(21)	YES		NULL	
 CHARACTER_OCTET_LENGTH	int(21)	YES		NULL	
 NUMERIC_PRECISION	int(21)	YES		NULL	
@@ -739,23 +739,23 @@ DATETIME_PRECISION	bigint(21) unsigned	YES		NULL
 CHARACTER_SET_NAME	varchar(64)	YES		NULL	
 COLLATION_NAME	varchar(64)	YES		NULL	
 DTD_IDENTIFIER	longtext	YES		NULL	
-ROUTINE_BODY	varchar(8)	NO			
+ROUTINE_BODY	varchar(8)	NO		NULL	
 ROUTINE_DEFINITION	longtext	YES		NULL	
 EXTERNAL_NAME	varchar(64)	YES		NULL	
 EXTERNAL_LANGUAGE	varchar(64)	YES		NULL	
-PARAMETER_STYLE	varchar(8)	NO			
-IS_DETERMINISTIC	varchar(3)	NO			
-SQL_DATA_ACCESS	varchar(64)	NO			
+PARAMETER_STYLE	varchar(8)	NO		NULL	
+IS_DETERMINISTIC	varchar(3)	NO		NULL	
+SQL_DATA_ACCESS	varchar(64)	NO		NULL	
 SQL_PATH	varchar(64)	YES		NULL	
-SECURITY_TYPE	varchar(7)	NO			
-CREATED	datetime	NO		0000-00-00 00:00:00	
-LAST_ALTERED	datetime	NO		0000-00-00 00:00:00	
-SQL_MODE	varchar(8192)	NO			
-ROUTINE_COMMENT	longtext	NO			
-DEFINER	varchar(384)	NO			
-CHARACTER_SET_CLIENT	varchar(32)	NO			
-COLLATION_CONNECTION	varchar(32)	NO			
-DATABASE_COLLATION	varchar(32)	NO			
+SECURITY_TYPE	varchar(7)	NO		NULL	
+CREATED	datetime	NO		NULL	
+LAST_ALTERED	datetime	NO		NULL	
+SQL_MODE	varchar(8192)	NO		NULL	
+ROUTINE_COMMENT	longtext	NO		NULL	
+DEFINER	varchar(384)	NO		NULL	
+CHARACTER_SET_CLIENT	varchar(32)	NO		NULL	
+COLLATION_CONNECTION	varchar(32)	NO		NULL	
+DATABASE_COLLATION	varchar(32)	NO		NULL	
 # ========== routines.2 ==========
 DROP DATABASE IF EXISTS i_s_routines_test;
 CREATE DATABASE i_s_routines_test;
diff --git a/mysql-test/main/insert_select.result b/mysql-test/main/insert_select.result
index 5094638c92b..e85c4982137 100644
--- a/mysql-test/main/insert_select.result
+++ b/mysql-test/main/insert_select.result
@@ -865,3 +865,22 @@ t2	CREATE TABLE `t2` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1, t2;
 End of 5.5 tests
+#
+# Beginning of 10.2 test
+#
+# MDEV-26698: Incorrect row number upon INSERT .. SELECT from the same
+#             table: rows are counted twice
+#
+CREATE TABLE t1(a TINYINT);
+INSERT INTO t1 VALUES (1), (100);
+INSERT INTO t1 SELECT a*2 FROM t1;
+Warnings:
+Warning	1264	Out of range value for column 'a' at row 2
+TRUNCATE TABLE t1;
+# using ORDER BY
+INSERT INTO t1 VALUES(1), (2), (100), (3);
+INSERT INTO t1 SELECT a*2 FROM t1 ORDER BY a;
+Warnings:
+Warning	1264	Out of range value for column 'a' at row 4
+DROP TABLE t1;
+# End of 10.2 test
diff --git a/mysql-test/main/insert_select.test b/mysql-test/main/insert_select.test
index 0b5cdf95daf..91b2cc6f981 100644
--- a/mysql-test/main/insert_select.test
+++ b/mysql-test/main/insert_select.test
@@ -435,3 +435,28 @@ show create table t2;
 drop table t1, t2;
 
 --echo End of 5.5 tests
+
+--echo #
+--echo # Beginning of 10.2 test
+--echo #
+--echo # MDEV-26698: Incorrect row number upon INSERT .. SELECT from the same
+--echo #             table: rows are counted twice
+--echo #
+
+CREATE TABLE t1(a TINYINT);
+
+INSERT INTO t1 VALUES (1), (100);
+
+INSERT INTO t1 SELECT a*2 FROM t1;
+
+TRUNCATE TABLE t1;
+
+--echo # using ORDER BY
+
+INSERT INTO t1 VALUES(1), (2), (100), (3);
+
+INSERT INTO t1 SELECT a*2 FROM t1 ORDER BY a;
+
+DROP TABLE t1;
+
+--echo # End of 10.2 test
diff --git a/mysql-test/main/mdev-25830.result b/mysql-test/main/mdev-25830.result
new file mode 100644
index 00000000000..e62d1ff3f55
--- /dev/null
+++ b/mysql-test/main/mdev-25830.result
@@ -0,0 +1,56 @@
+SET SESSION DEFAULT_STORAGE_ENGINE='InnoDB';
+set @innodb_stats_persistent_save= @@innodb_stats_persistent;
+set @innodb_stats_persistent_sample_pages_save=
+@@innodb_stats_persistent_sample_pages;
+set global innodb_stats_persistent= 1;
+set global innodb_stats_persistent_sample_pages=100;
+set optimizer_use_condition_selectivity=1;
+analyze SELECT sysapproval_approver0.`sys_id`
+FROM   ((sysapproval_approver sysapproval_approver0
+INNER JOIN task task1
+ON sysapproval_approver0.`sysapproval` = task1.`sys_id`
+                    AND (( task1.`sys_domain_path` = '/'
+                            OR task1.`sys_domain_path` LIKE '!!!/!!#/!!$/%'
+                            OR task1.`sys_domain_path` LIKE '!!!/!!!/%' )))
+INNER JOIN task task2
+ON task1.`parent` = task2.`sys_id`
+                   AND (( task2.`sys_domain_path` = '/'
+                           OR task2.`sys_domain_path` LIKE '!!!/!!#/!!$/%'
+                           OR task2.`sys_domain_path` LIKE '!!!/!!!/%' )))
+WHERE  task2.`sys_id` LIKE '8e7792a7dbfffb00fff8a345ca961934%'
+       AND ( sysapproval_approver0.`sys_domain_path` = '/'
+              OR sysapproval_approver0.`sys_domain_path` LIKE '!!!/!!#/!!$/%'
+              OR sysapproval_approver0.`sys_domain_path` LIKE '!!!/!!!/%' )
+ORDER  BY sysapproval_approver0.`order`
+LIMIT  0, 50 ;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	r_rows	filtered	r_filtered	Extra
+1	SIMPLE	task2	range	PRIMARY,sys_class_name_2,sys_domain_path	PRIMARY	96	NULL	1	0.00	100.00	100.00	Using where; Using temporary; Using filesort
+1	SIMPLE	task1	ref	PRIMARY,task_parent,sys_class_name_2,sys_domain_path	task_parent	99	test.task2.sys_id	1	NULL	100.00	NULL	Using index condition; Using where
+1	SIMPLE	sysapproval_approver0	ref	sysapproval_approver_ref5,sys_domain_path,sysapproval_approver_CHG1975376	sysapproval_approver_ref5	99	test.task1.sys_id	1	NULL	100.00	NULL	Using index condition; Using where
+set optimizer_use_condition_selectivity=4;
+analyze SELECT sysapproval_approver0.`sys_id`
+FROM   ((sysapproval_approver sysapproval_approver0
+INNER JOIN task task1
+ON sysapproval_approver0.`sysapproval` = task1.`sys_id`
+                    AND (( task1.`sys_domain_path` = '/'
+                            OR task1.`sys_domain_path` LIKE '!!!/!!#/!!$/%'
+                            OR task1.`sys_domain_path` LIKE '!!!/!!!/%' )))
+INNER JOIN task task2
+ON task1.`parent` = task2.`sys_id`
+                   AND (( task2.`sys_domain_path` = '/'
+                           OR task2.`sys_domain_path` LIKE '!!!/!!#/!!$/%'
+                           OR task2.`sys_domain_path` LIKE '!!!/!!!/%' )))
+WHERE  task2.`sys_id` LIKE '8e7792a7dbfffb00fff8a345ca961934%'
+       AND ( sysapproval_approver0.`sys_domain_path` = '/'
+              OR sysapproval_approver0.`sys_domain_path` LIKE '!!!/!!#/!!$/%'
+              OR sysapproval_approver0.`sys_domain_path` LIKE '!!!/!!!/%' )
+ORDER  BY sysapproval_approver0.`order`
+LIMIT  0, 50 ;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	r_rows	filtered	r_filtered	Extra
+1	SIMPLE	task2	range	PRIMARY,sys_class_name_2,sys_domain_path	PRIMARY	96	NULL	1	0.00	98.00	100.00	Using where; Using temporary; Using filesort
+1	SIMPLE	task1	ref	PRIMARY,task_parent,sys_class_name_2,sys_domain_path	task_parent	99	test.task2.sys_id	1	NULL	100.00	NULL	Using index condition; Using where
+1	SIMPLE	sysapproval_approver0	ref	sysapproval_approver_ref5,sys_domain_path,sysapproval_approver_CHG1975376	sysapproval_approver_ref5	99	test.task1.sys_id	1	NULL	100.00	NULL	Using index condition; Using where
+drop table sysapproval_approver,task;
+set global innodb_stats_persistent= @innodb_stats_persistent_save;
+set global innodb_stats_persistent_sample_pages=
+@innodb_stats_persistent_sample_pages_save;
diff --git a/mysql-test/main/mdev-25830.test b/mysql-test/main/mdev-25830.test
new file mode 100644
index 00000000000..5521d1fad85
--- /dev/null
+++ b/mysql-test/main/mdev-25830.test
@@ -0,0 +1,104 @@
+#
+# MDEV-25830: optimizer_use_condition_selectivity=4 sometimes produces worse plan than optimizer_use_condition_selectivity=1
+# https://jira.mariadb.org/browse/MDEV-25830
+#
+--source include/innodb_prefix_index_cluster_optimization.inc
+
+SET SESSION DEFAULT_STORAGE_ENGINE='InnoDB';
+
+set @innodb_stats_persistent_save= @@innodb_stats_persistent;
+set @innodb_stats_persistent_sample_pages_save=
+      @@innodb_stats_persistent_sample_pages;
+
+set global innodb_stats_persistent= 1;
+set global innodb_stats_persistent_sample_pages=100;
+
+--disable_query_log
+--disable_result_log
+--disable_warnings
+
+DROP TABLE IF EXISTS `sysapproval_approver`;
+CREATE TABLE `sysapproval_approver` (
+  `order` int(11) DEFAULT NULL,
+  `sysapproval` varchar(32) DEFAULT NULL,
+  `sys_id` char(32) NOT NULL DEFAULT '',
+  `sys_domain_path` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`sys_id`),
+  KEY `sysapproval_approver_ref5` (`sysapproval`),
+  KEY `sys_domain_path` (`sys_domain_path`),
+  KEY `sysapproval_approver_CHG1975376` (`sys_domain_path`,`sysapproval`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+INSERT INTO `sysapproval_approver` VALUES (NULL,'c00004d787a8a5003fff83bdff434dea','000004d787a8a5003fff83bdff434dee','!!!/!!#/!!$/'),(NULL,NULL,'00000741db8bfb480be6a345ca96198e','!!!/!!#/!!$/'),(NULL,NULL,'00001605dbce48d0f7fca851ca961967','!!!/!!#/!!$/'),(NULL,'23b53105db2f324c5a4af85e0f96194e','000016c1db6ffa445d2f7aa31f9619a0','!!!/!!#/!!$/'),(NULL,NULL,'00001730dbe24890f7fca851ca9619aa','!!!/!!#/!!$/'),(NULL,NULL,'000017a01b127b00ada243f6fe4bcb8c','!!!/!!#/!!$/'),(NULL,'7f660139db6088185ed4a851ca961986','00001ab1dbecc8185ed4a851ca961970','!!!/!!#/!!$/'),(NULL,'6226cd801b19dc10a59033f2cd4bcb22','00001d84db9918505ed4a851ca96193f','!!!/!!!/(8]/'),(NULL,NULL,'00002246db83874002f17c541f961999','!!!/!!#/!!$/'),(NULL,NULL,'000026e01b9eb700ada243f6fe4bcbc5','!!!/!!#/!!$/'),(NULL,NULL,'000028e16f064e807b658e4c2c3ee4ae','!!!/!!#/!!$/'),(NULL,NULL,'00002914dba8670c54250b55ca961928','!!!/!!#/!!$/'),(NULL,NULL,'00002914dba8670c54250b55ca961931','!!!/!!#/!!$/'),(NULL,NULL,'00002914dba8670c54250b55ca96193a','!!!/!!#/!!$/'),(NULL,NULL,'00002914dba8670c54250b55ca961943','!!!/!!#/!!$/'),(NULL,NULL,'000030a4dbb90b40002af47e0f9619b1','!!!/!!#/!!$/'),(NULL,NULL,'000033fedb41fb041cd8a345ca9619fa','!!!/!!#/!!$/'),(NULL,NULL,'0000341ddb4ce3804ac3a851ca961916','!!!/!!#/!!$/'),(NULL,NULL,'0000393ddb709b002b6dfb651f961908','!!!/!!#/!!$/'),(NULL,'a81ca740db5cdc9416d2a345ca9619b3','00003b00dbdcdc9416d2a345ca961907','!!!/!!#/!!$/'),(NULL,'04003c88db5e3304d6a102d5ca961913','00003c88db5e3304d6a102d5ca96192a','!!!/!!#/!!$/'),(NULL,'4affb00cdbbf0f800e3dfb651f9619a0','0000450cdbbf0f800e3dfb651f961973','!!!/!!#/!!$/'),(NULL,NULL,'00005634dbd11fc4e9737a9e0f961988','!!!/!!#/!!$/'),(NULL,NULL,'00005634dbd11fc4e9737a9e0f9619ce','!!!/!!#/!!$/'),(NULL,NULL,'00005634dbd11fc4e9737a9e0f9619d7','!!!/!!#/!!$/'),(NULL,NULL,'00005784dbc49b00852c7a9e0f96198a','!!!/!!#/!!$/'),(NULL,NULL,'00005bc1dbcdd7042d1efb651f961978','!!!/!!#/!!$/'),(NULL,NULL,'0000637b6f37c24013568e4c2c3ee4d6','!!!/!!#/!!$/'),(NULL,'080069db0f858240a2c9982be1050eae','000069db0f858240a2c9982be1050eb2','!!!/!!#/!!$/'),(NULL,'f98e3bb21b155c10a59033f2cd4bcbef','00006c47db5d9010d82ffb24399619d8','!!!/!!!/#YZ/'),(NULL,NULL,'00006c50db6a0450d58ea345ca961972','!!!/!!#/!!$/'),(NULL,NULL,'00006e38dbc19304032a7a9e0f9619e4','!!!/!!#/!!$/'),(NULL,NULL,'00006edddbec8c5813b5fb24399619b9','!!!/!!#/!!$/'),(NULL,NULL,'000073fedb41fb041cd8a345ca961934','!!!/!!#/!!$/'),(NULL,NULL,'000073fedb41fb041cd8a345ca96195c','!!!/!!#/!!$/'),(NULL,'d03c6ee61b774410a59033f2cd4bcbf5','000076bfdbb74c981cd8a345ca9619ee','!!!/!!!/!;B/'),(NULL,NULL,'000076ecdbde48502be0a851ca9619dd','!!!/!!#/!!$/'),(NULL,NULL,'000076ecdbde48502be0a851ca9619fe','!!!/!!#/!!$/'),(NULL,NULL,'0000778d6fd01a4000270bae9f3ee4ff','!!!/!!#/!!$/'),(NULL,NULL,'000077c21b3fbb0cada243f6fe4bcba7','!!!/!!#/!!$/'),(NULL,NULL,'000077c21b3fbb0cada243f6fe4bcbcb','!!!/!!#/!!$/'),(NULL,'f6c5f2110f75de401c7e938172050e1b','000077e10f7d5e00e59b982be1050e62','!!!/!!#/!!$/'),(NULL,NULL,'00007fa76ff70a0000270bae9f3ee4b1','!!!/!!#/!!$/'),(NULL,'73ff6fe76f4761007ceff7307f3ee478','00007fe76f4761007ceff7307f3ee47c','!!!/!!#/!!$/'),(NULL,'a4d63f4bdb8fbf00414ed0c5ca96191d','0000881b1b8f7f00fff162c4bd4bcbe7','!!!/!!!/$)(/'),(NULL,'a4d63f4bdb8fbf00414ed0c5ca96191d','0000881b1b8f7f00fff162c4bd4bcbec','!!!/!!!/$)(/'),(NULL,NULL,'000094eb6f781a0099c5409e9f3ee48e','!!!/!!#/!!$/'),(NULL,NULL,'000094eb6f781a0099c5409e9f3ee493','!!!/!!#/!!$/'),(NULL,'401fb78cdb18d8dc1cd8a345ca9619c8','00009c10dbdc98dcfeb1a851ca96192f','!!!/!!!/$$8/'),(NULL,'9dd30a24db5c1cdc23f4a345ca96192b','00009e2cdb1c589c4819fb243996195c','!!!/!!#/!!$/');
+
+DROP TABLE IF EXISTS `task`;
+CREATE TABLE `task` (
+  `parent` varchar(32) DEFAULT NULL,
+  `sys_id` char(32) NOT NULL DEFAULT '',
+  `sys_domain_path` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`sys_id`),
+  KEY `task_parent` (`parent`),
+  KEY `sys_class_name_2` (`sys_domain_path`),
+  KEY `sys_domain_path` (`sys_domain_path`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+INSERT INTO `task` VALUES (NULL,'-1','!!!/!!#/!!$/'),(NULL,'00000195dbe7f30413b5fb2439961936','!!!/!!#/!!$/'),(NULL,'0000032edb160f04d7e37aa31f961964','!!!/!!#/!!$/'),('a6fe0637dbddfb8c1cd8a345ca96196f','000003dcdb31f3c0a39a0b55ca961916','!!!/!!#/!!$/'),('2f1df65d6fca3100e7f68e4c2c3ee4e6','000004466f127d40e7f68e4c2c3ee4ce','!!!/!!#/!!$/'),('50dfb42edbbdd3403eb27a9e0f96199e','0000056edbbdd3403eb27a9e0f961995','!!!/!!!/+0{/'),('5f5af922dbb804d03bf6a851ca961999','000006eedb7c04d03bf6a851ca96190c','!!!/!!!/$9;/'),(NULL,'00000904db1dd45014d6fb24399619b7','!!!/!!#/!!$/'),('33c6e522db2c10104ac3a851ca9619f3','00000a06dbf0181416d2a345ca96197b','!!!/!!#/!!$/'),(NULL,'00000ccd6f9196041501f7307f3ee406','!!!/!!#/!!$/'),(NULL,'00000ee2dbb9bf4014d6fb24399619a7','!!!/!!#/!!$/'),(NULL,'00000f065bba40000a4de1945e425441','!!!/!!#/!!$/'),(NULL,'000013dedbc0bf00bbc40b55ca961959','!!!/!!!/,*7/'),(NULL,'000016bcdb29009cf7fca851ca961927','!!!/!!#/!!$/'),(NULL,'0000171bdbdb770066e0a345ca96195a','!!!/!!!/+N?/'),('8eb9317f1b895450d01143f6fe4bcb26','00001c80db5d509022e0fb24399619ed','!!!/!!!/0RG/'),(NULL,'00001d84dbf6f2405a4af85e0f9619f9','!!!/!!#/!!$/'),(NULL,'00001e31db25d4105ed4a851ca96195c','!!!/!!#/!!$/'),(NULL,'00001ea3db73c89823f4a345ca9619b5','!!!/!!#/!!$/'),('c3baf3fadb234c54d82ffb24399619e0','00001f4fdbab4c542be0a851ca96190c','!!!/!!#/!!$/'),(NULL,'0000221bdbb4b3c466e0a345ca9619f0','!!!/!!!/$^{/'),(NULL,'000022bcdb9c04d022e0fb24399619e1','!!!/!!#/!!$/'),('9b7152434f995a80f347524e0210c7e0','0000234b6f59de00fbd4409e9f3ee446','/'),('c64ed870145461009a1c80cd6740d192','00002434145461009a1c80cd6740d1e5','!!!/!!#/!!$/'),(NULL,'0000247edb84d7040e3dfb651f9619b2','!!!/!!#/!!$/'),(NULL,'000025f8dbb6ba007fc27c541f96195b','!!!/!!#/!!$/'),('9b691033485d95c0c5abf6bd15eef576','0000287348dd95c0c5abf6bd15eef572','!!!/!!#/!!$/'),('3c4f591edb7ce2406015f47e0f96191b','00002952dbbce2406015f47e0f961999','!!!/!!!/#MU/'),(NULL,'000029b0db6d5c104819fb24399619a8','!!!/!!#/!!$/'),(NULL,'00002a3d1b5f0010a59033f2cd4bcb90','!!!/!!!/&<#/'),(NULL,'00002a9fdb5787840e3dfb651f9619a6','!!!/!!#/!!$/'),(NULL,'00002c5adb5a0fc0d7e37aa31f9619ba','!!!/!!#/!!$/'),('fa753886dbd8181014d6fb2439961989','00002d5edbdc949466e0a345ca9619e4','!!!/!!!/$44/'),('56ff56bfdb469c503fa35583ca961987','00002e73db0a9c50364a5583ca961922','!!!/!!#/!!$/'),(NULL,'000031f6dba76b40c9c302d5ca9619c4','!!!/!!#/!!$/'),(NULL,'000036fadb1a0344d7e37aa31f96196d','!!!/!!#/!!$/'),(NULL,'000036ffdb046744d58ea345ca961937','!!!/!!#/!!$/'),(NULL,'000037c2dbaae700fb115583ca961926','!!!/!!#/!!$/'),(NULL,'000038eedbe32380b1b102d5ca9619c9','!!!/!!!/#2J/'),(NULL,'00003925dbb1c300225d7aa31f961993','!!!/!!#/!!$/'),('58c865acdb2944184ac3a851ca961901','0000392cdbe944184ac3a851ca9619ea','!!!/!!!/(*S/'),(NULL,'00003966db307a800e58fb651f9619a7','!!!/!!!/&C[/'),('bdeae17bdbfed3045ed4a851ca961933','0000397bdbb217045ed4a851ca96192e','!!!/!!#/!!$/'),('1b951202dbbe7b8014d6fb2439961926','00003a02db767f80fec4fb243996198f','!!!/!!!/#*L/'),(NULL,'00003e5bdbe33b8416d2a345ca961919','!!!/!!#/!!$/'),(NULL,'00003eef1b0a4410fff162c4bd4bcb0e','!!!/!!#/!!$/'),(NULL,'000040b6dbcfcb000e58fb651f9619d2','!!!/!!#/!!$/'),(NULL,'000040e5db0a185011762183ca9619c5','!!!/!!#/!!$/'),('101abff70ff99200a2c9982be1050ee7','000044c86f4a120000270bae9f3ee475','/'),('15d6f3c8dbb3ab0023f4a345ca9619ee','000045f2db5f2700f2eb02d5ca9619c6','!!!/!!!/#*./');
+
+ANALYZE TABLE sysapproval_approver PERSISTENT FOR COLUMNS() INDEXES();
+ANALYZE TABLE task PERSISTENT FOR COLUMNS() INDEXES();
+
+--enable_warnings
+--enable_result_log
+--enable_query_log
+
+# The following explain is left here from the original bug report.
+# Can be useful if one gets this issue again in a future MariaDB version
+
+#explain format= json SELECT sysapproval_approver0.`sys_id` FROM ((sysapproval_approver sysapproval_approver0 INNER JOIN task task1 ON sysapproval_approver0.`sysapproval` = task1.`sys_id` AND ((task1.`sys_domain_path` = '/' OR task1.`sys_domain_path` LIKE '!!!/!!#/!!$/%' OR task1.`sys_domain_path` LIKE '!!!/!!!/%'))) INNER JOIN task task2 ON task1.`parent` = task2.`sys_id` AND ((task2.`sys_domain_path` = '/' OR task2.`sys_domain_path` LIKE '!!!/!!#/!!$/%' OR task2.`sys_domain_path` LIKE '!!!/!!!/%'))) WHERE task2.`sys_id` LIKE '8e7792a7dbfffb00fff8a345ca961934%' AND (sysapproval_approver0.`sys_domain_path` = '/' OR sysapproval_approver0.`sys_domain_path` LIKE '!!!/!!#/!!$/%' OR sysapproval_approver0.`sys_domain_path` LIKE '!!!/!!!/%') ORDER BY sysapproval_approver0.`order` LIMIT 0, 50;
+
+
+set optimizer_use_condition_selectivity=1;
+analyze SELECT sysapproval_approver0.`sys_id`
+FROM   ((sysapproval_approver sysapproval_approver0
+         INNER JOIN task task1
+                 ON sysapproval_approver0.`sysapproval` = task1.`sys_id`
+                    AND (( task1.`sys_domain_path` = '/'
+                            OR task1.`sys_domain_path` LIKE '!!!/!!#/!!$/%'
+                            OR task1.`sys_domain_path` LIKE '!!!/!!!/%' )))
+        INNER JOIN task task2
+                ON task1.`parent` = task2.`sys_id`
+                   AND (( task2.`sys_domain_path` = '/'
+                           OR task2.`sys_domain_path` LIKE '!!!/!!#/!!$/%'
+                           OR task2.`sys_domain_path` LIKE '!!!/!!!/%' )))
+WHERE  task2.`sys_id` LIKE '8e7792a7dbfffb00fff8a345ca961934%'
+       AND ( sysapproval_approver0.`sys_domain_path` = '/'
+              OR sysapproval_approver0.`sys_domain_path` LIKE '!!!/!!#/!!$/%'
+              OR sysapproval_approver0.`sys_domain_path` LIKE '!!!/!!!/%' )
+ORDER  BY sysapproval_approver0.`order`
+LIMIT  0, 50 ;
+
+set optimizer_use_condition_selectivity=4;
+analyze SELECT sysapproval_approver0.`sys_id`
+FROM   ((sysapproval_approver sysapproval_approver0
+         INNER JOIN task task1
+                 ON sysapproval_approver0.`sysapproval` = task1.`sys_id`
+                    AND (( task1.`sys_domain_path` = '/'
+                            OR task1.`sys_domain_path` LIKE '!!!/!!#/!!$/%'
+                            OR task1.`sys_domain_path` LIKE '!!!/!!!/%' )))
+        INNER JOIN task task2
+                ON task1.`parent` = task2.`sys_id`
+                   AND (( task2.`sys_domain_path` = '/'
+                           OR task2.`sys_domain_path` LIKE '!!!/!!#/!!$/%'
+                           OR task2.`sys_domain_path` LIKE '!!!/!!!/%' )))
+WHERE  task2.`sys_id` LIKE '8e7792a7dbfffb00fff8a345ca961934%'
+       AND ( sysapproval_approver0.`sys_domain_path` = '/'
+              OR sysapproval_approver0.`sys_domain_path` LIKE '!!!/!!#/!!$/%'
+              OR sysapproval_approver0.`sys_domain_path` LIKE '!!!/!!!/%' )
+ORDER  BY sysapproval_approver0.`order`
+LIMIT  0, 50 ;
+
+drop table sysapproval_approver,task;
+
+set global innodb_stats_persistent= @innodb_stats_persistent_save;
+set global innodb_stats_persistent_sample_pages=
+             @innodb_stats_persistent_sample_pages_save;
diff --git a/mysql-test/main/mysql_client_test-master.opt b/mysql-test/main/mysql_client_test-master.opt
index 8d49abf6a10..e3d42121b45 100644
--- a/mysql-test/main/mysql_client_test-master.opt
+++ b/mysql-test/main/mysql_client_test-master.opt
@@ -3,3 +3,4 @@
 --log-output=FILE,TABLE
 --max-allowed-packet=32000000
 --proxy-protocol-networks=*
+--sequence=on
diff --git a/mysql-test/main/mysql_client_test_comp-master.opt b/mysql-test/main/mysql_client_test_comp-master.opt
index 6c4a5e4c782..ccaa4a8ee6e 100644
--- a/mysql-test/main/mysql_client_test_comp-master.opt
+++ b/mysql-test/main/mysql_client_test_comp-master.opt
@@ -1,3 +1,4 @@
 --loose-enable-performance-schema
 --max-allowed-packet=32000000
 --proxy-protocol-networks=::1/32,127.0.0.0/8,localhost
+--sequence=on
diff --git a/mysql-test/main/mysql_client_test_nonblock-master.opt b/mysql-test/main/mysql_client_test_nonblock-master.opt
index a39d0089562..f306d27feac 100644
--- a/mysql-test/main/mysql_client_test_nonblock-master.opt
+++ b/mysql-test/main/mysql_client_test_nonblock-master.opt
@@ -1,3 +1,4 @@
 --general-log --general-log-file=$MYSQLTEST_VARDIR/log/master.log --log-output=FILE,TABLE
 --max-allowed-packet=32000000
 --proxy-protocol-networks=::1,::ffff:127.0.0.1/97,localhost
+--sequence=on
diff --git a/mysql-test/main/mysql_tzinfo_to_sql_symlink.result b/mysql-test/main/mysql_tzinfo_to_sql_symlink.result
index f4694cbedae..568a280158a 100644
--- a/mysql-test/main/mysql_tzinfo_to_sql_symlink.result
+++ b/mysql-test/main/mysql_tzinfo_to_sql_symlink.result
@@ -1,3 +1,14 @@
+use mysql;
+RENAME TABLE time_zone TO time_zone_orig,
+time_zone_name TO time_zone_name_orig,
+time_zone_transition TO time_zone_transition_orig,
+time_zone_transition_type TO time_zone_transition_type_orig,
+time_zone_leap_second TO time_zone_leap_second_orig;
+CREATE TABLE time_zone LIKE time_zone_orig;
+CREATE TABLE time_zone_name LIKE time_zone_name_orig;
+CREATE TABLE time_zone_transition LIKE time_zone_transition_orig;
+CREATE TABLE time_zone_transition_type LIKE time_zone_transition_type_orig;
+CREATE TABLE time_zone_leap_second LIKE time_zone_leap_second_orig;
 #
 # MDEV-5226 mysql_tzinfo_to_sql errors with tzdata 2013f and above
 #
@@ -9,13 +20,18 @@ ALTER TABLE time_zone ENGINE=InnoDB;
 ALTER TABLE time_zone_name ENGINE=InnoDB;
 ALTER TABLE time_zone_transition ENGINE=InnoDB;
 ALTER TABLE time_zone_transition_type ENGINE=InnoDB;
-END IF|
-\d ;
 TRUNCATE TABLE time_zone;
 TRUNCATE TABLE time_zone_name;
 TRUNCATE TABLE time_zone_transition;
 TRUNCATE TABLE time_zone_transition_type;
 START TRANSACTION;
+ELSE
+TRUNCATE TABLE time_zone;
+TRUNCATE TABLE time_zone_name;
+TRUNCATE TABLE time_zone_transition;
+TRUNCATE TABLE time_zone_transition_type;
+END IF|
+\d ;
 INSERT INTO time_zone (Use_leap_seconds) VALUES ('N');
 SET @time_zone_id= LAST_INSERT_ID();
 INSERT INTO time_zone_name (Name, Time_zone_id) VALUES ('GMT', @time_zone_id);
@@ -33,6 +49,7 @@ INSERT INTO time_zone_transition_type (Time_zone_id, Transition_type_id, `Offset
 Warning: Unable to load 'MYSQLTEST_VARDIR/zoneinfo/posix/garbage' as time zone. Skipping it.
 Warning: Unable to load 'MYSQLTEST_VARDIR/zoneinfo/posix/ignored.tab' as time zone. Skipping it.
 Warning: Skipping directory 'MYSQLTEST_VARDIR/zoneinfo/posix/posix': to avoid infinite symlink recursion.
+UNLOCK TABLES;
 COMMIT;
 ALTER TABLE time_zone_transition ORDER BY Time_zone_id, Transition_time;
 ALTER TABLE time_zone_transition_type ORDER BY Time_zone_id, Transition_type_id;
@@ -41,11 +58,26 @@ IF (select count(*) from information_schema.global_variables where
 variable_name='wsrep_on' and variable_value='ON') = 1 THEN
 ALTER TABLE time_zone ENGINE=Aria;
 ALTER TABLE time_zone_name ENGINE=Aria;
-ALTER TABLE time_zone_transition ENGINE=Aria;
-ALTER TABLE time_zone_transition_type ENGINE=Aria;
+ALTER TABLE time_zone_transition ENGINE=Aria, ORDER BY Time_zone_id, Transition_time;
+ALTER TABLE time_zone_transition_type ENGINE=Aria, ORDER BY Time_zone_id, Transition_type_id;
 END IF|
 \d ;
-# Silent run
+SELECT COUNT(*) FROM time_zone;
+COUNT(*)
+0
+SELECT COUNT(*) FROM time_zone_name;
+COUNT(*)
+0
+SELECT COUNT(*) FROM time_zone_transition;
+COUNT(*)
+0
+SELECT COUNT(*) FROM time_zone_transition_type;
+COUNT(*)
+0
+SELECT COUNT(*) FROM time_zone_leap_second;
+COUNT(*)
+0
+# Run on zoneinfo directory
 \d |
 IF (select count(*) from information_schema.global_variables where
 variable_name='wsrep_on' and variable_value='ON') = 1 THEN
@@ -53,13 +85,18 @@ ALTER TABLE time_zone ENGINE=InnoDB;
 ALTER TABLE time_zone_name ENGINE=InnoDB;
 ALTER TABLE time_zone_transition ENGINE=InnoDB;
 ALTER TABLE time_zone_transition_type ENGINE=InnoDB;
-END IF|
-\d ;
 TRUNCATE TABLE time_zone;
 TRUNCATE TABLE time_zone_name;
 TRUNCATE TABLE time_zone_transition;
 TRUNCATE TABLE time_zone_transition_type;
 START TRANSACTION;
+ELSE
+TRUNCATE TABLE time_zone;
+TRUNCATE TABLE time_zone_name;
+TRUNCATE TABLE time_zone_transition;
+TRUNCATE TABLE time_zone_transition_type;
+END IF|
+\d ;
 INSERT INTO time_zone (Use_leap_seconds) VALUES ('N');
 SET @time_zone_id= LAST_INSERT_ID();
 INSERT INTO time_zone_name (Name, Time_zone_id) VALUES ('GMT', @time_zone_id);
@@ -74,6 +111,7 @@ INSERT INTO time_zone_transition_type (Time_zone_id, Transition_type_id, `Offset
  (@time_zone_id, 0, 0, 0, 'GMT')
 ;
 Warning: Unable to load 'MYSQLTEST_VARDIR/zoneinfo/posix/garbage' as time zone. Skipping it.
+UNLOCK TABLES;
 COMMIT;
 ALTER TABLE time_zone_transition ORDER BY Time_zone_id, Transition_time;
 ALTER TABLE time_zone_transition_type ORDER BY Time_zone_id, Transition_type_id;
@@ -82,10 +120,78 @@ IF (select count(*) from information_schema.global_variables where
 variable_name='wsrep_on' and variable_value='ON') = 1 THEN
 ALTER TABLE time_zone ENGINE=Aria;
 ALTER TABLE time_zone_name ENGINE=Aria;
-ALTER TABLE time_zone_transition ENGINE=Aria;
-ALTER TABLE time_zone_transition_type ENGINE=Aria;
+ALTER TABLE time_zone_transition ENGINE=Aria, ORDER BY Time_zone_id, Transition_time;
+ALTER TABLE time_zone_transition_type ENGINE=Aria, ORDER BY Time_zone_id, Transition_type_id;
 END IF|
 \d ;
+SELECT COUNT(*) FROM time_zone;
+COUNT(*)
+2
+SELECT COUNT(*) FROM time_zone_name;
+COUNT(*)
+2
+SELECT COUNT(*) FROM time_zone_transition;
+COUNT(*)
+0
+SELECT COUNT(*) FROM time_zone_transition_type;
+COUNT(*)
+2
+SELECT COUNT(*) FROM time_zone_leap_second;
+COUNT(*)
+0
+#
+# Run on zoneinfo directory --skip-write-binlog
+#
+set @prep1=if((select count(*) from information_schema.global_variables where variable_name='wsrep_on' and variable_value='ON'), 'SET SESSION SQL_LOG_BIN=?, WSREP_ON=OFF;', 'do ?');
+prepare set_wsrep_write_binlog from @prep1;
+set @toggle=0; execute set_wsrep_write_binlog using @toggle;
+TRUNCATE TABLE time_zone;
+TRUNCATE TABLE time_zone_name;
+TRUNCATE TABLE time_zone_transition;
+TRUNCATE TABLE time_zone_transition_type;
+LOCK TABLES time_zone WRITE,
+  time_zone_leap_second WRITE,
+  time_zone_name WRITE,
+  time_zone_transition WRITE,
+  time_zone_transition_type WRITE;
+INSERT INTO time_zone (Use_leap_seconds) VALUES ('N');
+SET @time_zone_id= LAST_INSERT_ID();
+INSERT INTO time_zone_name (Name, Time_zone_id) VALUES ('GMT', @time_zone_id);
+INSERT INTO time_zone_transition_type (Time_zone_id, Transition_type_id, `Offset`, Is_DST, Abbreviation) VALUES
+ (@time_zone_id, 0, 0, 0, 'GMT')
+;
+Warning: Unable to load 'MYSQLTEST_VARDIR/zoneinfo/garbage' as time zone. Skipping it.
+INSERT INTO time_zone (Use_leap_seconds) VALUES ('N');
+SET @time_zone_id= LAST_INSERT_ID();
+INSERT INTO time_zone_name (Name, Time_zone_id) VALUES ('posix/GMT', @time_zone_id);
+INSERT INTO time_zone_transition_type (Time_zone_id, Transition_type_id, `Offset`, Is_DST, Abbreviation) VALUES
+ (@time_zone_id, 0, 0, 0, 'GMT')
+;
+Warning: Unable to load 'MYSQLTEST_VARDIR/zoneinfo/posix/garbage' as time zone. Skipping it.
+UNLOCK TABLES;
+COMMIT;
+ALTER TABLE time_zone_transition ORDER BY Time_zone_id, Transition_time;
+ALTER TABLE time_zone_transition_type ORDER BY Time_zone_id, Transition_type_id;
+SELECT COUNT(*) FROM time_zone;
+COUNT(*)
+2
+SELECT COUNT(*) FROM time_zone_name;
+COUNT(*)
+2
+SELECT COUNT(*) FROM time_zone_transition;
+COUNT(*)
+0
+SELECT COUNT(*) FROM time_zone_transition_type;
+COUNT(*)
+2
+SELECT COUNT(*) FROM time_zone_leap_second;
+COUNT(*)
+0
+TRUNCATE TABLE time_zone;
+TRUNCATE TABLE time_zone_name;
+TRUNCATE TABLE time_zone_transition;
+TRUNCATE TABLE time_zone_transition_type;
+TRUNCATE TABLE time_zone_leap_second;
 #
 # Testing with explicit timezonefile
 #
@@ -96,6 +202,10 @@ ALTER TABLE time_zone ENGINE=InnoDB;
 ALTER TABLE time_zone_name ENGINE=InnoDB;
 ALTER TABLE time_zone_transition ENGINE=InnoDB;
 ALTER TABLE time_zone_transition_type ENGINE=InnoDB;
+SELECT 'skip truncate tables';
+START TRANSACTION;
+ELSE
+SELECT 'skip truncate tables';
 END IF|
 \d ;
 INSERT INTO time_zone (Use_leap_seconds) VALUES ('N');
@@ -104,15 +214,79 @@ INSERT INTO time_zone_name (Name, Time_zone_id) VALUES ('XXX', @time_zone_id);
 INSERT INTO time_zone_transition_type (Time_zone_id, Transition_type_id, `Offset`, Is_DST, Abbreviation) VALUES
  (@time_zone_id, 0, 0, 0, 'GMT')
 ;
+UNLOCK TABLES;
+COMMIT;
 \d |
 IF (select count(*) from information_schema.global_variables where
 variable_name='wsrep_on' and variable_value='ON') = 1 THEN
 ALTER TABLE time_zone ENGINE=Aria;
 ALTER TABLE time_zone_name ENGINE=Aria;
-ALTER TABLE time_zone_transition ENGINE=Aria;
-ALTER TABLE time_zone_transition_type ENGINE=Aria;
+ALTER TABLE time_zone_transition ENGINE=Aria, ORDER BY Time_zone_id, Transition_time;
+ALTER TABLE time_zone_transition_type ENGINE=Aria, ORDER BY Time_zone_id, Transition_type_id;
 END IF|
 \d ;
+skip truncate tables
+skip truncate tables
+SELECT COUNT(*) FROM time_zone;
+COUNT(*)
+1
+SELECT COUNT(*) FROM time_zone_name;
+COUNT(*)
+1
+SELECT COUNT(*) FROM time_zone_transition;
+COUNT(*)
+0
+SELECT COUNT(*) FROM time_zone_transition_type;
+COUNT(*)
+1
+SELECT COUNT(*) FROM time_zone_leap_second;
+COUNT(*)
+0
+TRUNCATE TABLE time_zone;
+TRUNCATE TABLE time_zone_name;
+TRUNCATE TABLE time_zone_transition;
+TRUNCATE TABLE time_zone_transition_type;
+TRUNCATE TABLE time_zone_leap_second;
+#
+# Testing with explicit timezonefile --skip-write-binlog
+#
+set @prep1=if((select count(*) from information_schema.global_variables where variable_name='wsrep_on' and variable_value='ON'), 'SET SESSION SQL_LOG_BIN=?, WSREP_ON=OFF;', 'do ?');
+prepare set_wsrep_write_binlog from @prep1;
+set @toggle=0; execute set_wsrep_write_binlog using @toggle;
+SELECT 'skip truncate tables';
+LOCK TABLES time_zone WRITE,
+  time_zone_leap_second WRITE,
+  time_zone_name WRITE,
+  time_zone_transition WRITE,
+  time_zone_transition_type WRITE;
+INSERT INTO time_zone (Use_leap_seconds) VALUES ('N');
+SET @time_zone_id= LAST_INSERT_ID();
+INSERT INTO time_zone_name (Name, Time_zone_id) VALUES ('XXX', @time_zone_id);
+INSERT INTO time_zone_transition_type (Time_zone_id, Transition_type_id, `Offset`, Is_DST, Abbreviation) VALUES
+ (@time_zone_id, 0, 0, 0, 'GMT')
+;
+UNLOCK TABLES;
+COMMIT;
+SELECT COUNT(*) FROM time_zone;
+COUNT(*)
+0
+SELECT COUNT(*) FROM time_zone_name;
+COUNT(*)
+0
+SELECT COUNT(*) FROM time_zone_transition;
+COUNT(*)
+0
+SELECT COUNT(*) FROM time_zone_transition_type;
+COUNT(*)
+0
+SELECT COUNT(*) FROM time_zone_leap_second;
+COUNT(*)
+0
+TRUNCATE TABLE time_zone;
+TRUNCATE TABLE time_zone_name;
+TRUNCATE TABLE time_zone_transition;
+TRUNCATE TABLE time_zone_transition_type;
+TRUNCATE TABLE time_zone_leap_second;
 #
 # Testing --leap
 #
@@ -123,6 +297,10 @@ ALTER TABLE time_zone ENGINE=InnoDB;
 ALTER TABLE time_zone_name ENGINE=InnoDB;
 ALTER TABLE time_zone_transition ENGINE=InnoDB;
 ALTER TABLE time_zone_transition_type ENGINE=InnoDB;
+SELECT 'skip truncate tables';
+START TRANSACTION;
+ELSE
+SELECT 'skip truncate tables';
 END IF|
 \d ;
 \d |
@@ -139,15 +317,72 @@ ALTER TABLE time_zone_leap_second ENGINE=Aria;
 END IF|
 \d ;
 ALTER TABLE time_zone_leap_second ORDER BY Transition_time;
+UNLOCK TABLES;
+COMMIT;
 \d |
 IF (select count(*) from information_schema.global_variables where
 variable_name='wsrep_on' and variable_value='ON') = 1 THEN
 ALTER TABLE time_zone ENGINE=Aria;
 ALTER TABLE time_zone_name ENGINE=Aria;
-ALTER TABLE time_zone_transition ENGINE=Aria;
-ALTER TABLE time_zone_transition_type ENGINE=Aria;
+ALTER TABLE time_zone_transition ENGINE=Aria, ORDER BY Time_zone_id, Transition_time;
+ALTER TABLE time_zone_transition_type ENGINE=Aria, ORDER BY Time_zone_id, Transition_type_id;
 END IF|
 \d ;
+skip truncate tables
+skip truncate tables
+SELECT COUNT(*) FROM time_zone;
+COUNT(*)
+0
+SELECT COUNT(*) FROM time_zone_name;
+COUNT(*)
+0
+SELECT COUNT(*) FROM time_zone_transition;
+COUNT(*)
+0
+SELECT COUNT(*) FROM time_zone_transition_type;
+COUNT(*)
+0
+SELECT COUNT(*) FROM time_zone_leap_second;
+COUNT(*)
+0
+TRUNCATE TABLE time_zone;
+TRUNCATE TABLE time_zone_name;
+TRUNCATE TABLE time_zone_transition;
+TRUNCATE TABLE time_zone_transition_type;
+TRUNCATE TABLE time_zone_leap_second;
+#
+# Testing --skip-write-binlog --leap
+#
+set @prep1=if((select count(*) from information_schema.global_variables where variable_name='wsrep_on' and variable_value='ON'), 'SET SESSION SQL_LOG_BIN=?, WSREP_ON=OFF;', 'do ?');
+prepare set_wsrep_write_binlog from @prep1;
+set @toggle=0; execute set_wsrep_write_binlog using @toggle;
+SELECT 'skip truncate tables';
+LOCK TABLES time_zone WRITE,
+  time_zone_leap_second WRITE,
+  time_zone_name WRITE,
+  time_zone_transition WRITE,
+  time_zone_transition_type WRITE;
+TRUNCATE TABLE time_zone_leap_second;
+ALTER TABLE time_zone_leap_second ORDER BY Transition_time;
+UNLOCK TABLES;
+COMMIT;
+skip truncate tables
+skip truncate tables
+SELECT COUNT(*) FROM time_zone;
+COUNT(*)
+0
+SELECT COUNT(*) FROM time_zone_name;
+COUNT(*)
+0
+SELECT COUNT(*) FROM time_zone_transition;
+COUNT(*)
+0
+SELECT COUNT(*) FROM time_zone_transition_type;
+COUNT(*)
+0
+SELECT COUNT(*) FROM time_zone_leap_second;
+COUNT(*)
+0
 #
 # MDEV-6236 - [PATCH] mysql_tzinfo_to_sql may produce invalid SQL
 #
@@ -158,13 +393,19 @@ ALTER TABLE time_zone ENGINE=InnoDB;
 ALTER TABLE time_zone_name ENGINE=InnoDB;
 ALTER TABLE time_zone_transition ENGINE=InnoDB;
 ALTER TABLE time_zone_transition_type ENGINE=InnoDB;
-END IF|
-\d ;
 TRUNCATE TABLE time_zone;
 TRUNCATE TABLE time_zone_name;
 TRUNCATE TABLE time_zone_transition;
 TRUNCATE TABLE time_zone_transition_type;
 START TRANSACTION;
+ELSE
+TRUNCATE TABLE time_zone;
+TRUNCATE TABLE time_zone_name;
+TRUNCATE TABLE time_zone_transition;
+TRUNCATE TABLE time_zone_transition_type;
+END IF|
+\d ;
+UNLOCK TABLES;
 COMMIT;
 ALTER TABLE time_zone_transition ORDER BY Time_zone_id, Transition_time;
 ALTER TABLE time_zone_transition_type ORDER BY Time_zone_id, Transition_type_id;
@@ -173,7 +414,17 @@ IF (select count(*) from information_schema.global_variables where
 variable_name='wsrep_on' and variable_value='ON') = 1 THEN
 ALTER TABLE time_zone ENGINE=Aria;
 ALTER TABLE time_zone_name ENGINE=Aria;
-ALTER TABLE time_zone_transition ENGINE=Aria;
-ALTER TABLE time_zone_transition_type ENGINE=Aria;
+ALTER TABLE time_zone_transition ENGINE=Aria, ORDER BY Time_zone_id, Transition_time;
+ALTER TABLE time_zone_transition_type ENGINE=Aria, ORDER BY Time_zone_id, Transition_type_id;
 END IF|
 \d ;
+DROP TABLE time_zone;
+DROP TABLE time_zone_name;
+DROP TABLE time_zone_transition;
+DROP TABLE time_zone_transition_type;
+DROP TABLE time_zone_leap_second;
+RENAME TABLE time_zone_orig TO time_zone,
+time_zone_name_orig TO time_zone_name,
+time_zone_transition_orig TO time_zone_transition,
+time_zone_transition_type_orig TO time_zone_transition_type,
+time_zone_leap_second_orig TO time_zone_leap_second;
diff --git a/mysql-test/main/mysql_tzinfo_to_sql_symlink.test b/mysql-test/main/mysql_tzinfo_to_sql_symlink.test
index 8ca82b87e30..fe7275294d5 100644
--- a/mysql-test/main/mysql_tzinfo_to_sql_symlink.test
+++ b/mysql-test/main/mysql_tzinfo_to_sql_symlink.test
@@ -1,5 +1,18 @@
 --source include/have_symlink.inc
 --source include/not_windows.inc
+--source include/not_embedded.inc
+
+use mysql;
+RENAME TABLE time_zone TO time_zone_orig,
+   time_zone_name TO time_zone_name_orig,
+   time_zone_transition TO time_zone_transition_orig,
+   time_zone_transition_type TO time_zone_transition_type_orig,
+   time_zone_leap_second TO time_zone_leap_second_orig;
+CREATE TABLE time_zone LIKE time_zone_orig;
+CREATE TABLE time_zone_name LIKE time_zone_name_orig;
+CREATE TABLE time_zone_transition LIKE time_zone_transition_orig;
+CREATE TABLE time_zone_transition_type LIKE time_zone_transition_type_orig;
+CREATE TABLE time_zone_leap_second LIKE time_zone_leap_second_orig;
 
 --echo #
 --echo # MDEV-5226 mysql_tzinfo_to_sql errors with tzdata 2013f and above
@@ -14,10 +27,41 @@
 --echo # Verbose run
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 --exec $MYSQL_TZINFO_TO_SQL --verbose $MYSQLTEST_VARDIR/zoneinfo 2>&1
+SELECT COUNT(*) FROM time_zone;
+SELECT COUNT(*) FROM time_zone_name;
+SELECT COUNT(*) FROM time_zone_transition;
+SELECT COUNT(*) FROM time_zone_transition_type;
+SELECT COUNT(*) FROM time_zone_leap_second;
 
---echo # Silent run
+--echo # Run on zoneinfo directory
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 --exec $MYSQL_TZINFO_TO_SQL $MYSQLTEST_VARDIR/zoneinfo 2>&1
+--exec $MYSQL_TZINFO_TO_SQL $MYSQLTEST_VARDIR/zoneinfo 2>/dev/null | $MYSQL -S $MASTER_MYSOCK -u root mysql
+SELECT COUNT(*) FROM time_zone;
+SELECT COUNT(*) FROM time_zone_name;
+SELECT COUNT(*) FROM time_zone_transition;
+SELECT COUNT(*) FROM time_zone_transition_type;
+SELECT COUNT(*) FROM time_zone_leap_second;
+
+--echo #
+--echo # Run on zoneinfo directory --skip-write-binlog
+--echo #
+
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--exec $MYSQL_TZINFO_TO_SQL --skip-write-binlog $MYSQLTEST_VARDIR/zoneinfo 2>&1
+--exec $MYSQL_TZINFO_TO_SQL --skip-write-binlog $MYSQLTEST_VARDIR/zoneinfo 2>/dev/null | $MYSQL -S $MASTER_MYSOCK -u root mysql
+SELECT COUNT(*) FROM time_zone;
+SELECT COUNT(*) FROM time_zone_name;
+SELECT COUNT(*) FROM time_zone_transition;
+SELECT COUNT(*) FROM time_zone_transition_type;
+SELECT COUNT(*) FROM time_zone_leap_second;
+
+# Below tests don't include TRUNCATE TABLE so clear them.
+TRUNCATE TABLE time_zone;
+TRUNCATE TABLE time_zone_name;
+TRUNCATE TABLE time_zone_transition;
+TRUNCATE TABLE time_zone_transition_type;
+TRUNCATE TABLE time_zone_leap_second;
 
 --echo #
 --echo # Testing with explicit timezonefile
@@ -25,13 +69,68 @@
 
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 --exec $MYSQL_TZINFO_TO_SQL $MYSQLTEST_VARDIR/zoneinfo/GMT XXX 2>&1
+--exec $MYSQL_TZINFO_TO_SQL $MYSQLTEST_VARDIR/zoneinfo/GMT XXX 2>/dev/null | $MYSQL -S $MASTER_MYSOCK -u root mysql
+SELECT COUNT(*) FROM time_zone;
+SELECT COUNT(*) FROM time_zone_name;
+SELECT COUNT(*) FROM time_zone_transition;
+SELECT COUNT(*) FROM time_zone_transition_type;
+SELECT COUNT(*) FROM time_zone_leap_second;
+
+TRUNCATE TABLE time_zone;
+TRUNCATE TABLE time_zone_name;
+TRUNCATE TABLE time_zone_transition;
+TRUNCATE TABLE time_zone_transition_type;
+TRUNCATE TABLE time_zone_leap_second;
+
+--echo #
+--echo # Testing with explicit timezonefile --skip-write-binlog
+--echo #
+
+--exec $MYSQL_TZINFO_TO_SQL --skip-write-binlog $MYSQLTEST_VARDIR/zoneinfo/GMT XXX 2>&1
+--exec $MYSQL_TZINFO_TO_SQL --skip-write-binlog $MYSQLTEST_VARDIR/zoneinfo/GMT 2>/dev/null | $MYSQL -S $MASTER_MYSOCK -u root mysql
+SELECT COUNT(*) FROM time_zone;
+SELECT COUNT(*) FROM time_zone_name;
+SELECT COUNT(*) FROM time_zone_transition;
+SELECT COUNT(*) FROM time_zone_transition_type;
+SELECT COUNT(*) FROM time_zone_leap_second;
+
+TRUNCATE TABLE time_zone;
+TRUNCATE TABLE time_zone_name;
+TRUNCATE TABLE time_zone_transition;
+TRUNCATE TABLE time_zone_transition_type;
+TRUNCATE TABLE time_zone_leap_second;
 
 --echo #
 --echo # Testing --leap
 --echo #
 
 --exec $MYSQL_TZINFO_TO_SQL --leap $MYSQLTEST_VARDIR/zoneinfo/GMT 2>&1
+--exec $MYSQL_TZINFO_TO_SQL --leap $MYSQLTEST_VARDIR/zoneinfo/GMT 2>/dev/null | $MYSQL -S $MASTER_MYSOCK -u root mysql
+SELECT COUNT(*) FROM time_zone;
+SELECT COUNT(*) FROM time_zone_name;
+SELECT COUNT(*) FROM time_zone_transition;
+SELECT COUNT(*) FROM time_zone_transition_type;
+SELECT COUNT(*) FROM time_zone_leap_second;
 
+TRUNCATE TABLE time_zone;
+TRUNCATE TABLE time_zone_name;
+TRUNCATE TABLE time_zone_transition;
+TRUNCATE TABLE time_zone_transition_type;
+TRUNCATE TABLE time_zone_leap_second;
+
+--echo #
+--echo # Testing --skip-write-binlog --leap
+--echo #
+
+--exec $MYSQL_TZINFO_TO_SQL --skip-write-binlog --leap $MYSQLTEST_VARDIR/zoneinfo/GMT 2>&1
+--exec $MYSQL_TZINFO_TO_SQL --skip-write-binlog --leap $MYSQLTEST_VARDIR/zoneinfo/GMT 2>/dev/null | $MYSQL -S $MASTER_MYSOCK -u root mysql
+SELECT COUNT(*) FROM time_zone;
+SELECT COUNT(*) FROM time_zone_name;
+SELECT COUNT(*) FROM time_zone_transition;
+SELECT COUNT(*) FROM time_zone_transition_type;
+SELECT COUNT(*) FROM time_zone_leap_second;
+
+#
 #
 # Cleanup
 #
@@ -48,3 +147,13 @@
 --exec $MYSQL_TZINFO_TO_SQL $MYSQLTEST_VARDIR/zoneinfo 2>&1
 
 --exec rm -rf $MYSQLTEST_VARDIR/zoneinfo
+DROP TABLE time_zone;
+DROP TABLE time_zone_name;
+DROP TABLE time_zone_transition;
+DROP TABLE time_zone_transition_type;
+DROP TABLE time_zone_leap_second;
+RENAME TABLE time_zone_orig TO time_zone,
+  time_zone_name_orig TO time_zone_name,
+  time_zone_transition_orig TO time_zone_transition,
+  time_zone_transition_type_orig TO time_zone_transition_type,
+  time_zone_leap_second_orig TO time_zone_leap_second;
diff --git a/mysql-test/main/mysql_upgrade-6984.test b/mysql-test/main/mysql_upgrade-6984.test
index 4c5c44493e2..48a06bbd542 100644
--- a/mysql-test/main/mysql_upgrade-6984.test
+++ b/mysql-test/main/mysql_upgrade-6984.test
@@ -14,6 +14,7 @@
 
 update mysql.global_priv set priv=json_set(priv, '$.plugin', 'mysql_native_password', '$.authentication_string', password('foo')) where user='root';
 
+--replace_regex /[^ ]*mysql_upgrade_info/...mysql_upgrade_info/
 --exec $MYSQL_UPGRADE
 
 connect(con1,localhost,root,foo,,,);
@@ -22,3 +23,6 @@ update mysql.global_priv set priv=json_compact(json_remove(priv, '$.plugin', '$.
 flush privileges;
 # Load event table
 set global event_scheduler=OFF;
+
+let MYSQLD_DATADIR= `select @@datadir`;
+--remove_file $MYSQLD_DATADIR/mysql_upgrade_info
diff --git a/mysql-test/main/mysql_upgrade.result b/mysql-test/main/mysql_upgrade.result
index 317622a391c..0649c9139fd 100644
--- a/mysql-test/main/mysql_upgrade.result
+++ b/mysql-test/main/mysql_upgrade.result
@@ -149,7 +149,8 @@ test
 Phase 7/7: Running 'FLUSH PRIVILEGES'
 OK
 Run it again - should say already completed
-This installation of MariaDB is already upgraded to VERSION, use --force if you still need to run mysql_upgrade
+This installation of MariaDB is already upgraded to VERSION.There is no need to run mysql_upgrade again for VERSION.
+You can use --force if you still want to run mysql_upgrade
 Force should run it regardless of whether it has been run before
 Phase 1/7: Checking and upgrading mysql database
 Processing databases
@@ -451,11 +452,12 @@ test
 Phase 7/7: Running 'FLUSH PRIVILEGES'
 OK
 DROP USER mysqltest1@'%';
-Version check failed. Got the following error when calling the 'mysql' command line client
+Reading datadir from the MariaDB server failed. Got the following error when executing the 'mysql' command line client
 ERROR 1045 (28000): Access denied for user 'mysqltest1'@'localhost' (using password: YES)
 FATAL ERROR: Upgrade failed
 Run mysql_upgrade with a non existing server socket
-mysqlcheck: Got error: 2005: Unknown server host 'not_existing_host' (errno) when trying to connect
+Reading datadir from the MariaDB server failed. Got the following error when executing the 'mysql' command line client
+ERROR 2005 (HY000): Unknown server host 'not_existing_host' (errno)
 FATAL ERROR: Upgrade failed
 set GLOBAL sql_mode='STRICT_ALL_TABLES,ANSI_QUOTES,NO_ZERO_DATE';
 Phase 1/7: Checking and upgrading mysql database
@@ -1126,9 +1128,12 @@ OK
 # Bug #21489398: MYSQL_UPGRADE: FATAL ERROR: UPGRADE FAILED - IMPROVE ERROR
 #
 Run mysql_upgrade with unauthorized access
-Version check failed. Got the following error when calling the 'mysql' command line client
+Reading datadir from the MariaDB server failed. Got the following error when executing the 'mysql' command line client
 ERROR 1045 (28000): Access denied for user 'root'@'localhost' (using password: YES)
 FATAL ERROR: Upgrade failed
+Reading datadir from the MariaDB server failed. Got the following error when executing the 'mysql' command line client
+ERROR 1045 (errno): Access denied for user 'root'@'localhost' (using password: YES)
+FATAL ERROR: Upgrade failed
 #
 # MDEV-4332 Increase username length from 16 characters
 # MDEV-6068, MDEV-6178 mysql_upgrade breaks databases with long user names
@@ -1890,6 +1895,34 @@ GRANT PROXY ON ''@'%' TO 'root'@'localhost' WITH GRANT OPTION
 GRANT USAGE ON *.* TO `aRole`
 DROP ROLE `aRole`;
 FLUSH PRIVILEGES;
+#
+# MDEV-27279: mariadb_upgrade add --check-if-upgrade-is-needed
+#
+This installation of MariaDB is already upgraded to MariaDB .
+There is no need to run mysql_upgrade again for MariaDB .
+Looking for 'mysql' as: mysql
+This installation of MariaDB is already upgraded to MariaDB .
+There is no need to run mysql_upgrade again for MariaDB .
+#
+# MDEV-27279: mariadb_upgrade check-if-upgrade absence is do it
+#
+Looking for 'mysql' as: mysql
+Empty or non existent ...mysql_upgrade_info. Assuming mysql_upgrade has to be run!
+#
+# MDEV-27279: mariadb_upgrade check-if-upgrade with minor version change
+#
+Looking for 'mysql' as: mysql
+This installation of MariaDB is already upgraded to MariaDB .
+There is no need to run mysql_upgrade again for MariaDB .
+This installation of MariaDB is already upgraded to MariaDB .
+There is no need to run mysql_upgrade again for MariaDB .
+You can use --force if you still want to run mysql_upgrade
+#
+# MDEV-27279: mariadb_upgrade check-if-upgrade with major version change
+#
+Major version upgrade detected from MariaDB  to MariaDB . Check required!
+Looking for 'mysql' as: mysql
+Major version upgrade detected from MariaDB  to MariaDB . Check required!
 drop table mysql.global_priv;
 rename table mysql.global_priv_bak to mysql.global_priv;
 # End of 10.2 tests
diff --git a/mysql-test/main/mysql_upgrade.test b/mysql-test/main/mysql_upgrade.test
index e81666585d3..083f033daf5 100644
--- a/mysql-test/main/mysql_upgrade.test
+++ b/mysql-test/main/mysql_upgrade.test
@@ -17,7 +17,7 @@ let $MYSQLD_DATADIR= `select @@datadir`;
 file_exists $MYSQLD_DATADIR/mysql_upgrade_info;
 
 --echo Run it again - should say already completed
---replace_regex /upgraded to .*, use/upgraded to VERSION, use/
+--replace_regex /upgraded to [^\n].*/upgraded to VERSION./ /again for [^\n]*/again for VERSION./
 --exec $MYSQL_UPGRADE 2>&1
 
 # It should have created a file in the MySQL Servers datadir
@@ -125,7 +125,7 @@ let $MYSQLD_DATADIR= `select @@datadir`;
 --remove_file $MYSQLD_DATADIR/mysql_upgrade_info
 
 --echo # Running mysql_upgrade with --skip-write-binlog..
---replace_result $MYSQLTEST_VARDIR var
+--replace_regex /[^ ]*mysql_upgrade_info/...mysql_upgrade_info/
 --exec $MYSQL_UPGRADE --skip-write-binlog
 
 # mysql_upgrade must have created mysql_upgrade_info file,
@@ -139,6 +139,9 @@ let $MYSQLD_DATADIR= `select @@datadir`;
 --echo Run mysql_upgrade with unauthorized access
 --error 1
 --exec $MYSQL_UPGRADE --skip-verbose --user=root --password=wrong_password 2>&1
+--replace_regex /.*mysqlcheck.*: Got/mysqlcheck: Got/ /\([0-9|-]*\)/(errno)/
+--error 1
+--exec $MYSQL_UPGRADE --skip-verbose --skip-version-check --user=root --password=wrong_password 2>&1
 
 --echo #
 --echo # MDEV-4332 Increase username length from 16 characters
@@ -232,6 +235,7 @@ FLUSH TABLES mysql.user;
 FLUSH PRIVILEGES;
 SHOW CREATE TABLE mysql.user;
 
+--replace_result $MYSQLTEST_VARDIR var
 --exec $MYSQL_UPGRADE --force 2>&1
 SHOW CREATE TABLE mysql.user;
 
@@ -276,6 +280,79 @@ SHOW GRANTS;
 DROP ROLE `aRole`;
 --exec $MYSQL mysql < $MYSQLTEST_VARDIR/tmp/user.sql
 FLUSH PRIVILEGES;
+
+--echo #
+--echo # MDEV-27279: mariadb_upgrade add --check-if-upgrade-is-needed
+--echo #
+
+--error 1
+--exec $MYSQL_UPGRADE --check-if-upgrade-is-needed --silent
+--replace_regex /\d\d\.\d*\.\d*[^ .\n]*/MariaDB /
+--error 1
+--exec $MYSQL_UPGRADE --check-if-upgrade-is-needed
+--replace_regex /\d\d\.\d*\.\d*[^ .\n]*/MariaDB / /'mysql.* as:[^\n]*/'mysql' as: mysql/
+--error 1
+--exec $MYSQL_UPGRADE --check-if-upgrade-is-needed --verbose
+
+--echo #
+--echo # MDEV-27279: mariadb_upgrade check-if-upgrade absence is do it
+--echo #
+
+--remove_file $MYSQLD_DATADIR/mysql_upgrade_info
+--replace_regex /[^ ]*mysql_upgrade_info/...mysql_upgrade_info/
+--exec $MYSQL_UPGRADE --check-if-upgrade-is-needed
+
+--replace_regex /'mysql.* as:[^\n]*/'mysql' as: mysql/ /open .* Assuming/open XXX. Assuming/ /[^ ]*mysql_upgrade_info/...mysql_upgrade_info/
+--exec $MYSQL_UPGRADE --check-if-upgrade-is-needed --verbose
+
+--echo #
+--echo # MDEV-27279: mariadb_upgrade check-if-upgrade with minor version change
+--echo #
+
+# take 3rd number of version and change to 0
+
+let DATADIR= $MYSQLD_DATADIR;
+
+perl;
+  my $ver= $ENV{'MYSQL_SERVER_VERSION'} or die "MYSQL_SERVER_VERSION not set";
+  my $file= $ENV{'DATADIR'} or die "MYSQLD_DATADIR not set";
+  $ver =~ s/^(\d*)\.(\d*).(\d*)(.*)/$1.$2.0$4/;
+  open(FILE, ">$file/mysql_upgrade_info") or die "Failed to open $file";
+  print FILE "$ver\n";
+  close(FILE);
+EOF
+
+--error 1
+--exec $MYSQL_UPGRADE --check-if-upgrade-is-needed --silent
+--replace_regex /\d\d\.\d*\.\d*[^ .\n]*/MariaDB / /'mysql.* as:[^\n]*/'mysql' as: mysql/
+--error 1
+--exec $MYSQL_UPGRADE --check-if-upgrade-is-needed --verbose
+--replace_regex /\d\d\.\d*\.\d*[^ .\n]*/MariaDB /
+--exec $MYSQL_UPGRADE
+--remove_file $MYSQLD_DATADIR/mysql_upgrade_info
+
+--echo #
+--echo # MDEV-27279: mariadb_upgrade check-if-upgrade with major version change
+--echo #
+
+# take 2rd number of version and change to 0
+
+let DATADIR= $MYSQLD_DATADIR;
+
+perl;
+  my $ver= $ENV{'MYSQL_SERVER_VERSION'} or die "MYSQL_SERVER_VERSION not set";
+  my $file= $ENV{'DATADIR'} or die "MYSQLD_DATADIR not set";
+  $ver =~ s/^(\d*)\.(\d*).(\d*)(.*)/$1.0.$3$4/;
+  open(FILE, ">$file/mysql_upgrade_info") or die "Failed to open $file";
+  print FILE "$ver\n";
+  close(FILE);
+EOF
+
+--exec $MYSQL_UPGRADE --check-if-upgrade-is-needed --silent
+--replace_regex /\d\d\.\d*\.\d*[^ .\n]*/MariaDB /
+--exec $MYSQL_UPGRADE --check-if-upgrade-is-needed
+--replace_regex /\d\d\.\d*\.\d*[^ .\n]*/MariaDB / /'mysql.* as:[^\n]*/'mysql' as: mysql/
+--exec $MYSQL_UPGRADE --check-if-upgrade-is-needed --verbose
 --remove_file $MYSQLD_DATADIR/mysql_upgrade_info
 drop table mysql.global_priv;
 rename table mysql.global_priv_bak to mysql.global_priv;
diff --git a/mysql-test/main/mysql_upgrade_noengine.result b/mysql-test/main/mysql_upgrade_noengine.result
index 7d2bbca7c43..459a1a6ce34 100644
--- a/mysql-test/main/mysql_upgrade_noengine.result
+++ b/mysql-test/main/mysql_upgrade_noengine.result
@@ -55,6 +55,7 @@ Warnings:
 Level	Warning
 Code	1286
 Message	Unknown storage engine 'ARCHIVE'
+# upgrade from 10.1 - engines aren't enabled
 Phase 1/7: Checking and upgrading mysql database
 Processing databases
 mysql
@@ -250,6 +251,8 @@ rename table mysql.global_priv_bak to mysql.global_priv;
 # switching from mysql.global_priv to mysql.user
 drop view mysql.user_bak;
 alter table mysql.user drop column default_role, drop column max_statement_time;
+# still upgrade from 10.1
+Major version upgrade detected from MariaDB  to MariaDB . Check required!
 Phase 1/7: Checking and upgrading mysql database
 Processing databases
 mysql
@@ -445,6 +448,7 @@ rename table mysql.global_priv_bak to mysql.global_priv;
 # switching from mysql.global_priv to mysql.user
 drop view mysql.user_bak;
 alter table mysql.user drop column default_role, drop column max_statement_time;
+# upgrade from 10.0 - engines are enabled
 Phase 1/7: Checking and upgrading mysql database
 Processing databases
 mysql
diff --git a/mysql-test/main/mysql_upgrade_noengine.test b/mysql-test/main/mysql_upgrade_noengine.test
index efe36c355ab..a2d229dc9be 100644
--- a/mysql-test/main/mysql_upgrade_noengine.test
+++ b/mysql-test/main/mysql_upgrade_noengine.test
@@ -32,7 +32,8 @@ uninstall plugin archive;
 select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test' and table_name='t1';
 select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test' and table_name='t2';
 
-# upgrade from 10.1 - engines aren't enabled
+--echo # upgrade from 10.1 - engines aren't enabled
+--replace_regex /\d\d\.\d*\.\d*[^ .\n]*/MariaDB /
 exec $MYSQL_UPGRADE 2>&1;
 select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test' and table_name='t1';
 select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test' and table_name='t2';
@@ -51,7 +52,8 @@ write_file $datadir/mysql_upgrade_info;
 10.1.10-MariaDB
 EOF
 
-# still upgrade from 10.1
+--echo # still upgrade from 10.1
+--replace_regex /\d\d\.\d*\.\d*[^ .\n]*/MariaDB /
 exec $MYSQL_UPGRADE 2>&1;
 select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test' and table_name='t1';
 select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test' and table_name='t2';
@@ -64,7 +66,8 @@ drop view mysql.user_bak;
 alter table mysql.user drop column default_role, drop column max_statement_time;
 remove_file $datadir/mysql_upgrade_info;
 
-# upgrade from 10.0 - engines are enabled
+--echo # upgrade from 10.0 - engines are enabled
+--replace_regex /\d\d\.\d*\.\d*[^ .\n]*/MariaDB /
 exec $MYSQL_UPGRADE 2>&1;
 select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test' and table_name='t1';
 select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test' and table_name='t2';
diff --git a/mysql-test/main/mysqld--help-aria.result b/mysql-test/main/mysqld--help-aria.result
index fb44c3ea3ee..3e72f0aaff4 100644
--- a/mysql-test/main/mysqld--help-aria.result
+++ b/mysql-test/main/mysqld--help-aria.result
@@ -1,3 +1,4 @@
+flush tables;
 #
 # Check that we don't write any data to wrong or not existing datadir
 #
diff --git a/mysql-test/main/mysqld--help-aria.test b/mysql-test/main/mysqld--help-aria.test
index 55131e9e4eb..2bd332c1484 100644
--- a/mysql-test/main/mysqld--help-aria.test
+++ b/mysql-test/main/mysqld--help-aria.test
@@ -1,6 +1,7 @@
 #
 # Check errors from mysqld--help when providing different datadir
 #
+flush tables;
 
 --let $args=--table-cache=5 --max-connections=10 --log-warnings=1 --silent-startup --lower-case-table-names=1 --help --verbose
 
diff --git a/mysql-test/main/mysqldump.result b/mysql-test/main/mysqldump.result
index 0de2c5a111b..b086093db5d 100644
--- a/mysql-test/main/mysqldump.result
+++ b/mysql-test/main/mysqldump.result
@@ -3704,29 +3704,29 @@ DROP TABLE IF EXISTS `TABLES`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TEMPORARY TABLE `TABLES` (
-  `TABLE_CATALOG` varchar(512) NOT NULL DEFAULT '',
-  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_TYPE` varchar(64) NOT NULL DEFAULT '',
-  `ENGINE` varchar(64) DEFAULT NULL,
-  `VERSION` bigint(21) unsigned DEFAULT NULL,
-  `ROW_FORMAT` varchar(10) DEFAULT NULL,
-  `TABLE_ROWS` bigint(21) unsigned DEFAULT NULL,
-  `AVG_ROW_LENGTH` bigint(21) unsigned DEFAULT NULL,
-  `DATA_LENGTH` bigint(21) unsigned DEFAULT NULL,
-  `MAX_DATA_LENGTH` bigint(21) unsigned DEFAULT NULL,
-  `INDEX_LENGTH` bigint(21) unsigned DEFAULT NULL,
-  `DATA_FREE` bigint(21) unsigned DEFAULT NULL,
-  `AUTO_INCREMENT` bigint(21) unsigned DEFAULT NULL,
-  `CREATE_TIME` datetime DEFAULT NULL,
-  `UPDATE_TIME` datetime DEFAULT NULL,
-  `CHECK_TIME` datetime DEFAULT NULL,
-  `TABLE_COLLATION` varchar(32) DEFAULT NULL,
-  `CHECKSUM` bigint(21) unsigned DEFAULT NULL,
-  `CREATE_OPTIONS` varchar(2048) DEFAULT NULL,
-  `TABLE_COMMENT` varchar(2048) NOT NULL DEFAULT '',
-  `MAX_INDEX_LENGTH` bigint(21) unsigned DEFAULT NULL,
-  `TEMPORARY` varchar(1) DEFAULT NULL
+  `TABLE_CATALOG` varchar(512) NOT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL,
+  `TABLE_NAME` varchar(64) NOT NULL,
+  `TABLE_TYPE` varchar(64) NOT NULL,
+  `ENGINE` varchar(64),
+  `VERSION` bigint(21) unsigned,
+  `ROW_FORMAT` varchar(10),
+  `TABLE_ROWS` bigint(21) unsigned,
+  `AVG_ROW_LENGTH` bigint(21) unsigned,
+  `DATA_LENGTH` bigint(21) unsigned,
+  `MAX_DATA_LENGTH` bigint(21) unsigned,
+  `INDEX_LENGTH` bigint(21) unsigned,
+  `DATA_FREE` bigint(21) unsigned,
+  `AUTO_INCREMENT` bigint(21) unsigned,
+  `CREATE_TIME` datetime,
+  `UPDATE_TIME` datetime,
+  `CHECK_TIME` datetime,
+  `TABLE_COLLATION` varchar(32),
+  `CHECKSUM` bigint(21) unsigned,
+  `CREATE_OPTIONS` varchar(2048),
+  `TABLE_COMMENT` varchar(2048) NOT NULL,
+  `MAX_INDEX_LENGTH` bigint(21) unsigned,
+  `TEMPORARY` varchar(1)
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
 #
diff --git a/mysql-test/main/opt_trace_index_merge_innodb.result b/mysql-test/main/opt_trace_index_merge_innodb.result
index 0ddaaeae89d..fbc7faa0d04 100644
--- a/mysql-test/main/opt_trace_index_merge_innodb.result
+++ b/mysql-test/main/opt_trace_index_merge_innodb.result
@@ -184,12 +184,12 @@ explain select * from t1 where pk1 != 0  and key1 = 1	{
               {
                 "selectivity_for_indexes": [
                   {
-                    "index_name": "PRIMARY",
-                    "selectivity_from_index": 1
-                  },
-                  {
                     "index_name": "key1",
                     "selectivity_from_index": 0.001
+                  },
+                  {
+                    "index_name": "PRIMARY",
+                    "selectivity_from_index": 1
                   }
                 ],
                 "selectivity_for_columns": [],
diff --git a/mysql-test/main/order_by.result b/mysql-test/main/order_by.result
index e9f4b1d599a..1df737f2c37 100644
--- a/mysql-test/main/order_by.result
+++ b/mysql-test/main/order_by.result
@@ -3562,6 +3562,29 @@ b	a
 40	1
 30	4
 drop table t1,t2;
+#
+# MDEV-22256 Assertion `length == pack_length()' failed in Field_timestamp_with_dec::sort_string
+#
+SET sql_mode='';
+SET @@SESSION.max_sort_length=4;
+Warnings:
+Warning	1292	Truncated incorrect max_sort_length value: '4'
+CREATE TABLE t1 (c TIMESTAMP(1));
+INSERT INTO t1 VALUES(0);
+DELETE FROM t1 ORDER BY c;
+DROP TABLE t1;
+SET @@SESSION.max_sort_length=DEFAULT;
+SET sql_mode=DEFAULT;
+SET sql_mode='';
+SET @@SESSION.max_sort_length=1;
+Warnings:
+Warning	1292	Truncated incorrect max_sort_length value: '1'
+CREATE TEMPORARY TABLE t1 (c DATETIME);
+INSERT INTO t1 VALUES(0);
+DELETE FROM t1 ORDER BY c;
+DROP TABLE t1;
+SET @@SESSION.max_sort_length=DEFAULT;
+SET sql_mode=DEFAULT;
 # End of 10.2 tests
 #
 # MDEV-16214: Incorrect plan taken by the optimizer , uses INDEX instead of ref access with ORDER BY
diff --git a/mysql-test/main/order_by.test b/mysql-test/main/order_by.test
index 9ad0af1d21f..e8b51ce15d1 100644
--- a/mysql-test/main/order_by.test
+++ b/mysql-test/main/order_by.test
@@ -2311,6 +2311,29 @@ explain (select b,a from t2 order by a limit 3) order by b desc;
 
 drop table t1,t2;
 
+--echo #
+--echo # MDEV-22256 Assertion `length == pack_length()' failed in Field_timestamp_with_dec::sort_string
+--echo #
+
+SET sql_mode='';
+SET @@SESSION.max_sort_length=4;
+CREATE TABLE t1 (c TIMESTAMP(1));
+INSERT INTO t1 VALUES(0);
+DELETE FROM t1 ORDER BY c;
+DROP TABLE t1;
+SET @@SESSION.max_sort_length=DEFAULT;
+SET sql_mode=DEFAULT;
+
+SET sql_mode='';
+SET @@SESSION.max_sort_length=1;
+CREATE TEMPORARY TABLE t1 (c DATETIME);
+INSERT INTO t1 VALUES(0);
+DELETE FROM t1 ORDER BY c;
+DROP TABLE t1;
+SET @@SESSION.max_sort_length=DEFAULT;
+SET sql_mode=DEFAULT;
+
+
 --echo # End of 10.2 tests
 
 --echo #
diff --git a/mysql-test/main/partition_sp.result b/mysql-test/main/partition_sp.result
new file mode 100644
index 00000000000..585e2c7ab9d
--- /dev/null
+++ b/mysql-test/main/partition_sp.result
@@ -0,0 +1,22 @@
+#
+# MDEV-8652: Partitioned table creation problem when
+# creating from procedure context twice in same session
+#
+CREATE PROCEDURE p1()
+BEGIN
+DROP TABLE IF EXISTS t1 ;
+CREATE TABLE t1 (
+id INT PRIMARY KEY
+)
+PARTITION BY RANGE (id) (
+PARTITION P1 VALUES LESS THAN (2),
+PARTITION P2 VALUES LESS THAN (3)
+); 
+END |
+call p1();
+call p1();
+drop procedure p1;
+drop table t1;
+#
+# End of 10.2 tests
+#
diff --git a/mysql-test/main/partition_sp.test b/mysql-test/main/partition_sp.test
new file mode 100644
index 00000000000..1d3d1d707c7
--- /dev/null
+++ b/mysql-test/main/partition_sp.test
@@ -0,0 +1,35 @@
+--source include/have_partition.inc
+
+--echo #
+--echo # MDEV-8652: Partitioned table creation problem when
+--echo # creating from procedure context twice in same session
+--echo #
+
+
+DELIMITER |;
+ 
+CREATE PROCEDURE p1()
+BEGIN
+  DROP TABLE IF EXISTS t1 ;
+ 
+  CREATE TABLE t1 (
+    id INT PRIMARY KEY
+  )
+  PARTITION BY RANGE (id) (
+    PARTITION P1 VALUES LESS THAN (2),
+    PARTITION P2 VALUES LESS THAN (3)
+  ); 
+END |
+ 
+DELIMITER ;|
+ 
+call p1(); 
+call p1(); 
+
+drop procedure p1;
+drop table t1;
+
+--echo #
+--echo # End of 10.2 tests
+--echo #
+
diff --git a/mysql-test/main/partition_symlink.result b/mysql-test/main/partition_symlink.result
index 90048eb3438..b5a976e3a9e 100644
--- a/mysql-test/main/partition_symlink.result
+++ b/mysql-test/main/partition_symlink.result
@@ -177,3 +177,97 @@ partition by key (a)
 (partition p0,
 partition p1 DATA DIRECTORY 'part-data' INDEX DIRECTORY 'part-data');
 Got one of the listed errors
+#
+# MDEV-25917 create table like fails if source table is partitioned and engine is myisam or aria with data directory.
+#
+CREATE TABLE t1 (a INT)
+ENGINE = MyISAM
+PARTITION BY LIST (a)
+(PARTITION p0 VALUES IN (0)
+DATA DIRECTORY 'MYSQLTEST_VARDIR/tmp'
+  INDEX DIRECTORY 'MYSQLTEST_VARDIR/tmp',
+PARTITION p1 VALUES IN (1)
+DATA DIRECTORY 'MYSQLTEST_VARDIR/tmp'
+  INDEX DIRECTORY 'MYSQLTEST_VARDIR/tmp',
+PARTITION p2 VALUES IN (2));
+CREATE TABLE t2 LIKE t1;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` int(11) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/tmp' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/tmp' ENGINE = MyISAM,
+ PARTITION `p1` VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/tmp' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/tmp' ENGINE = MyISAM,
+ PARTITION `p2` VALUES IN (2) ENGINE = MyISAM)
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `a` int(11) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0) ENGINE = MyISAM,
+ PARTITION `p1` VALUES IN (1) ENGINE = MyISAM,
+ PARTITION `p2` VALUES IN (2) ENGINE = MyISAM)
+DROP TABLE t1, t2;
+CREATE TABLE t1 (
+ID int(11) NOT NULL,
+type int(11)) Engine=MyISAM
+PARTITION BY RANGE(ID)
+SUBPARTITION BY HASH(type)
+(
+PARTITION p01 VALUES LESS THAN(100)
+(SUBPARTITION s11
+DATA DIRECTORY 'MYSQLTEST_VARDIR/tmp'
+           INDEX DIRECTORY 'MYSQLTEST_VARDIR/tmp',
+SUBPARTITION s12
+DATA DIRECTORY 'MYSQLTEST_VARDIR/tmp'
+           INDEX DIRECTORY 'MYSQLTEST_VARDIR/tmp'
+      ),
+PARTITION p11 VALUES LESS THAN(200)
+(SUBPARTITION s21, SUBPARTITION s22),
+PARTITION p21 VALUES LESS THAN MAXVALUE
+(SUBPARTITION s31
+DATA DIRECTORY 'MYSQLTEST_VARDIR/tmp'
+           INDEX DIRECTORY 'MYSQLTEST_VARDIR/tmp',
+SUBPARTITION s32
+DATA DIRECTORY 'MYSQLTEST_VARDIR/tmp'
+           INDEX DIRECTORY 'MYSQLTEST_VARDIR/tmp'
+      )
+);
+CREATE TABLE t2 LIKE t1;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `ID` int(11) NOT NULL,
+  `type` int(11) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+ PARTITION BY RANGE (`ID`)
+SUBPARTITION BY HASH (`type`)
+(PARTITION `p01` VALUES LESS THAN (100)
+ (SUBPARTITION `s11` DATA DIRECTORY = 'MYSQLTEST_VARDIR/tmp' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/tmp' ENGINE = MyISAM,
+  SUBPARTITION `s12` DATA DIRECTORY = 'MYSQLTEST_VARDIR/tmp' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/tmp' ENGINE = MyISAM),
+ PARTITION `p11` VALUES LESS THAN (200)
+ (SUBPARTITION `s21` ENGINE = MyISAM,
+  SUBPARTITION `s22` ENGINE = MyISAM),
+ PARTITION `p21` VALUES LESS THAN MAXVALUE
+ (SUBPARTITION `s31` DATA DIRECTORY = 'MYSQLTEST_VARDIR/tmp' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/tmp' ENGINE = MyISAM,
+  SUBPARTITION `s32` DATA DIRECTORY = 'MYSQLTEST_VARDIR/tmp' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/tmp' ENGINE = MyISAM))
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `ID` int(11) NOT NULL,
+  `type` int(11) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+ PARTITION BY RANGE (`ID`)
+SUBPARTITION BY HASH (`type`)
+(PARTITION `p01` VALUES LESS THAN (100)
+ (SUBPARTITION `s11` ENGINE = MyISAM,
+  SUBPARTITION `s12` ENGINE = MyISAM),
+ PARTITION `p11` VALUES LESS THAN (200)
+ (SUBPARTITION `s21` ENGINE = MyISAM,
+  SUBPARTITION `s22` ENGINE = MyISAM),
+ PARTITION `p21` VALUES LESS THAN MAXVALUE
+ (SUBPARTITION `s31` ENGINE = MyISAM,
+  SUBPARTITION `s32` ENGINE = MyISAM))
+DROP TABLE t1, t2;
diff --git a/mysql-test/main/partition_symlink.test b/mysql-test/main/partition_symlink.test
index 8f6e837299a..7e09c7d0642 100644
--- a/mysql-test/main/partition_symlink.test
+++ b/mysql-test/main/partition_symlink.test
@@ -220,3 +220,58 @@ ENGINE = MyISAM
 partition by key (a)
 (partition p0,
  partition p1 DATA DIRECTORY 'part-data' INDEX DIRECTORY 'part-data');
+
+--echo #
+--echo # MDEV-25917 create table like fails if source table is partitioned and engine is myisam or aria with data directory.
+--echo #
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+eval CREATE TABLE t1 (a INT)
+ENGINE = MyISAM
+PARTITION BY LIST (a)
+(PARTITION p0 VALUES IN (0)
+  DATA DIRECTORY '$MYSQLTEST_VARDIR/tmp'
+  INDEX DIRECTORY '$MYSQLTEST_VARDIR/tmp',
+ PARTITION p1 VALUES IN (1)
+  DATA DIRECTORY '$MYSQLTEST_VARDIR/tmp'
+  INDEX DIRECTORY '$MYSQLTEST_VARDIR/tmp',
+ PARTITION p2 VALUES IN (2));
+
+CREATE TABLE t2 LIKE t1;
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+SHOW CREATE TABLE t1;
+SHOW CREATE TABLE t2;
+DROP TABLE t1, t2;
+
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+eval CREATE TABLE t1 (
+    ID int(11) NOT NULL,
+    type int(11)) Engine=MyISAM
+PARTITION BY RANGE(ID)
+SUBPARTITION BY HASH(type)
+(
+    PARTITION p01 VALUES LESS THAN(100)
+      (SUBPARTITION s11
+           DATA DIRECTORY '$MYSQLTEST_VARDIR/tmp'
+           INDEX DIRECTORY '$MYSQLTEST_VARDIR/tmp',
+       SUBPARTITION s12
+           DATA DIRECTORY '$MYSQLTEST_VARDIR/tmp'
+           INDEX DIRECTORY '$MYSQLTEST_VARDIR/tmp'
+      ),
+    PARTITION p11 VALUES LESS THAN(200)
+      (SUBPARTITION s21, SUBPARTITION s22),
+    PARTITION p21 VALUES LESS THAN MAXVALUE
+      (SUBPARTITION s31
+           DATA DIRECTORY '$MYSQLTEST_VARDIR/tmp'
+           INDEX DIRECTORY '$MYSQLTEST_VARDIR/tmp',
+       SUBPARTITION s32
+           DATA DIRECTORY '$MYSQLTEST_VARDIR/tmp'
+           INDEX DIRECTORY '$MYSQLTEST_VARDIR/tmp'
+      )
+);
+
+CREATE TABLE t2 LIKE t1;
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+SHOW CREATE TABLE t1;
+SHOW CREATE TABLE t2;
+
+DROP TABLE t1, t2;
diff --git a/mysql-test/main/range_innodb.result b/mysql-test/main/range_innodb.result
index be7e89b9fd2..1d98fad0295 100644
--- a/mysql-test/main/range_innodb.result
+++ b/mysql-test/main/range_innodb.result
@@ -110,6 +110,112 @@ SET @@GLOBAL.debug_dbug = @saved_dbug;
 set @@optimizer_switch= @optimizer_switch_save;
 # End of 10.1 tests
 #
+# MDEV-27262: Index intersection with full scan over an index
+#
+CREATE TABLE t1 (
+id int(10) unsigned NOT NULL AUTO_INCREMENT,
+p char(32) DEFAULT NULL,
+es tinyint(3) unsigned NOT NULL DEFAULT 0,
+er tinyint(3) unsigned NOT NULL DEFAULT 0,
+x mediumint(8) unsigned NOT NULL DEFAULT 0,
+PRIMARY KEY (id),
+INDEX es (es),
+INDEX x (x),
+INDEX er (er,x),
+INDEX p (p)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+insert into t1(es,er) select 0, 1 from seq_1_to_45;
+insert into t1(es,er) select 0, 2 from seq_1_to_49;
+insert into t1(es,er) select 0, 3 from seq_1_to_951;
+insert into t1(es,er) select 0, 3 from seq_1_to_1054;
+insert into t1(es,er) select 0, 6 from seq_1_to_25;
+insert into t1(es,er) select 0, 11 from seq_1_to_1;
+insert into t1(es,er) select 1, 1 from seq_1_to_45;
+insert into t1(es,er) select 1, 2 from seq_1_to_16;
+insert into t1(es,er) select 1, 3 from seq_1_to_511;
+insert into t1(es,er) select 1, 4 from seq_1_to_687;
+insert into t1(es,er) select 1, 6 from seq_1_to_50;
+insert into t1(es,er) select 1, 7 from seq_1_to_4;
+insert into t1(es,er) select 1, 11 from seq_1_to_1;
+insert into t1(es,er) select 2, 1 from seq_1_to_82;
+insert into t1(es,er) select 2, 2 from seq_1_to_82;
+insert into t1(es,er) select 2, 3 from seq_1_to_1626;
+insert into t1(es,er) select 2, 4 from seq_1_to_977;
+insert into t1(es,er) select 2, 6 from seq_1_to_33;
+insert into t1(es,er) select 2, 11 from seq_1_to_1;
+insert into t1(es,er) select 3, 1 from seq_1_to_245;
+insert into t1(es,er) select 3, 2 from seq_1_to_81;
+insert into t1(es,er) select 3, 3 from seq_1_to_852;
+insert into t1(es,er) select 3, 4 from seq_1_to_2243;
+insert into t1(es,er) select 3, 6 from seq_1_to_44;
+insert into t1(es,er) select 3, 11 from seq_1_to_1;
+insert into t1(es,er) select 4, 1 from seq_1_to_91;
+insert into t1(es,er) select 4, 2 from seq_1_to_83;
+insert into t1(es,er) select 4, 3 from seq_1_to_297;
+insert into t1(es,er) select 4, 4 from seq_1_to_2456;
+insert into t1(es,er) select 4, 6 from seq_1_to_19;
+insert into t1(es,er) select 4, 11 from seq_1_to_1;
+update t1 set p='foobar';
+update t1 set x=0;
+set @save_isp=@@innodb_stats_persistent;
+set global innodb_stats_persistent= 1;
+analyze table t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	Engine-independent statistics collected
+test.t1	analyze	status	OK
+set optimizer_switch='index_merge_sort_intersection=on';
+SELECT * FROM t1
+WHERE ((p = 'foo' AND er != 4) OR er = 4 ) AND (es >= 4) LIMIT 2;
+id	p	es	er	x
+14645	foobar	4	4	0
+14646	foobar	4	4	0
+EXPLAIN EXTENDED SELECT * FROM t1
+WHERE ((p = 'foo' AND er != 4) OR er = 4 ) AND (es >= 4) LIMIT 2;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	range	es,er,p	es	1	NULL	#	100.00	Using index condition; Using where
+Warnings:
+Note	1003	select `test`.`t1`.`id` AS `id`,`test`.`t1`.`p` AS `p`,`test`.`t1`.`es` AS `es`,`test`.`t1`.`er` AS `er`,`test`.`t1`.`x` AS `x` from `test`.`t1` where (`test`.`t1`.`p` = 'foo' and `test`.`t1`.`er` <> 4 or `test`.`t1`.`er` = 4) and `test`.`t1`.`es` >= 4 limit 2
+set optimizer_switch='index_merge_sort_intersection=off';
+SELECT * FROM t1
+WHERE ((p = 'foo' AND er != 4) OR er = 4 ) AND (es >= 4) LIMIT 2;
+id	p	es	er	x
+14645	foobar	4	4	0
+14646	foobar	4	4	0
+EXPLAIN EXTENDED SELECT * FROM t1
+WHERE ((p = 'foo' AND er != 4) OR er = 4 ) AND (es >= 4) LIMIT 2;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	range	es,er,p	es	1	NULL	#	100.00	Using index condition; Using where
+Warnings:
+Note	1003	select `test`.`t1`.`id` AS `id`,`test`.`t1`.`p` AS `p`,`test`.`t1`.`es` AS `es`,`test`.`t1`.`er` AS `er`,`test`.`t1`.`x` AS `x` from `test`.`t1` where (`test`.`t1`.`p` = 'foo' and `test`.`t1`.`er` <> 4 or `test`.`t1`.`er` = 4) and `test`.`t1`.`es` >= 4 limit 2
+set optimizer_switch='index_merge_sort_intersection=on';
+SELECT * FROM t1
+WHERE ((p = 'foo' AND er < 6) OR er >=2 ) AND (es >= 4) LIMIT 2;
+id	p	es	er	x
+14007	foobar	4	2	0
+14008	foobar	4	2	0
+EXPLAIN EXTENDED SELECT * FROM t1
+WHERE ((p = 'foo' AND er < 6) OR er >=2 ) AND (es >= 4) LIMIT 2;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	range	es,er,p	es	1	NULL	#	100.00	Using index condition; Using where
+Warnings:
+Note	1003	select `test`.`t1`.`id` AS `id`,`test`.`t1`.`p` AS `p`,`test`.`t1`.`es` AS `es`,`test`.`t1`.`er` AS `er`,`test`.`t1`.`x` AS `x` from `test`.`t1` where (`test`.`t1`.`p` = 'foo' and `test`.`t1`.`er` < 6 or `test`.`t1`.`er` >= 2) and `test`.`t1`.`es` >= 4 limit 2
+set optimizer_switch='index_merge_sort_intersection=off';
+SELECT * FROM t1
+WHERE ((p = 'foo' AND er < 6) OR er >=2 ) AND (es >= 4) LIMIT 2;
+id	p	es	er	x
+14007	foobar	4	2	0
+14008	foobar	4	2	0
+EXPLAIN EXTENDED SELECT * FROM t1
+WHERE ((p = 'foo' AND er < 6) OR er >=2 ) AND (es >= 4) LIMIT 2;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	range	es,er,p	es	1	NULL	#	100.00	Using index condition; Using where
+Warnings:
+Note	1003	select `test`.`t1`.`id` AS `id`,`test`.`t1`.`p` AS `p`,`test`.`t1`.`es` AS `es`,`test`.`t1`.`er` AS `er`,`test`.`t1`.`x` AS `x` from `test`.`t1` where (`test`.`t1`.`p` = 'foo' and `test`.`t1`.`er` < 6 or `test`.`t1`.`er` >= 2) and `test`.`t1`.`es` >= 4 limit 2
+set optimizer_switch='index_merge_sort_intersection=default';
+set global innodb_stats_persistent= @save_isp;
+DROP TABLE t1;
+# End of 10.2 tests
+#
 # MDEV-19634: Assertion `0' failed in row_sel_convert_mysql_key_to_innobase,
 # [Warning] InnoDB: Using a partial-field key prefix in search
 #
diff --git a/mysql-test/main/range_innodb.test b/mysql-test/main/range_innodb.test
index f79104fde85..8b9771d1d1e 100644
--- a/mysql-test/main/range_innodb.test
+++ b/mysql-test/main/range_innodb.test
@@ -118,6 +118,99 @@ set @@optimizer_switch= @optimizer_switch_save;
 --echo # End of 10.1 tests
 
 --echo #
+--echo # MDEV-27262: Index intersection with full scan over an index
+--echo #
+
+--source include/have_sequence.inc
+
+CREATE TABLE t1 (
+  id int(10) unsigned NOT NULL AUTO_INCREMENT,
+  p char(32) DEFAULT NULL,
+  es tinyint(3) unsigned NOT NULL DEFAULT 0,
+  er tinyint(3) unsigned NOT NULL DEFAULT 0,
+  x mediumint(8) unsigned NOT NULL DEFAULT 0,
+  PRIMARY KEY (id),
+  INDEX es (es),
+  INDEX x (x),
+  INDEX er (er,x),
+  INDEX p (p)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+insert into t1(es,er) select 0, 1 from seq_1_to_45;
+insert into t1(es,er) select 0, 2 from seq_1_to_49;
+insert into t1(es,er) select 0, 3 from seq_1_to_951;
+insert into t1(es,er) select 0, 3 from seq_1_to_1054;
+insert into t1(es,er) select 0, 6 from seq_1_to_25;
+insert into t1(es,er) select 0, 11 from seq_1_to_1;
+insert into t1(es,er) select 1, 1 from seq_1_to_45;
+insert into t1(es,er) select 1, 2 from seq_1_to_16;
+insert into t1(es,er) select 1, 3 from seq_1_to_511;
+insert into t1(es,er) select 1, 4 from seq_1_to_687;
+insert into t1(es,er) select 1, 6 from seq_1_to_50;
+insert into t1(es,er) select 1, 7 from seq_1_to_4;
+insert into t1(es,er) select 1, 11 from seq_1_to_1;
+insert into t1(es,er) select 2, 1 from seq_1_to_82;
+insert into t1(es,er) select 2, 2 from seq_1_to_82;
+insert into t1(es,er) select 2, 3 from seq_1_to_1626;
+insert into t1(es,er) select 2, 4 from seq_1_to_977;
+insert into t1(es,er) select 2, 6 from seq_1_to_33;
+insert into t1(es,er) select 2, 11 from seq_1_to_1;
+insert into t1(es,er) select 3, 1 from seq_1_to_245;
+insert into t1(es,er) select 3, 2 from seq_1_to_81;
+insert into t1(es,er) select 3, 3 from seq_1_to_852;
+insert into t1(es,er) select 3, 4 from seq_1_to_2243;
+insert into t1(es,er) select 3, 6 from seq_1_to_44;
+insert into t1(es,er) select 3, 11 from seq_1_to_1;
+insert into t1(es,er) select 4, 1 from seq_1_to_91;
+insert into t1(es,er) select 4, 2 from seq_1_to_83;
+insert into t1(es,er) select 4, 3 from seq_1_to_297;
+insert into t1(es,er) select 4, 4 from seq_1_to_2456;
+insert into t1(es,er) select 4, 6 from seq_1_to_19;
+insert into t1(es,er) select 4, 11 from seq_1_to_1;
+update t1 set p='foobar';
+update t1 set x=0;
+set @save_isp=@@innodb_stats_persistent;
+set global innodb_stats_persistent= 1;
+analyze table t1;
+
+let $q=
+SELECT * FROM t1
+  WHERE ((p = 'foo' AND er != 4) OR er = 4 ) AND (es >= 4) LIMIT 2;
+
+set optimizer_switch='index_merge_sort_intersection=on';
+eval $q;
+--replace_column 9 #
+eval EXPLAIN EXTENDED $q;
+
+set optimizer_switch='index_merge_sort_intersection=off';
+# execution of $q and explain for it led to an assertion failure in 10.4
+# (with the optimizer switch rowid_filter set to 'on')
+eval $q;
+--replace_column 9 #
+eval EXPLAIN EXTENDED $q;
+
+let $q=
+SELECT * FROM t1
+  WHERE ((p = 'foo' AND er < 6) OR er >=2 ) AND (es >= 4) LIMIT 2;
+
+set optimizer_switch='index_merge_sort_intersection=on';
+eval $q;
+--replace_column 9 #
+eval EXPLAIN EXTENDED $q;
+
+set optimizer_switch='index_merge_sort_intersection=off';
+eval $q;
+--replace_column 9 #
+eval EXPLAIN EXTENDED $q;
+
+set optimizer_switch='index_merge_sort_intersection=default';
+
+set global innodb_stats_persistent= @save_isp;
+DROP TABLE t1;
+
+--echo # End of 10.2 tests
+
+--echo #
 --echo # MDEV-19634: Assertion `0' failed in row_sel_convert_mysql_key_to_innobase,
 --echo # [Warning] InnoDB: Using a partial-field key prefix in search
 --echo #
diff --git a/mysql-test/main/range_vs_index_merge.result b/mysql-test/main/range_vs_index_merge.result
index 7108fd89a7d..1729b95a105 100644
--- a/mysql-test/main/range_vs_index_merge.result
+++ b/mysql-test/main/range_vs_index_merge.result
@@ -1810,7 +1810,7 @@ EXPLAIN
 SELECT * FROM t1
 WHERE a BETWEEN 4 AND 5 AND b IN (255,4) OR a IN (2,14,25) OR (a<2 or a>2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	PRIMARY,idx	PRIMARY	0	NULL	2	Using index condition; Using where
+1	SIMPLE	t1	ALL	PRIMARY,idx	NULL	NULL	NULL	2	Using where
 SELECT * FROM t1
 WHERE a BETWEEN 4 AND 5 AND b IN (255,4) OR a IN (2,14,25) OR (a<2 or a>2);
 a	b
diff --git a/mysql-test/main/rowid_filter_innodb.result b/mysql-test/main/rowid_filter_innodb.result
index 44dd89fa722..49e74d1ba2d 100644
--- a/mysql-test/main/rowid_filter_innodb.result
+++ b/mysql-test/main/rowid_filter_innodb.result
@@ -2971,3 +2971,48 @@ set optimizer_switch=@save_optimizer_switch;
 set join_cache_level=@save_join_cache_level;
 drop table filt, acei, acli;
 set global innodb_stats_persistent= @stats.save;
+#
+# MDEV-22846: ref access with full scan on keys with NULLs + rowid_filter
+#
+set @stats.save= @@innodb_stats_persistent;
+set global innodb_stats_persistent=0;
+CREATE TABLE t1 (pk int NOT NULL, c1 varchar(1)) engine=innodb;
+INSERT INTO t1 VALUES
+(1,NULL),(15,'o'),(16,'x'),(19,'t'),(35,'k'),(36,'h'),(42,'t'),(43,'h'),
+(53,'l'),(62,'a'),(71,NULL),(79,'u'),(128,'y'),(129,NULL),(133,NULL);
+CREATE TABLE t2 (
+i1 int, c1 varchar(1) NOT NULL, KEY c1 (c1), KEY i1 (i1)
+) engine=innodb;
+INSERT INTO t2 VALUES
+(1,'1'),(NULL,'1'),(42,'t'),(NULL,'1'),(79,'u'),(NULL,'1'),
+(NULL,'4'),(NULL,'4'),(NULL,'1'),(NULL,'u'),(2,'1'),(NULL,'w');
+INSERT INTO t2 SELECT * FROM t2;
+SELECT * FROM t1
+WHERE t1.c1 NOT IN (SELECT t2.c1 FROM t2, t1 AS a1
+WHERE t2.i1 = t1.pk AND t2.i1 IS NOT NULL);
+pk	c1
+15	o
+16	x
+19	t
+35	k
+36	h
+43	h
+53	l
+62	a
+71	NULL
+128	y
+129	NULL
+133	NULL
+EXPLAIN EXTENDED SELECT * FROM t1
+WHERE t1.c1 NOT IN (SELECT t2.c1 FROM t2, t1 AS a1
+WHERE t2.i1 = t1.pk AND t2.i1 IS NOT NULL);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	15	100.00	Using where
+2	DEPENDENT SUBQUERY	t2	ref|filter	c1,i1	c1|i1	3|5	func	6 (33%)	33.33	Using where; Full scan on NULL key; Using rowid filter
+2	DEPENDENT SUBQUERY	a1	ALL	NULL	NULL	NULL	NULL	15	100.00	Using join buffer (flat, BNL join)
+Warnings:
+Note	1276	Field or reference 'test.t1.pk' of SELECT #2 was resolved in SELECT #1
+Note	1003	/* select#1 */ select `test`.`t1`.`pk` AS `pk`,`test`.`t1`.`c1` AS `c1` from `test`.`t1` where !<expr_cache><`test`.`t1`.`c1`,`test`.`t1`.`pk`>(<in_optimizer>(`test`.`t1`.`c1`,<exists>(/* select#2 */ select `test`.`t2`.`c1` from `test`.`t2` join `test`.`t1` `a1` where `test`.`t2`.`i1` = `test`.`t1`.`pk` and `test`.`t2`.`i1` is not null and trigcond(<cache>(`test`.`t1`.`c1`) = `test`.`t2`.`c1`))))
+DROP TABLE t1,t2;
+set global innodb_stats_persistent= @stats.save;
+# End of 10.4 tests
diff --git a/mysql-test/main/rowid_filter_innodb.test b/mysql-test/main/rowid_filter_innodb.test
index bc5518eba8d..97b9aa0102c 100644
--- a/mysql-test/main/rowid_filter_innodb.test
+++ b/mysql-test/main/rowid_filter_innodb.test
@@ -540,3 +540,37 @@ set join_cache_level=@save_join_cache_level;
 drop table filt, acei, acli;
 
 set global innodb_stats_persistent= @stats.save;
+
+--echo #
+--echo # MDEV-22846: ref access with full scan on keys with NULLs + rowid_filter
+--echo #
+
+set @stats.save= @@innodb_stats_persistent;
+set global innodb_stats_persistent=0;
+
+CREATE TABLE t1 (pk int NOT NULL, c1 varchar(1)) engine=innodb;
+INSERT INTO t1 VALUES
+(1,NULL),(15,'o'),(16,'x'),(19,'t'),(35,'k'),(36,'h'),(42,'t'),(43,'h'),
+(53,'l'),(62,'a'),(71,NULL),(79,'u'),(128,'y'),(129,NULL),(133,NULL);
+
+CREATE TABLE t2 (
+i1 int, c1 varchar(1) NOT NULL, KEY c1 (c1), KEY i1 (i1)
+) engine=innodb;
+INSERT INTO t2 VALUES
+(1,'1'),(NULL,'1'),(42,'t'),(NULL,'1'),(79,'u'),(NULL,'1'),
+(NULL,'4'),(NULL,'4'),(NULL,'1'),(NULL,'u'),(2,'1'),(NULL,'w');
+INSERT INTO t2 SELECT * FROM t2;
+
+let $q=
+SELECT * FROM t1
+WHERE t1.c1 NOT IN (SELECT t2.c1 FROM t2, t1 AS a1
+                      WHERE t2.i1 = t1.pk AND t2.i1 IS NOT NULL);
+
+eval $q;
+eval EXPLAIN EXTENDED $q;
+
+DROP TABLE t1,t2;
+
+set global innodb_stats_persistent= @stats.save;
+
+--echo # End of 10.4 tests
diff --git a/mysql-test/main/show.result b/mysql-test/main/show.result
index d1b373d8969..4a9e2738346 100644
--- a/mysql-test/main/show.result
+++ b/mysql-test/main/show.result
@@ -40,5 +40,16 @@ nm	varchar(32)	YES		NULL
 a	int(11)	YES		NULL	
 drop table t1;
 #
+# MDEV-4621 select returns null for information_schema.statistics.collation field
+#
+create table t1 (f varchar(64), key(f));
+select index_name, column_name, collation, cardinality from information_schema.STATISTICS where table_schema='test' and table_name='t1';
+index_name	column_name	collation	cardinality
+f	f	A	NULL
+select index_name, column_name, collation from information_schema.STATISTICS where table_schema='test' and table_name='t1';
+index_name	column_name	collation
+f	f	A
+drop table t1;
+#
 # End of 10.2 tests
 #
diff --git a/mysql-test/main/show.test b/mysql-test/main/show.test
index f2f6efc4e45..9b0b58349d5 100644
--- a/mysql-test/main/show.test
+++ b/mysql-test/main/show.test
@@ -35,5 +35,13 @@ show fields from test.t1 where field in
 drop table t1;
 
 --echo #
+--echo # MDEV-4621 select returns null for information_schema.statistics.collation field
+--echo #
+create table t1 (f varchar(64), key(f));
+select index_name, column_name, collation, cardinality from information_schema.STATISTICS where table_schema='test' and table_name='t1';
+select index_name, column_name, collation from information_schema.STATISTICS where table_schema='test' and table_name='t1';
+drop table t1;
+
+--echo #
 --echo # End of 10.2 tests
 --echo #
diff --git a/mysql-test/main/show_check.result b/mysql-test/main/show_check.result
index f07c19261d0..cc50587cbc1 100644
--- a/mysql-test/main/show_check.result
+++ b/mysql-test/main/show_check.result
@@ -63,20 +63,20 @@ Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
 show index from t1;
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def	information_schema	STATISTICS	STATISTICS	TABLE_NAME	Table	253	64	2	N	1	0	8
-def	information_schema	STATISTICS	STATISTICS	NON_UNIQUE	Non_unique	8	1	1	N	32769	0	63
-def	information_schema	STATISTICS	STATISTICS	INDEX_NAME	Key_name	253	64	7	N	1	0	8
-def	information_schema	STATISTICS	STATISTICS	SEQ_IN_INDEX	Seq_in_index	8	2	1	N	32769	0	63
-def	information_schema	STATISTICS	STATISTICS	COLUMN_NAME	Column_name	253	64	1	N	1	0	8
-def	information_schema	STATISTICS	STATISTICS	COLLATION	Collation	253	1	1	Y	0	0	8
-def	information_schema	STATISTICS	STATISTICS	CARDINALITY	Cardinality	8	21	1	Y	32768	0	63
-def	information_schema	STATISTICS	STATISTICS	SUB_PART	Sub_part	8	3	0	Y	32768	0	63
-def	information_schema	STATISTICS	STATISTICS	PACKED	Packed	253	10	0	Y	0	0	8
-def	information_schema	STATISTICS	STATISTICS	NULLABLE	Null	253	3	0	N	1	0	8
-def	information_schema	STATISTICS	STATISTICS	INDEX_TYPE	Index_type	253	16	5	N	1	0	8
-def	information_schema	STATISTICS	STATISTICS	COMMENT	Comment	253	16	0	Y	0	0	8
-def	information_schema	STATISTICS	STATISTICS	INDEX_COMMENT	Index_comment	253	1024	0	N	1	0	8
-def	information_schema	STATISTICS	STATISTICS	IGNORED	Ignored	253	3	2	N	1	0	8
+def	information_schema	STATISTICS	STATISTICS	TABLE_NAME	Table	253	64	2	N	4097	0	8
+def	information_schema	STATISTICS	STATISTICS	NON_UNIQUE	Non_unique	8	1	1	N	36865	0	63
+def	information_schema	STATISTICS	STATISTICS	INDEX_NAME	Key_name	253	64	7	N	4097	0	8
+def	information_schema	STATISTICS	STATISTICS	SEQ_IN_INDEX	Seq_in_index	8	2	1	N	36865	0	63
+def	information_schema	STATISTICS	STATISTICS	COLUMN_NAME	Column_name	253	64	1	N	4097	0	8
+def	information_schema	STATISTICS	STATISTICS	COLLATION	Collation	253	1	1	Y	4096	0	8
+def	information_schema	STATISTICS	STATISTICS	CARDINALITY	Cardinality	8	21	1	Y	36864	0	63
+def	information_schema	STATISTICS	STATISTICS	SUB_PART	Sub_part	8	3	0	Y	36864	0	63
+def	information_schema	STATISTICS	STATISTICS	PACKED	Packed	253	10	0	Y	4096	0	8
+def	information_schema	STATISTICS	STATISTICS	NULLABLE	Null	253	3	0	N	4097	0	8
+def	information_schema	STATISTICS	STATISTICS	INDEX_TYPE	Index_type	253	16	5	N	4097	0	8
+def	information_schema	STATISTICS	STATISTICS	COMMENT	Comment	253	16	0	Y	4096	0	8
+def	information_schema	STATISTICS	STATISTICS	INDEX_COMMENT	Index_comment	253	1024	0	N	4097	0	8
+def	information_schema	STATISTICS	STATISTICS	IGNORED	Ignored	253	3	2	N	4097	0	8
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment	Ignored
 t1	0	PRIMARY	1	a	A	5	NULL	NULL		BTREE			NO
 t1	1	b	1	b	A	1	NULL	NULL		BTREE			NO
@@ -103,47 +103,47 @@ drop table t1;
 -- after Bug#29394 is implemented.
 show variables like "wait_timeout%";
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def	information_schema	SESSION_VARIABLES	SESSION_VARIABLES	VARIABLE_NAME	Variable_name	253	64	12	N	1	0	8
-def	information_schema	SESSION_VARIABLES	SESSION_VARIABLES	VARIABLE_VALUE	Value	253	2048	5	N	1	0	8
+def	information_schema	SESSION_VARIABLES	SESSION_VARIABLES	VARIABLE_NAME	Variable_name	253	64	12	N	4097	0	8
+def	information_schema	SESSION_VARIABLES	SESSION_VARIABLES	VARIABLE_VALUE	Value	253	2048	5	N	4097	0	8
 Variable_name	Value
 wait_timeout	28800
 show variables like "WAIT_timeout%";
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def	information_schema	SESSION_VARIABLES	SESSION_VARIABLES	VARIABLE_NAME	Variable_name	253	64	12	N	1	0	8
-def	information_schema	SESSION_VARIABLES	SESSION_VARIABLES	VARIABLE_VALUE	Value	253	2048	5	N	1	0	8
+def	information_schema	SESSION_VARIABLES	SESSION_VARIABLES	VARIABLE_NAME	Variable_name	253	64	12	N	4097	0	8
+def	information_schema	SESSION_VARIABLES	SESSION_VARIABLES	VARIABLE_VALUE	Value	253	2048	5	N	4097	0	8
 Variable_name	Value
 wait_timeout	28800
 show variables like "this_doesn't_exists%";
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def	information_schema	SESSION_VARIABLES	SESSION_VARIABLES	VARIABLE_NAME	Variable_name	253	64	0	N	1	0	8
-def	information_schema	SESSION_VARIABLES	SESSION_VARIABLES	VARIABLE_VALUE	Value	253	2048	0	N	1	0	8
+def	information_schema	SESSION_VARIABLES	SESSION_VARIABLES	VARIABLE_NAME	Variable_name	253	64	0	N	4097	0	8
+def	information_schema	SESSION_VARIABLES	SESSION_VARIABLES	VARIABLE_VALUE	Value	253	2048	0	N	4097	0	8
 Variable_name	Value
 show table status from test like "this_doesn't_exists%";
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def	information_schema	TABLES	TABLES	TABLE_NAME	Name	253	64	0	N	1	0	8
-def	information_schema	TABLES	TABLES	ENGINE	Engine	253	64	0	Y	0	0	8
-def	information_schema	TABLES	TABLES	VERSION	Version	8	21	0	Y	32800	0	63
-def	information_schema	TABLES	TABLES	ROW_FORMAT	Row_format	253	10	0	Y	0	0	8
-def	information_schema	TABLES	TABLES	TABLE_ROWS	Rows	8	21	0	Y	32800	0	63
-def	information_schema	TABLES	TABLES	AVG_ROW_LENGTH	Avg_row_length	8	21	0	Y	32800	0	63
-def	information_schema	TABLES	TABLES	DATA_LENGTH	Data_length	8	21	0	Y	32800	0	63
-def	information_schema	TABLES	TABLES	MAX_DATA_LENGTH	Max_data_length	8	21	0	Y	32800	0	63
-def	information_schema	TABLES	TABLES	INDEX_LENGTH	Index_length	8	21	0	Y	32800	0	63
-def	information_schema	TABLES	TABLES	DATA_FREE	Data_free	8	21	0	Y	32800	0	63
-def	information_schema	TABLES	TABLES	AUTO_INCREMENT	Auto_increment	8	21	0	Y	32800	0	63
-def	information_schema	TABLES	TABLES	CREATE_TIME	Create_time	12	19	0	Y	128	0	63
-def	information_schema	TABLES	TABLES	UPDATE_TIME	Update_time	12	19	0	Y	128	0	63
-def	information_schema	TABLES	TABLES	CHECK_TIME	Check_time	12	19	0	Y	128	0	63
-def	information_schema	TABLES	TABLES	TABLE_COLLATION	Collation	253	32	0	Y	0	0	8
-def	information_schema	TABLES	TABLES	CHECKSUM	Checksum	8	21	0	Y	32800	0	63
-def	information_schema	TABLES	TABLES	CREATE_OPTIONS	Create_options	253	2048	0	Y	0	0	8
-def	information_schema	TABLES	TABLES	TABLE_COMMENT	Comment	253	2048	0	N	1	0	8
-def	information_schema	TABLES	TABLES	MAX_INDEX_LENGTH	Max_index_length	8	21	0	Y	32800	0	63
-def	information_schema	TABLES	TABLES	TEMPORARY	Temporary	253	1	0	Y	0	0	8
+def	information_schema	TABLES	TABLES	TABLE_NAME	Name	253	64	0	N	4097	0	8
+def	information_schema	TABLES	TABLES	ENGINE	Engine	253	64	0	Y	4096	0	8
+def	information_schema	TABLES	TABLES	VERSION	Version	8	21	0	Y	36896	0	63
+def	information_schema	TABLES	TABLES	ROW_FORMAT	Row_format	253	10	0	Y	4096	0	8
+def	information_schema	TABLES	TABLES	TABLE_ROWS	Rows	8	21	0	Y	36896	0	63
+def	information_schema	TABLES	TABLES	AVG_ROW_LENGTH	Avg_row_length	8	21	0	Y	36896	0	63
+def	information_schema	TABLES	TABLES	DATA_LENGTH	Data_length	8	21	0	Y	36896	0	63
+def	information_schema	TABLES	TABLES	MAX_DATA_LENGTH	Max_data_length	8	21	0	Y	36896	0	63
+def	information_schema	TABLES	TABLES	INDEX_LENGTH	Index_length	8	21	0	Y	36896	0	63
+def	information_schema	TABLES	TABLES	DATA_FREE	Data_free	8	21	0	Y	36896	0	63
+def	information_schema	TABLES	TABLES	AUTO_INCREMENT	Auto_increment	8	21	0	Y	36896	0	63
+def	information_schema	TABLES	TABLES	CREATE_TIME	Create_time	12	19	0	Y	4224	0	63
+def	information_schema	TABLES	TABLES	UPDATE_TIME	Update_time	12	19	0	Y	4224	0	63
+def	information_schema	TABLES	TABLES	CHECK_TIME	Check_time	12	19	0	Y	4224	0	63
+def	information_schema	TABLES	TABLES	TABLE_COLLATION	Collation	253	32	0	Y	4096	0	8
+def	information_schema	TABLES	TABLES	CHECKSUM	Checksum	8	21	0	Y	36896	0	63
+def	information_schema	TABLES	TABLES	CREATE_OPTIONS	Create_options	253	2048	0	Y	4096	0	8
+def	information_schema	TABLES	TABLES	TABLE_COMMENT	Comment	253	2048	0	N	4097	0	8
+def	information_schema	TABLES	TABLES	MAX_INDEX_LENGTH	Max_index_length	8	21	0	Y	36896	0	63
+def	information_schema	TABLES	TABLES	TEMPORARY	Temporary	253	1	0	Y	4096	0	8
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment	Max_index_length	Temporary
 show databases;
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def	information_schema	SCHEMATA	SCHEMATA	SCHEMA_NAME	Database	253	64	18	N	1	0	8
+def	information_schema	SCHEMATA	SCHEMATA	SCHEMA_NAME	Database	253	64	18	N	4097	0	8
 Database
 information_schema
 mtr
@@ -153,7 +153,7 @@ sys
 test
 show databases like "test%";
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def	information_schema	SCHEMATA	SCHEMATA	SCHEMA_NAME	Database (test%)	253	64	4	N	1	0	8
+def	information_schema	SCHEMATA	SCHEMATA	SCHEMA_NAME	Database (test%)	253	64	4	N	4097	0	8
 Database (test%)
 test
 create table t1 (f1 int not null, f2 int not null, f3 int not null, f4 int not null, primary key(f1,f2,f3,f4));
@@ -649,20 +649,20 @@ PRIMARY KEY(field1(1000))
 );
 show index from t1;
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def	information_schema	STATISTICS	STATISTICS	TABLE_NAME	Table	253	64	2	N	1	0	63
-def	information_schema	STATISTICS	STATISTICS	NON_UNIQUE	Non_unique	8	1	1	N	32769	0	63
-def	information_schema	STATISTICS	STATISTICS	INDEX_NAME	Key_name	253	64	7	N	1	0	63
-def	information_schema	STATISTICS	STATISTICS	SEQ_IN_INDEX	Seq_in_index	8	2	1	N	32769	0	63
-def	information_schema	STATISTICS	STATISTICS	COLUMN_NAME	Column_name	253	64	6	N	1	0	63
-def	information_schema	STATISTICS	STATISTICS	COLLATION	Collation	253	1	1	Y	0	0	63
-def	information_schema	STATISTICS	STATISTICS	CARDINALITY	Cardinality	8	21	1	Y	32768	0	63
-def	information_schema	STATISTICS	STATISTICS	SUB_PART	Sub_part	8	3	4	Y	32768	0	63
-def	information_schema	STATISTICS	STATISTICS	PACKED	Packed	253	10	0	Y	0	0	63
-def	information_schema	STATISTICS	STATISTICS	NULLABLE	Null	253	3	0	N	1	0	63
-def	information_schema	STATISTICS	STATISTICS	INDEX_TYPE	Index_type	253	16	5	N	1	0	63
-def	information_schema	STATISTICS	STATISTICS	COMMENT	Comment	253	16	0	Y	0	0	63
-def	information_schema	STATISTICS	STATISTICS	INDEX_COMMENT	Index_comment	253	1024	0	N	1	0	63
-def	information_schema	STATISTICS	STATISTICS	IGNORED	Ignored	253	3	2	N	1	0	63
+def	information_schema	STATISTICS	STATISTICS	TABLE_NAME	Table	253	64	2	N	4097	0	63
+def	information_schema	STATISTICS	STATISTICS	NON_UNIQUE	Non_unique	8	1	1	N	36865	0	63
+def	information_schema	STATISTICS	STATISTICS	INDEX_NAME	Key_name	253	64	7	N	4097	0	63
+def	information_schema	STATISTICS	STATISTICS	SEQ_IN_INDEX	Seq_in_index	8	2	1	N	36865	0	63
+def	information_schema	STATISTICS	STATISTICS	COLUMN_NAME	Column_name	253	64	6	N	4097	0	63
+def	information_schema	STATISTICS	STATISTICS	COLLATION	Collation	253	1	1	Y	4096	0	63
+def	information_schema	STATISTICS	STATISTICS	CARDINALITY	Cardinality	8	21	1	Y	36864	0	63
+def	information_schema	STATISTICS	STATISTICS	SUB_PART	Sub_part	8	3	4	Y	36864	0	63
+def	information_schema	STATISTICS	STATISTICS	PACKED	Packed	253	10	0	Y	4096	0	63
+def	information_schema	STATISTICS	STATISTICS	NULLABLE	Null	253	3	0	N	4097	0	63
+def	information_schema	STATISTICS	STATISTICS	INDEX_TYPE	Index_type	253	16	5	N	4097	0	63
+def	information_schema	STATISTICS	STATISTICS	COMMENT	Comment	253	16	0	Y	4096	0	63
+def	information_schema	STATISTICS	STATISTICS	INDEX_COMMENT	Index_comment	253	1024	0	N	4097	0	63
+def	information_schema	STATISTICS	STATISTICS	IGNORED	Ignored	253	3	2	N	4097	0	63
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment	Ignored
 t1	0	PRIMARY	1	field1	A	0	1000	NULL		BTREE			NO
 drop table t1;
@@ -877,21 +877,21 @@ set names utf8;
 ----------------------------------------------------------------
 SHOW CHARACTER SET LIKE 'utf8mb3';
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def	information_schema	CHARACTER_SETS	CHARACTER_SETS	CHARACTER_SET_NAME	Charset	253	96	7	N	1	0	33
-def	information_schema	CHARACTER_SETS	CHARACTER_SETS	DESCRIPTION	Description	253	180	13	N	1	0	33
-def	information_schema	CHARACTER_SETS	CHARACTER_SETS	DEFAULT_COLLATE_NAME	Default collation	253	96	18	N	1	0	33
-def	information_schema	CHARACTER_SETS	CHARACTER_SETS	MAXLEN	Maxlen	8	3	1	N	32769	0	63
+def	information_schema	CHARACTER_SETS	CHARACTER_SETS	CHARACTER_SET_NAME	Charset	253	96	7	N	4097	0	33
+def	information_schema	CHARACTER_SETS	CHARACTER_SETS	DESCRIPTION	Description	253	180	13	N	4097	0	33
+def	information_schema	CHARACTER_SETS	CHARACTER_SETS	DEFAULT_COLLATE_NAME	Default collation	253	96	18	N	4097	0	33
+def	information_schema	CHARACTER_SETS	CHARACTER_SETS	MAXLEN	Maxlen	8	3	1	N	36865	0	63
 Charset	Description	Default collation	Maxlen
 utf8mb3	UTF-8 Unicode	utf8mb3_general_ci	3
 ----------------------------------------------------------------
 SHOW COLLATION LIKE 'latin1_bin';
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def	information_schema	COLLATIONS	COLLATIONS	COLLATION_NAME	Collation	253	96	10	N	1	0	33
-def	information_schema	COLLATIONS	COLLATIONS	CHARACTER_SET_NAME	Charset	253	96	6	N	1	0	33
-def	information_schema	COLLATIONS	COLLATIONS	ID	Id	8	11	2	N	32769	0	63
-def	information_schema	COLLATIONS	COLLATIONS	IS_DEFAULT	Default	253	9	0	N	1	0	33
-def	information_schema	COLLATIONS	COLLATIONS	IS_COMPILED	Compiled	253	9	3	N	1	0	33
-def	information_schema	COLLATIONS	COLLATIONS	SORTLEN	Sortlen	8	3	1	N	32769	0	63
+def	information_schema	COLLATIONS	COLLATIONS	COLLATION_NAME	Collation	253	96	10	N	4097	0	33
+def	information_schema	COLLATIONS	COLLATIONS	CHARACTER_SET_NAME	Charset	253	96	6	N	4097	0	33
+def	information_schema	COLLATIONS	COLLATIONS	ID	Id	8	11	2	N	36865	0	63
+def	information_schema	COLLATIONS	COLLATIONS	IS_DEFAULT	Default	253	9	0	N	4097	0	33
+def	information_schema	COLLATIONS	COLLATIONS	IS_COMPILED	Compiled	253	9	3	N	4097	0	33
+def	information_schema	COLLATIONS	COLLATIONS	SORTLEN	Sortlen	8	3	1	N	36865	0	63
 Collation	Charset	Id	Default	Compiled	Sortlen
 latin1_bin	latin1	47		Yes	1
 ----------------------------------------------------------------
@@ -904,7 +904,7 @@ mysqltest1	CREATE DATABASE `mysqltest1` /*!40100 DEFAULT CHARACTER SET latin1 */
 ----------------------------------------------------------------
 SHOW DATABASES LIKE 'mysqltest1';
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def	information_schema	SCHEMATA	SCHEMATA	SCHEMA_NAME	Database (mysqltest1)	253	192	10	N	1	0	33
+def	information_schema	SCHEMATA	SCHEMATA	SCHEMA_NAME	Database (mysqltest1)	253	192	10	N	4097	0	33
 Database (mysqltest1)
 mysqltest1
 ----------------------------------------------------------------
@@ -920,20 +920,20 @@ t1	CREATE TABLE `t1` (
 ----------------------------------------------------------------
 SHOW INDEX FROM t1;
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def	information_schema	STATISTICS	STATISTICS	TABLE_NAME	Table	253	192	2	N	1	0	33
-def	information_schema	STATISTICS	STATISTICS	NON_UNIQUE	Non_unique	8	1	1	N	32769	0	63
-def	information_schema	STATISTICS	STATISTICS	INDEX_NAME	Key_name	253	192	7	N	1	0	33
-def	information_schema	STATISTICS	STATISTICS	SEQ_IN_INDEX	Seq_in_index	8	2	1	N	32769	0	63
-def	information_schema	STATISTICS	STATISTICS	COLUMN_NAME	Column_name	253	192	1	N	1	0	33
-def	information_schema	STATISTICS	STATISTICS	COLLATION	Collation	253	3	1	Y	0	0	33
-def	information_schema	STATISTICS	STATISTICS	CARDINALITY	Cardinality	8	21	1	Y	32768	0	63
-def	information_schema	STATISTICS	STATISTICS	SUB_PART	Sub_part	8	3	0	Y	32768	0	63
-def	information_schema	STATISTICS	STATISTICS	PACKED	Packed	253	30	0	Y	0	0	33
-def	information_schema	STATISTICS	STATISTICS	NULLABLE	Null	253	9	0	N	1	0	33
-def	information_schema	STATISTICS	STATISTICS	INDEX_TYPE	Index_type	253	48	5	N	1	0	33
-def	information_schema	STATISTICS	STATISTICS	COMMENT	Comment	253	48	0	Y	0	0	33
-def	information_schema	STATISTICS	STATISTICS	INDEX_COMMENT	Index_comment	253	3072	0	N	1	0	33
-def	information_schema	STATISTICS	STATISTICS	IGNORED	Ignored	253	9	2	N	1	0	33
+def	information_schema	STATISTICS	STATISTICS	TABLE_NAME	Table	253	192	2	N	4097	0	33
+def	information_schema	STATISTICS	STATISTICS	NON_UNIQUE	Non_unique	8	1	1	N	36865	0	63
+def	information_schema	STATISTICS	STATISTICS	INDEX_NAME	Key_name	253	192	7	N	4097	0	33
+def	information_schema	STATISTICS	STATISTICS	SEQ_IN_INDEX	Seq_in_index	8	2	1	N	36865	0	63
+def	information_schema	STATISTICS	STATISTICS	COLUMN_NAME	Column_name	253	192	1	N	4097	0	33
+def	information_schema	STATISTICS	STATISTICS	COLLATION	Collation	253	3	1	Y	4096	0	33
+def	information_schema	STATISTICS	STATISTICS	CARDINALITY	Cardinality	8	21	1	Y	36864	0	63
+def	information_schema	STATISTICS	STATISTICS	SUB_PART	Sub_part	8	3	0	Y	36864	0	63
+def	information_schema	STATISTICS	STATISTICS	PACKED	Packed	253	30	0	Y	4096	0	33
+def	information_schema	STATISTICS	STATISTICS	NULLABLE	Null	253	9	0	N	4097	0	33
+def	information_schema	STATISTICS	STATISTICS	INDEX_TYPE	Index_type	253	48	5	N	4097	0	33
+def	information_schema	STATISTICS	STATISTICS	COMMENT	Comment	253	48	0	Y	4096	0	33
+def	information_schema	STATISTICS	STATISTICS	INDEX_COMMENT	Index_comment	253	3072	0	N	4097	0	33
+def	information_schema	STATISTICS	STATISTICS	IGNORED	Ignored	253	9	2	N	4097	0	33
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment	Ignored
 t1	0	PRIMARY	1	c	A	0	NULL	NULL		BTREE			NO
 ----------------------------------------------------------------
@@ -950,15 +950,15 @@ TABLE_COMMENT
 FROM INFORMATION_SCHEMA.TABLES
 WHERE table_name = 't1';
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def	information_schema	TABLES	TABLES	TABLE_CATALOG	TABLE_CATALOG	253	1536	3	N	1	0	33
-def	information_schema	TABLES	TABLES	TABLE_SCHEMA	TABLE_SCHEMA	253	192	4	N	1	0	33
-def	information_schema	TABLES	TABLES	TABLE_NAME	TABLE_NAME	253	192	2	N	1	0	33
-def	information_schema	TABLES	TABLES	TABLE_TYPE	TABLE_TYPE	253	192	10	N	1	0	33
-def	information_schema	TABLES	TABLES	ENGINE	ENGINE	253	192	6	Y	0	0	33
-def	information_schema	TABLES	TABLES	ROW_FORMAT	ROW_FORMAT	253	30	5	Y	0	0	33
-def	information_schema	TABLES	TABLES	TABLE_COLLATION	TABLE_COLLATION	253	96	17	Y	0	0	33
-def	information_schema	TABLES	TABLES	CREATE_OPTIONS	CREATE_OPTIONS	253	6144	0	Y	0	0	33
-def	information_schema	TABLES	TABLES	TABLE_COMMENT	TABLE_COMMENT	253	6144	0	N	1	0	33
+def	information_schema	TABLES	TABLES	TABLE_CATALOG	TABLE_CATALOG	253	1536	3	N	4097	0	33
+def	information_schema	TABLES	TABLES	TABLE_SCHEMA	TABLE_SCHEMA	253	192	4	N	4097	0	33
+def	information_schema	TABLES	TABLES	TABLE_NAME	TABLE_NAME	253	192	2	N	4097	0	33
+def	information_schema	TABLES	TABLES	TABLE_TYPE	TABLE_TYPE	253	192	10	N	4097	0	33
+def	information_schema	TABLES	TABLES	ENGINE	ENGINE	253	192	6	Y	4096	0	33
+def	information_schema	TABLES	TABLES	ROW_FORMAT	ROW_FORMAT	253	30	5	Y	4096	0	33
+def	information_schema	TABLES	TABLES	TABLE_COLLATION	TABLE_COLLATION	253	96	17	Y	4096	0	33
+def	information_schema	TABLES	TABLES	CREATE_OPTIONS	CREATE_OPTIONS	253	6144	0	Y	4096	0	33
+def	information_schema	TABLES	TABLES	TABLE_COMMENT	TABLE_COMMENT	253	6144	0	N	4097	0	33
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	ROW_FORMAT	TABLE_COLLATION	CREATE_OPTIONS	TABLE_COMMENT
 def	test	t1	BASE TABLE	MyISAM	Fixed	latin1_swedish_ci		
 ----------------------------------------------------------------
@@ -980,53 +980,53 @@ COLUMN_COMMENT
 FROM INFORMATION_SCHEMA.COLUMNS
 WHERE table_name = 't1';
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def	information_schema	COLUMNS	COLUMNS	TABLE_CATALOG	TABLE_CATALOG	253	1536	3	N	1	0	33
-def	information_schema	COLUMNS	COLUMNS	TABLE_SCHEMA	TABLE_SCHEMA	253	192	4	N	1	0	33
-def	information_schema	COLUMNS	COLUMNS	TABLE_NAME	TABLE_NAME	253	192	2	N	1	0	33
-def	information_schema	COLUMNS	COLUMNS	COLUMN_NAME	COLUMN_NAME	253	192	1	N	1	0	33
-def	information_schema	COLUMNS	COLUMNS	COLUMN_DEFAULT	COLUMN_DEFAULT	252	589788	0	Y	16	0	33
-def	information_schema	COLUMNS	COLUMNS	IS_NULLABLE	IS_NULLABLE	253	9	2	N	1	0	33
-def	information_schema	COLUMNS	COLUMNS	DATA_TYPE	DATA_TYPE	253	192	3	N	1	0	33
-def	information_schema	COLUMNS	COLUMNS	CHARACTER_SET_NAME	CHARACTER_SET_NAME	253	96	0	Y	0	0	33
-def	information_schema	COLUMNS	COLUMNS	COLLATION_NAME	COLLATION_NAME	253	96	0	Y	0	0	33
-def	information_schema	COLUMNS	COLUMNS	COLUMN_TYPE	COLUMN_TYPE	252	589815	7	N	17	0	33
-def	information_schema	COLUMNS	COLUMNS	COLUMN_KEY	COLUMN_KEY	253	9	3	N	1	0	33
-def	information_schema	COLUMNS	COLUMNS	EXTRA	EXTRA	253	90	0	N	1	0	33
-def	information_schema	COLUMNS	COLUMNS	PRIVILEGES	PRIVILEGES	253	240	31	N	1	0	33
-def	information_schema	COLUMNS	COLUMNS	COLUMN_COMMENT	COLUMN_COMMENT	253	3072	0	N	1	0	33
+def	information_schema	COLUMNS	COLUMNS	TABLE_CATALOG	TABLE_CATALOG	253	1536	3	N	4097	0	33
+def	information_schema	COLUMNS	COLUMNS	TABLE_SCHEMA	TABLE_SCHEMA	253	192	4	N	4097	0	33
+def	information_schema	COLUMNS	COLUMNS	TABLE_NAME	TABLE_NAME	253	192	2	N	4097	0	33
+def	information_schema	COLUMNS	COLUMNS	COLUMN_NAME	COLUMN_NAME	253	192	1	N	4097	0	33
+def	information_schema	COLUMNS	COLUMNS	COLUMN_DEFAULT	COLUMN_DEFAULT	252	589788	0	Y	4112	0	33
+def	information_schema	COLUMNS	COLUMNS	IS_NULLABLE	IS_NULLABLE	253	9	2	N	4097	0	33
+def	information_schema	COLUMNS	COLUMNS	DATA_TYPE	DATA_TYPE	253	192	3	N	4097	0	33
+def	information_schema	COLUMNS	COLUMNS	CHARACTER_SET_NAME	CHARACTER_SET_NAME	253	96	0	Y	4096	0	33
+def	information_schema	COLUMNS	COLUMNS	COLLATION_NAME	COLLATION_NAME	253	96	0	Y	4096	0	33
+def	information_schema	COLUMNS	COLUMNS	COLUMN_TYPE	COLUMN_TYPE	252	589815	7	N	4113	0	33
+def	information_schema	COLUMNS	COLUMNS	COLUMN_KEY	COLUMN_KEY	253	9	3	N	4097	0	33
+def	information_schema	COLUMNS	COLUMNS	EXTRA	EXTRA	253	90	0	N	4097	0	33
+def	information_schema	COLUMNS	COLUMNS	PRIVILEGES	PRIVILEGES	253	240	31	N	4097	0	33
+def	information_schema	COLUMNS	COLUMNS	COLUMN_COMMENT	COLUMN_COMMENT	253	3072	0	N	4097	0	33
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
 def	test	t1	c	NULL	NO	int	NULL	NULL	int(11)	PRI		select,insert,update,references	
 ----------------------------------------------------------------
 SHOW TABLES LIKE 't1';
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def	information_schema	TABLE_NAMES	TABLE_NAMES	TABLE_NAME	Tables_in_test (t1)	253	219	2	N	1	0	33
+def	information_schema	TABLE_NAMES	TABLE_NAMES	TABLE_NAME	Tables_in_test (t1)	253	219	2	N	4097	0	33
 Tables_in_test (t1)
 t1
 ----------------------------------------------------------------
 SHOW COLUMNS FROM t1;
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def	information_schema	COLUMNS	COLUMNS	COLUMN_NAME	Field	253	192	1	N	1	0	33
-def	information_schema	COLUMNS	COLUMNS	COLUMN_TYPE	Type	252	589815	7	N	17	0	33
-def	information_schema	COLUMNS	COLUMNS	IS_NULLABLE	Null	253	9	2	N	1	0	33
-def	information_schema	COLUMNS	COLUMNS	COLUMN_KEY	Key	253	9	3	N	1	0	33
-def	information_schema	COLUMNS	COLUMNS	COLUMN_DEFAULT	Default	252	589788	0	Y	16	0	33
-def	information_schema	COLUMNS	COLUMNS	EXTRA	Extra	253	90	0	N	1	0	33
+def	information_schema	COLUMNS	COLUMNS	COLUMN_NAME	Field	253	192	1	N	4097	0	33
+def	information_schema	COLUMNS	COLUMNS	COLUMN_TYPE	Type	252	589815	7	N	4113	0	33
+def	information_schema	COLUMNS	COLUMNS	IS_NULLABLE	Null	253	9	2	N	4097	0	33
+def	information_schema	COLUMNS	COLUMNS	COLUMN_KEY	Key	253	9	3	N	4097	0	33
+def	information_schema	COLUMNS	COLUMNS	COLUMN_DEFAULT	Default	252	589788	0	Y	4112	0	33
+def	information_schema	COLUMNS	COLUMNS	EXTRA	Extra	253	90	0	N	4097	0	33
 Field	Type	Null	Key	Default	Extra
 c	int(11)	NO	PRI	NULL	
 ----------------------------------------------------------------
 SHOW TRIGGERS LIKE 't1';
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def	information_schema	TRIGGERS	TRIGGERS	TRIGGER_NAME	Trigger	253	192	5	N	1	0	33
-def	information_schema	TRIGGERS	TRIGGERS	EVENT_MANIPULATION	Event	253	18	6	N	1	0	33
-def	information_schema	TRIGGERS	TRIGGERS	EVENT_OBJECT_TABLE	Table	253	192	2	N	1	0	33
-def	information_schema	TRIGGERS	TRIGGERS	ACTION_STATEMENT	Statement	252	589815	10	N	17	0	33
-def	information_schema	TRIGGERS	TRIGGERS	ACTION_TIMING	Timing	253	18	6	N	1	0	33
-def	information_schema	TRIGGERS	TRIGGERS	CREATED	Created	12	22	22	Y	128	2	63
-def	information_schema	TRIGGERS	TRIGGERS	SQL_MODE	sql_mode	253	24576	89	N	1	0	33
-def	information_schema	TRIGGERS	TRIGGERS	DEFINER	Definer	253	1152	14	N	1	0	33
-def	information_schema	TRIGGERS	TRIGGERS	CHARACTER_SET_CLIENT	character_set_client	253	96	6	N	1	0	33
-def	information_schema	TRIGGERS	TRIGGERS	COLLATION_CONNECTION	collation_connection	253	96	6	N	1	0	33
-def	information_schema	TRIGGERS	TRIGGERS	DATABASE_COLLATION	Database Collation	253	96	17	N	1	0	33
+def	information_schema	TRIGGERS	TRIGGERS	TRIGGER_NAME	Trigger	253	192	5	N	4097	0	33
+def	information_schema	TRIGGERS	TRIGGERS	EVENT_MANIPULATION	Event	253	18	6	N	4097	0	33
+def	information_schema	TRIGGERS	TRIGGERS	EVENT_OBJECT_TABLE	Table	253	192	2	N	4097	0	33
+def	information_schema	TRIGGERS	TRIGGERS	ACTION_STATEMENT	Statement	252	589815	10	N	4113	0	33
+def	information_schema	TRIGGERS	TRIGGERS	ACTION_TIMING	Timing	253	18	6	N	4097	0	33
+def	information_schema	TRIGGERS	TRIGGERS	CREATED	Created	12	22	22	Y	4224	2	63
+def	information_schema	TRIGGERS	TRIGGERS	SQL_MODE	sql_mode	253	24576	89	N	4097	0	33
+def	information_schema	TRIGGERS	TRIGGERS	DEFINER	Definer	253	1152	14	N	4097	0	33
+def	information_schema	TRIGGERS	TRIGGERS	CHARACTER_SET_CLIENT	character_set_client	253	96	6	N	4097	0	33
+def	information_schema	TRIGGERS	TRIGGERS	COLLATION_CONNECTION	collation_connection	253	96	6	N	4097	0	33
+def	information_schema	TRIGGERS	TRIGGERS	DATABASE_COLLATION	Database Collation	253	96	17	N	4097	0	33
 Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
 t1_bi	INSERT	t1	SET @a = 1	BEFORE	#	STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	root@localhost	binary	binary	latin1_swedish_ci
 ----------------------------------------------------------------
@@ -1051,28 +1051,28 @@ DEFINER
 FROM INFORMATION_SCHEMA.TRIGGERS
 WHERE trigger_name = 't1_bi';
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def	information_schema	TRIGGERS	TRIGGERS	TRIGGER_CATALOG	TRIGGER_CATALOG	253	1536	3	N	1	0	33
-def	information_schema	TRIGGERS	TRIGGERS	TRIGGER_SCHEMA	TRIGGER_SCHEMA	253	192	4	N	1	0	33
-def	information_schema	TRIGGERS	TRIGGERS	TRIGGER_NAME	TRIGGER_NAME	253	192	5	N	1	0	33
-def	information_schema	TRIGGERS	TRIGGERS	EVENT_MANIPULATION	EVENT_MANIPULATION	253	18	6	N	1	0	33
-def	information_schema	TRIGGERS	TRIGGERS	EVENT_OBJECT_CATALOG	EVENT_OBJECT_CATALOG	253	1536	3	N	1	0	33
-def	information_schema	TRIGGERS	TRIGGERS	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_SCHEMA	253	192	4	N	1	0	33
-def	information_schema	TRIGGERS	TRIGGERS	EVENT_OBJECT_TABLE	EVENT_OBJECT_TABLE	253	192	2	N	1	0	33
-def	information_schema	TRIGGERS	TRIGGERS	ACTION_CONDITION	ACTION_CONDITION	252	589815	0	Y	16	0	33
-def	information_schema	TRIGGERS	TRIGGERS	ACTION_STATEMENT	ACTION_STATEMENT	252	589815	10	N	17	0	33
-def	information_schema	TRIGGERS	TRIGGERS	ACTION_ORIENTATION	ACTION_ORIENTATION	253	27	3	N	1	0	33
-def	information_schema	TRIGGERS	TRIGGERS	ACTION_TIMING	ACTION_TIMING	253	18	6	N	1	0	33
-def	information_schema	TRIGGERS	TRIGGERS	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_OLD_TABLE	253	192	0	Y	0	0	33
-def	information_schema	TRIGGERS	TRIGGERS	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_NEW_TABLE	253	192	0	Y	0	0	33
-def	information_schema	TRIGGERS	TRIGGERS	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_OLD_ROW	253	9	3	N	1	0	33
-def	information_schema	TRIGGERS	TRIGGERS	ACTION_REFERENCE_NEW_ROW	ACTION_REFERENCE_NEW_ROW	253	9	3	N	1	0	33
-def	information_schema	TRIGGERS	TRIGGERS	SQL_MODE	SQL_MODE	253	24576	89	N	1	0	33
-def	information_schema	TRIGGERS	TRIGGERS	DEFINER	DEFINER	253	1152	14	N	1	0	33
+def	information_schema	TRIGGERS	TRIGGERS	TRIGGER_CATALOG	TRIGGER_CATALOG	253	1536	3	N	4097	0	33
+def	information_schema	TRIGGERS	TRIGGERS	TRIGGER_SCHEMA	TRIGGER_SCHEMA	253	192	4	N	4097	0	33
+def	information_schema	TRIGGERS	TRIGGERS	TRIGGER_NAME	TRIGGER_NAME	253	192	5	N	4097	0	33
+def	information_schema	TRIGGERS	TRIGGERS	EVENT_MANIPULATION	EVENT_MANIPULATION	253	18	6	N	4097	0	33
+def	information_schema	TRIGGERS	TRIGGERS	EVENT_OBJECT_CATALOG	EVENT_OBJECT_CATALOG	253	1536	3	N	4097	0	33
+def	information_schema	TRIGGERS	TRIGGERS	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_SCHEMA	253	192	4	N	4097	0	33
+def	information_schema	TRIGGERS	TRIGGERS	EVENT_OBJECT_TABLE	EVENT_OBJECT_TABLE	253	192	2	N	4097	0	33
+def	information_schema	TRIGGERS	TRIGGERS	ACTION_CONDITION	ACTION_CONDITION	252	589815	0	Y	4112	0	33
+def	information_schema	TRIGGERS	TRIGGERS	ACTION_STATEMENT	ACTION_STATEMENT	252	589815	10	N	4113	0	33
+def	information_schema	TRIGGERS	TRIGGERS	ACTION_ORIENTATION	ACTION_ORIENTATION	253	27	3	N	4097	0	33
+def	information_schema	TRIGGERS	TRIGGERS	ACTION_TIMING	ACTION_TIMING	253	18	6	N	4097	0	33
+def	information_schema	TRIGGERS	TRIGGERS	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_OLD_TABLE	253	192	0	Y	4096	0	33
+def	information_schema	TRIGGERS	TRIGGERS	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_NEW_TABLE	253	192	0	Y	4096	0	33
+def	information_schema	TRIGGERS	TRIGGERS	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_OLD_ROW	253	9	3	N	4097	0	33
+def	information_schema	TRIGGERS	TRIGGERS	ACTION_REFERENCE_NEW_ROW	ACTION_REFERENCE_NEW_ROW	253	9	3	N	4097	0	33
+def	information_schema	TRIGGERS	TRIGGERS	SQL_MODE	SQL_MODE	253	24576	89	N	4097	0	33
+def	information_schema	TRIGGERS	TRIGGERS	DEFINER	DEFINER	253	1152	14	N	4097	0	33
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	SQL_MODE	DEFINER
 def	test	t1_bi	INSERT	def	test	t1	NULL	SET @a = 1	ROW	BEFORE	NULL	NULL	OLD	NEW	STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	root@localhost
 SELECT CREATED FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name='t1_bi';
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def	information_schema	TRIGGERS	TRIGGERS	CREATED	CREATED	12	22	22	Y	128	2	63
+def	information_schema	TRIGGERS	TRIGGERS	CREATED	CREATED	12	22	22	Y	4224	2	63
 CREATED
 #
 ----------------------------------------------------------------
@@ -1089,17 +1089,17 @@ SELECT *
 FROM INFORMATION_SCHEMA.VIEWS
 WHERE table_name = 'v1';
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def	information_schema	VIEWS	VIEWS	TABLE_CATALOG	TABLE_CATALOG	253	1536	3	N	1	0	33
-def	information_schema	VIEWS	VIEWS	TABLE_SCHEMA	TABLE_SCHEMA	253	192	4	N	1	0	33
-def	information_schema	VIEWS	VIEWS	TABLE_NAME	TABLE_NAME	253	192	2	N	1	0	33
-def	information_schema	VIEWS	VIEWS	VIEW_DEFINITION	VIEW_DEFINITION	252	589815	15	N	17	0	33
-def	information_schema	VIEWS	VIEWS	CHECK_OPTION	CHECK_OPTION	253	24	4	N	1	0	33
-def	information_schema	VIEWS	VIEWS	IS_UPDATABLE	IS_UPDATABLE	253	9	2	N	1	0	33
-def	information_schema	VIEWS	VIEWS	DEFINER	DEFINER	253	1152	14	N	1	0	33
-def	information_schema	VIEWS	VIEWS	SECURITY_TYPE	SECURITY_TYPE	253	21	7	N	1	0	33
-def	information_schema	VIEWS	VIEWS	CHARACTER_SET_CLIENT	CHARACTER_SET_CLIENT	253	96	6	N	1	0	33
-def	information_schema	VIEWS	VIEWS	COLLATION_CONNECTION	COLLATION_CONNECTION	253	96	6	N	1	0	33
-def	information_schema	VIEWS	VIEWS	ALGORITHM	ALGORITHM	253	30	9	N	1	0	33
+def	information_schema	VIEWS	VIEWS	TABLE_CATALOG	TABLE_CATALOG	253	1536	3	N	4097	0	33
+def	information_schema	VIEWS	VIEWS	TABLE_SCHEMA	TABLE_SCHEMA	253	192	4	N	4097	0	33
+def	information_schema	VIEWS	VIEWS	TABLE_NAME	TABLE_NAME	253	192	2	N	4097	0	33
+def	information_schema	VIEWS	VIEWS	VIEW_DEFINITION	VIEW_DEFINITION	252	589815	15	N	4113	0	33
+def	information_schema	VIEWS	VIEWS	CHECK_OPTION	CHECK_OPTION	253	24	4	N	4097	0	33
+def	information_schema	VIEWS	VIEWS	IS_UPDATABLE	IS_UPDATABLE	253	9	2	N	4097	0	33
+def	information_schema	VIEWS	VIEWS	DEFINER	DEFINER	253	1152	14	N	4097	0	33
+def	information_schema	VIEWS	VIEWS	SECURITY_TYPE	SECURITY_TYPE	253	21	7	N	4097	0	33
+def	information_schema	VIEWS	VIEWS	CHARACTER_SET_CLIENT	CHARACTER_SET_CLIENT	253	96	6	N	4097	0	33
+def	information_schema	VIEWS	VIEWS	COLLATION_CONNECTION	COLLATION_CONNECTION	253	96	6	N	4097	0	33
+def	information_schema	VIEWS	VIEWS	ALGORITHM	ALGORITHM	253	30	9	N	4097	0	33
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	ALGORITHM
 def	test	v1	select 1 AS `1`	NONE	NO	root@localhost	DEFINER	binary	binary	UNDEFINED
 ----------------------------------------------------------------
@@ -1137,24 +1137,24 @@ DEFINER
 FROM INFORMATION_SCHEMA.ROUTINES
 WHERE routine_name = 'p1';
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def	information_schema	ROUTINES	ROUTINES	SPECIFIC_NAME	SPECIFIC_NAME	253	192	2	N	1	0	33
-def	information_schema	ROUTINES	ROUTINES	ROUTINE_CATALOG	ROUTINE_CATALOG	253	1536	3	N	1	0	33
-def	information_schema	ROUTINES	ROUTINES	ROUTINE_SCHEMA	ROUTINE_SCHEMA	253	192	4	N	1	0	33
-def	information_schema	ROUTINES	ROUTINES	ROUTINE_NAME	ROUTINE_NAME	253	192	2	N	1	0	33
-def	information_schema	ROUTINES	ROUTINES	ROUTINE_TYPE	ROUTINE_TYPE	253	39	9	N	1	0	33
-def	information_schema	ROUTINES	ROUTINES	DTD_IDENTIFIER	DTD_IDENTIFIER	252	589815	0	Y	16	0	33
-def	information_schema	ROUTINES	ROUTINES	ROUTINE_BODY	ROUTINE_BODY	253	24	3	N	1	0	33
-def	information_schema	ROUTINES	ROUTINES	ROUTINE_DEFINITION	ROUTINE_DEFINITION	252	589815	8	Y	16	0	33
-def	information_schema	ROUTINES	ROUTINES	EXTERNAL_NAME	EXTERNAL_NAME	253	192	0	Y	0	0	33
-def	information_schema	ROUTINES	ROUTINES	EXTERNAL_LANGUAGE	EXTERNAL_LANGUAGE	253	192	0	Y	0	0	33
-def	information_schema	ROUTINES	ROUTINES	PARAMETER_STYLE	PARAMETER_STYLE	253	24	3	N	1	0	33
-def	information_schema	ROUTINES	ROUTINES	IS_DETERMINISTIC	IS_DETERMINISTIC	253	9	2	N	1	0	33
-def	information_schema	ROUTINES	ROUTINES	SQL_DATA_ACCESS	SQL_DATA_ACCESS	253	192	12	N	1	0	33
-def	information_schema	ROUTINES	ROUTINES	SQL_PATH	SQL_PATH	253	192	0	Y	0	0	33
-def	information_schema	ROUTINES	ROUTINES	SECURITY_TYPE	SECURITY_TYPE	253	21	7	N	1	0	33
-def	information_schema	ROUTINES	ROUTINES	SQL_MODE	SQL_MODE	253	24576	89	N	1	0	33
-def	information_schema	ROUTINES	ROUTINES	ROUTINE_COMMENT	ROUTINE_COMMENT	252	589815	0	N	17	0	33
-def	information_schema	ROUTINES	ROUTINES	DEFINER	DEFINER	253	1152	14	N	1	0	33
+def	information_schema	ROUTINES	ROUTINES	SPECIFIC_NAME	SPECIFIC_NAME	253	192	2	N	4097	0	33
+def	information_schema	ROUTINES	ROUTINES	ROUTINE_CATALOG	ROUTINE_CATALOG	253	1536	3	N	4097	0	33
+def	information_schema	ROUTINES	ROUTINES	ROUTINE_SCHEMA	ROUTINE_SCHEMA	253	192	4	N	4097	0	33
+def	information_schema	ROUTINES	ROUTINES	ROUTINE_NAME	ROUTINE_NAME	253	192	2	N	4097	0	33
+def	information_schema	ROUTINES	ROUTINES	ROUTINE_TYPE	ROUTINE_TYPE	253	39	9	N	4097	0	33
+def	information_schema	ROUTINES	ROUTINES	DTD_IDENTIFIER	DTD_IDENTIFIER	252	589815	0	Y	4112	0	33
+def	information_schema	ROUTINES	ROUTINES	ROUTINE_BODY	ROUTINE_BODY	253	24	3	N	4097	0	33
+def	information_schema	ROUTINES	ROUTINES	ROUTINE_DEFINITION	ROUTINE_DEFINITION	252	589815	8	Y	4112	0	33
+def	information_schema	ROUTINES	ROUTINES	EXTERNAL_NAME	EXTERNAL_NAME	253	192	0	Y	4096	0	33
+def	information_schema	ROUTINES	ROUTINES	EXTERNAL_LANGUAGE	EXTERNAL_LANGUAGE	253	192	0	Y	4096	0	33
+def	information_schema	ROUTINES	ROUTINES	PARAMETER_STYLE	PARAMETER_STYLE	253	24	3	N	4097	0	33
+def	information_schema	ROUTINES	ROUTINES	IS_DETERMINISTIC	IS_DETERMINISTIC	253	9	2	N	4097	0	33
+def	information_schema	ROUTINES	ROUTINES	SQL_DATA_ACCESS	SQL_DATA_ACCESS	253	192	12	N	4097	0	33
+def	information_schema	ROUTINES	ROUTINES	SQL_PATH	SQL_PATH	253	192	0	Y	4096	0	33
+def	information_schema	ROUTINES	ROUTINES	SECURITY_TYPE	SECURITY_TYPE	253	21	7	N	4097	0	33
+def	information_schema	ROUTINES	ROUTINES	SQL_MODE	SQL_MODE	253	24576	89	N	4097	0	33
+def	information_schema	ROUTINES	ROUTINES	ROUTINE_COMMENT	ROUTINE_COMMENT	252	589815	0	N	4113	0	33
+def	information_schema	ROUTINES	ROUTINES	DEFINER	DEFINER	253	1152	14	N	4097	0	33
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	SQL_MODE	ROUTINE_COMMENT	DEFINER
 p1	def	test	p1	PROCEDURE	NULL	SQL	SELECT 1	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION		root@localhost
 ----------------------------------------------------------------
@@ -1192,24 +1192,24 @@ DEFINER
 FROM INFORMATION_SCHEMA.ROUTINES
 WHERE routine_name = 'f1';
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def	information_schema	ROUTINES	ROUTINES	SPECIFIC_NAME	SPECIFIC_NAME	253	192	2	N	1	0	33
-def	information_schema	ROUTINES	ROUTINES	ROUTINE_CATALOG	ROUTINE_CATALOG	253	1536	3	N	1	0	33
-def	information_schema	ROUTINES	ROUTINES	ROUTINE_SCHEMA	ROUTINE_SCHEMA	253	192	4	N	1	0	33
-def	information_schema	ROUTINES	ROUTINES	ROUTINE_NAME	ROUTINE_NAME	253	192	2	N	1	0	33
-def	information_schema	ROUTINES	ROUTINES	ROUTINE_TYPE	ROUTINE_TYPE	253	39	8	N	1	0	33
-def	information_schema	ROUTINES	ROUTINES	DTD_IDENTIFIER	DTD_IDENTIFIER	252	589815	7	Y	16	0	33
-def	information_schema	ROUTINES	ROUTINES	ROUTINE_BODY	ROUTINE_BODY	253	24	3	N	1	0	33
-def	information_schema	ROUTINES	ROUTINES	ROUTINE_DEFINITION	ROUTINE_DEFINITION	252	589815	8	Y	16	0	33
-def	information_schema	ROUTINES	ROUTINES	EXTERNAL_NAME	EXTERNAL_NAME	253	192	0	Y	0	0	33
-def	information_schema	ROUTINES	ROUTINES	EXTERNAL_LANGUAGE	EXTERNAL_LANGUAGE	253	192	0	Y	0	0	33
-def	information_schema	ROUTINES	ROUTINES	PARAMETER_STYLE	PARAMETER_STYLE	253	24	3	N	1	0	33
-def	information_schema	ROUTINES	ROUTINES	IS_DETERMINISTIC	IS_DETERMINISTIC	253	9	2	N	1	0	33
-def	information_schema	ROUTINES	ROUTINES	SQL_DATA_ACCESS	SQL_DATA_ACCESS	253	192	12	N	1	0	33
-def	information_schema	ROUTINES	ROUTINES	SQL_PATH	SQL_PATH	253	192	0	Y	0	0	33
-def	information_schema	ROUTINES	ROUTINES	SECURITY_TYPE	SECURITY_TYPE	253	21	7	N	1	0	33
-def	information_schema	ROUTINES	ROUTINES	SQL_MODE	SQL_MODE	253	24576	89	N	1	0	33
-def	information_schema	ROUTINES	ROUTINES	ROUTINE_COMMENT	ROUTINE_COMMENT	252	589815	0	N	17	0	33
-def	information_schema	ROUTINES	ROUTINES	DEFINER	DEFINER	253	1152	14	N	1	0	33
+def	information_schema	ROUTINES	ROUTINES	SPECIFIC_NAME	SPECIFIC_NAME	253	192	2	N	4097	0	33
+def	information_schema	ROUTINES	ROUTINES	ROUTINE_CATALOG	ROUTINE_CATALOG	253	1536	3	N	4097	0	33
+def	information_schema	ROUTINES	ROUTINES	ROUTINE_SCHEMA	ROUTINE_SCHEMA	253	192	4	N	4097	0	33
+def	information_schema	ROUTINES	ROUTINES	ROUTINE_NAME	ROUTINE_NAME	253	192	2	N	4097	0	33
+def	information_schema	ROUTINES	ROUTINES	ROUTINE_TYPE	ROUTINE_TYPE	253	39	8	N	4097	0	33
+def	information_schema	ROUTINES	ROUTINES	DTD_IDENTIFIER	DTD_IDENTIFIER	252	589815	7	Y	4112	0	33
+def	information_schema	ROUTINES	ROUTINES	ROUTINE_BODY	ROUTINE_BODY	253	24	3	N	4097	0	33
+def	information_schema	ROUTINES	ROUTINES	ROUTINE_DEFINITION	ROUTINE_DEFINITION	252	589815	8	Y	4112	0	33
+def	information_schema	ROUTINES	ROUTINES	EXTERNAL_NAME	EXTERNAL_NAME	253	192	0	Y	4096	0	33
+def	information_schema	ROUTINES	ROUTINES	EXTERNAL_LANGUAGE	EXTERNAL_LANGUAGE	253	192	0	Y	4096	0	33
+def	information_schema	ROUTINES	ROUTINES	PARAMETER_STYLE	PARAMETER_STYLE	253	24	3	N	4097	0	33
+def	information_schema	ROUTINES	ROUTINES	IS_DETERMINISTIC	IS_DETERMINISTIC	253	9	2	N	4097	0	33
+def	information_schema	ROUTINES	ROUTINES	SQL_DATA_ACCESS	SQL_DATA_ACCESS	253	192	12	N	4097	0	33
+def	information_schema	ROUTINES	ROUTINES	SQL_PATH	SQL_PATH	253	192	0	Y	4096	0	33
+def	information_schema	ROUTINES	ROUTINES	SECURITY_TYPE	SECURITY_TYPE	253	21	7	N	4097	0	33
+def	information_schema	ROUTINES	ROUTINES	SQL_MODE	SQL_MODE	253	24576	89	N	4097	0	33
+def	information_schema	ROUTINES	ROUTINES	ROUTINE_COMMENT	ROUTINE_COMMENT	252	589815	0	N	4113	0	33
+def	information_schema	ROUTINES	ROUTINES	DEFINER	DEFINER	253	1152	14	N	4097	0	33
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	SQL_MODE	ROUTINE_COMMENT	DEFINER
 f1	def	test	f1	FUNCTION	int(11)	SQL	RETURN 1	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION		root@localhost
 ----------------------------------------------------------------
diff --git a/mysql-test/main/sp.result b/mysql-test/main/sp.result
index c460ecaa7bd..479a56010fb 100644
--- a/mysql-test/main/sp.result
+++ b/mysql-test/main/sp.result
@@ -8478,6 +8478,34 @@ b-c
 0
 drop procedure p1|
 drop function f1|
+#
+# MDEV-24827: MariaDB 10.5.5 crash (sig 11) during a SELECT
+#
+CREATE TABLE t1 (c1 INT PRIMARY KEY, c2 INT);
+CREATE TABLE t2 (c1 INT PRIMARY KEY, c2 INT, KEY idx_c2(c2));
+INSERT INTO t1 (c1, c2) SELECT seq, seq FROM seq_1_to_10000;
+INSERT INTO t2 (c1, c2) SELECT seq, seq FROM seq_1_to_20000;
+CREATE OR REPLACE PROCEDURE p1()
+begin
+DECLARE done INT DEFAULT FALSE;
+DECLARE a INT;
+DECLARE cur1 CURSOR FOR
+SELECT t2.c1 AS c1 FROM t1 LEFT JOIN t2 ON t1.c1 = t2.c1
+WHERE EXISTS (SELECT 1 FROM t1 WHERE c2 = -1) ORDER BY c1;
+DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
+OPEN cur1;
+read_loop: LOOP
+FETCH cur1 INTO a;
+IF done THEN
+LEAVE read_loop;
+END IF;
+END LOOP;
+CLOSE cur1;
+END $
+CALL p1();
+DROP PROCEDURE p1;
+DROP TABLE t1;
+DROP TABLE t2;
 #End of 10.2 tests
 #
 # MDEV-12007 Allow ROW variables as a cursor FETCH target
diff --git a/mysql-test/main/sp.test b/mysql-test/main/sp.test
index 9265b97e7c9..058f42d5e92 100644
--- a/mysql-test/main/sp.test
+++ b/mysql-test/main/sp.test
@@ -1,4 +1,6 @@
 --source include/have_partition.inc
+--source include/have_sequence.inc
+
 #
 # Basic stored PROCEDURE tests
 #
@@ -10031,6 +10033,46 @@ drop procedure p1|
 drop function f1|
 delimiter ;|
 
+--echo #
+--echo # MDEV-24827: MariaDB 10.5.5 crash (sig 11) during a SELECT
+--echo #
+
+CREATE TABLE t1 (c1 INT PRIMARY KEY, c2 INT);
+CREATE TABLE t2 (c1 INT PRIMARY KEY, c2 INT, KEY idx_c2(c2));
+
+INSERT INTO t1 (c1, c2) SELECT seq, seq FROM seq_1_to_10000;
+INSERT INTO t2 (c1, c2) SELECT seq, seq FROM seq_1_to_20000;
+
+--delimiter $
+
+CREATE OR REPLACE PROCEDURE p1()
+begin
+  DECLARE done INT DEFAULT FALSE;
+  DECLARE a INT;
+
+  DECLARE cur1 CURSOR FOR
+    SELECT t2.c1 AS c1 FROM t1 LEFT JOIN t2 ON t1.c1 = t2.c1
+    WHERE EXISTS (SELECT 1 FROM t1 WHERE c2 = -1) ORDER BY c1;
+
+  DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
+
+  OPEN cur1;
+  read_loop: LOOP
+    FETCH cur1 INTO a;
+    IF done THEN
+      LEAVE read_loop;
+    END IF;
+  END LOOP;
+  CLOSE cur1;
+END $
+
+--delimiter ;
+
+CALL p1();
+
+DROP PROCEDURE p1;
+DROP TABLE t1;
+DROP TABLE t2;
 
 --echo #End of 10.2 tests
 
diff --git a/mysql-test/main/subselect_sj.result b/mysql-test/main/subselect_sj.result
index b4ad66458dc..9fd8186b66c 100644
--- a/mysql-test/main/subselect_sj.result
+++ b/mysql-test/main/subselect_sj.result
@@ -3318,4 +3318,22 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	<subquery2>	eq_ref	distinct_key	distinct_key	4	func	1	
 2	MATERIALIZED	t4	ALL	NULL	NULL	NULL	NULL	500	
 drop table t1, t2, t3, t4;
+# 
+# MDEV-20770: Server crashes in JOIN::transform_in_predicates_into_in_subq
+#   upon 2nd execution of PS/SP comparing GEOMETRY with other types
+# 
+CREATE TABLE t1 (a GEOMETRY);
+CREATE TABLE t2 (b INT);
+INSERT INTO t1 VALUES (GeomFromText('POINT(0 0)')),(GeomFromText('POINT(1 1)'));
+INSERT INTO t2 VALUES (1),(2);
+PREPARE stmt FROM "SELECT * from t1 WHERE a IN (SELECT b FROM t2)";
+EXECUTE stmt;
+ERROR HY000: Illegal parameter data types geometry and int for operation '='
+EXECUTE stmt;
+ERROR HY000: Illegal parameter data types geometry and int for operation '='
+EXECUTE stmt;
+ERROR HY000: Illegal parameter data types geometry and int for operation '='
+EXECUTE stmt;
+ERROR HY000: Illegal parameter data types geometry and int for operation '='
+DROP TABLE t1, t2;
 set optimizer_switch=@subselect_sj_tmp;
diff --git a/mysql-test/main/subselect_sj.test b/mysql-test/main/subselect_sj.test
index c5c3354bc32..324f2828de2 100644
--- a/mysql-test/main/subselect_sj.test
+++ b/mysql-test/main/subselect_sj.test
@@ -2995,5 +2995,28 @@ explain select * from t3 where a in (select a from t4);
 
 drop table t1, t2, t3, t4;
 
+--echo # 
+--echo # MDEV-20770: Server crashes in JOIN::transform_in_predicates_into_in_subq
+--echo #   upon 2nd execution of PS/SP comparing GEOMETRY with other types
+--echo # 
+
+CREATE TABLE t1 (a GEOMETRY);
+CREATE TABLE t2 (b INT);
+ 
+INSERT INTO t1 VALUES (GeomFromText('POINT(0 0)')),(GeomFromText('POINT(1 1)'));
+INSERT INTO t2 VALUES (1),(2);
+
+PREPARE stmt FROM "SELECT * from t1 WHERE a IN (SELECT b FROM t2)";
+--error ER_ILLEGAL_PARAMETER_DATA_TYPES2_FOR_OPERATION
+EXECUTE stmt;
+--error ER_ILLEGAL_PARAMETER_DATA_TYPES2_FOR_OPERATION
+EXECUTE stmt;
+--error ER_ILLEGAL_PARAMETER_DATA_TYPES2_FOR_OPERATION
+EXECUTE stmt;
+--error ER_ILLEGAL_PARAMETER_DATA_TYPES2_FOR_OPERATION
+EXECUTE stmt;
+ 
+DROP TABLE t1, t2;
+
 # The following command must be the last one the file 
 set optimizer_switch=@subselect_sj_tmp;
diff --git a/mysql-test/main/subselect_sj_jcl6.result b/mysql-test/main/subselect_sj_jcl6.result
index 2301a03f973..e97c1d5e915 100644
--- a/mysql-test/main/subselect_sj_jcl6.result
+++ b/mysql-test/main/subselect_sj_jcl6.result
@@ -3329,6 +3329,24 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	<subquery2>	eq_ref	distinct_key	distinct_key	4	func	1	
 2	MATERIALIZED	t4	ALL	NULL	NULL	NULL	NULL	500	
 drop table t1, t2, t3, t4;
+# 
+# MDEV-20770: Server crashes in JOIN::transform_in_predicates_into_in_subq
+#   upon 2nd execution of PS/SP comparing GEOMETRY with other types
+# 
+CREATE TABLE t1 (a GEOMETRY);
+CREATE TABLE t2 (b INT);
+INSERT INTO t1 VALUES (GeomFromText('POINT(0 0)')),(GeomFromText('POINT(1 1)'));
+INSERT INTO t2 VALUES (1),(2);
+PREPARE stmt FROM "SELECT * from t1 WHERE a IN (SELECT b FROM t2)";
+EXECUTE stmt;
+ERROR HY000: Illegal parameter data types geometry and int for operation '='
+EXECUTE stmt;
+ERROR HY000: Illegal parameter data types geometry and int for operation '='
+EXECUTE stmt;
+ERROR HY000: Illegal parameter data types geometry and int for operation '='
+EXECUTE stmt;
+ERROR HY000: Illegal parameter data types geometry and int for operation '='
+DROP TABLE t1, t2;
 set optimizer_switch=@subselect_sj_tmp;
 #
 # BUG#49129: Wrong result with IN-subquery with join_cache_level=6 and firstmatch=off
diff --git a/mysql-test/main/thread_pool_info.result b/mysql-test/main/thread_pool_info.result
index 53fa1d1255d..d79a4f8d50b 100644
--- a/mysql-test/main/thread_pool_info.result
+++ b/mysql-test/main/thread_pool_info.result
@@ -1,13 +1,13 @@
 DESC INFORMATION_SCHEMA.THREAD_POOL_GROUPS;
 Field	Type	Null	Key	Default	Extra
-GROUP_ID	int(6)	NO		0	
-CONNECTIONS	int(6)	NO		0	
-THREADS	int(6)	NO		0	
-ACTIVE_THREADS	int(6)	NO		0	
-STANDBY_THREADS	int(6)	NO		0	
-QUEUE_LENGTH	int(6)	NO		0	
-HAS_LISTENER	tinyint(1)	NO		0	
-IS_STALLED	tinyint(1)	NO		0	
+GROUP_ID	int(6)	NO		NULL	
+CONNECTIONS	int(6)	NO		NULL	
+THREADS	int(6)	NO		NULL	
+ACTIVE_THREADS	int(6)	NO		NULL	
+STANDBY_THREADS	int(6)	NO		NULL	
+QUEUE_LENGTH	int(6)	NO		NULL	
+HAS_LISTENER	tinyint(1)	NO		NULL	
+IS_STALLED	tinyint(1)	NO		NULL	
 SELECT COUNT(*)=@@thread_pool_size FROM INFORMATION_SCHEMA.THREAD_POOL_GROUPS;
 COUNT(*)=@@thread_pool_size
 1
@@ -28,17 +28,17 @@ SUM(IS_STALLED)
 0
 DESC INFORMATION_SCHEMA.THREAD_POOL_STATS;
 Field	Type	Null	Key	Default	Extra
-GROUP_ID	int(6)	NO		0	
-THREAD_CREATIONS	bigint(19)	NO		0	
-THREAD_CREATIONS_DUE_TO_STALL	bigint(19)	NO		0	
-WAKES	bigint(19)	NO		0	
-WAKES_DUE_TO_STALL	bigint(19)	NO		0	
-THROTTLES	bigint(19)	NO		0	
-STALLS	bigint(19)	NO		0	
-POLLS_BY_LISTENER	bigint(19)	NO		0	
-POLLS_BY_WORKER	bigint(19)	NO		0	
-DEQUEUES_BY_LISTENER	bigint(19)	NO		0	
-DEQUEUES_BY_WORKER	bigint(19)	NO		0	
+GROUP_ID	int(6)	NO		NULL	
+THREAD_CREATIONS	bigint(19)	NO		NULL	
+THREAD_CREATIONS_DUE_TO_STALL	bigint(19)	NO		NULL	
+WAKES	bigint(19)	NO		NULL	
+WAKES_DUE_TO_STALL	bigint(19)	NO		NULL	
+THROTTLES	bigint(19)	NO		NULL	
+STALLS	bigint(19)	NO		NULL	
+POLLS_BY_LISTENER	bigint(19)	NO		NULL	
+POLLS_BY_WORKER	bigint(19)	NO		NULL	
+DEQUEUES_BY_LISTENER	bigint(19)	NO		NULL	
+DEQUEUES_BY_WORKER	bigint(19)	NO		NULL	
 SELECT SUM(DEQUEUES_BY_LISTENER+DEQUEUES_BY_WORKER) > 0 FROM INFORMATION_SCHEMA.THREAD_POOL_STATS;
 SUM(DEQUEUES_BY_LISTENER+DEQUEUES_BY_WORKER) > 0
 1
@@ -57,8 +57,8 @@ SUM(POLLS_BY_WORKER)
 0
 DESC INFORMATION_SCHEMA.THREAD_POOL_WAITS;
 Field	Type	Null	Key	Default	Extra
-REASON	varchar(16)	NO			
-COUNT	bigint(19)	NO		0	
+REASON	varchar(16)	NO		NULL	
+COUNT	bigint(19)	NO		NULL	
 SELECT REASON FROM INFORMATION_SCHEMA.THREAD_POOL_WAITS;
 REASON
 UNKNOWN
@@ -85,11 +85,11 @@ COUNT
 FLUSH THREAD_POOL_WAITS;
 DESC INFORMATION_SCHEMA.THREAD_POOL_QUEUES;
 Field	Type	Null	Key	Default	Extra
-GROUP_ID	int(6)	NO		0	
-POSITION	int(6)	NO		0	
-PRIORITY	int(1)	NO		0	
+GROUP_ID	int(6)	NO		NULL	
+POSITION	int(6)	NO		NULL	
+PRIORITY	int(1)	NO		NULL	
 CONNECTION_ID	bigint(19) unsigned	YES		NULL	
-QUEUEING_TIME_MICROSECONDS	bigint(19)	NO		0	
+QUEUEING_TIME_MICROSECONDS	bigint(19)	NO		NULL	
 # restart: with restart_parameters
 connect  con1, localhost, root,,test;
 connection con1;
diff --git a/mysql-test/main/trigger-compat.result b/mysql-test/main/trigger-compat.result
index 387d4fb1489..cb2970890f1 100644
--- a/mysql-test/main/trigger-compat.result
+++ b/mysql-test/main/trigger-compat.result
@@ -142,3 +142,298 @@ DROP TRIGGER tr12;
 DROP TRIGGER tr11;
 DROP TABLE t1;
 DROP TABLE t2;
+#
+# MDEV-25659 trigger name is empty after upgrade to 10.4
+#
+# START: Total triggers 1, broken triggers 1, DROP TABLE
+CREATE TABLE t1 (a INT);
+INSERT INTO t1 VALUES (1);
+FLUSH TABLES;
+DELETE FROM t1 WHERE a=1;
+ERROR 42000: Trigger 'tr1' has an error in its body: 'Undeclared variable: unknown_variable'
+INSERT INTO t1 VALUES (2);
+ERROR 42000: Trigger 'tr1' has an error in its body: 'Undeclared variable: unknown_variable'
+SET time_zone='+00:00';
+SHOW TRIGGERS LIKE 't1';
+Trigger	tr1
+Event	DELETE
+Table	t1
+Statement	CREATE DEFINER=`root`@`localhost` TRIGGER tr1 AFTER DELETE ON t1 FOR EACH ROW
+BEGIN
+  IF unknown_variable
+  THEN
+    INSERT INTO t2 VALUES (OLD.a);
+  END IF;
+END
+Timing	AFTER
+Created	2022-01-13 08:23:06.47
+sql_mode	STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
+Definer	
+character_set_client	utf8mb3
+collation_connection	utf8mb3_general_ci
+Database Collation	latin1_swedish_ci
+SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE TRIGGER_NAME='tr1';
+TRIGGER_CATALOG	def
+TRIGGER_SCHEMA	test
+TRIGGER_NAME	tr1
+EVENT_MANIPULATION	DELETE
+EVENT_OBJECT_CATALOG	def
+EVENT_OBJECT_SCHEMA	test
+EVENT_OBJECT_TABLE	t1
+ACTION_ORDER	1
+ACTION_CONDITION	NULL
+ACTION_STATEMENT	CREATE DEFINER=`root`@`localhost` TRIGGER tr1 AFTER DELETE ON t1 FOR EACH ROW
+BEGIN
+  IF unknown_variable
+  THEN
+    INSERT INTO t2 VALUES (OLD.a);
+  END IF;
+END
+ACTION_ORIENTATION	ROW
+ACTION_TIMING	AFTER
+ACTION_REFERENCE_OLD_TABLE	NULL
+ACTION_REFERENCE_NEW_TABLE	NULL
+ACTION_REFERENCE_OLD_ROW	OLD
+ACTION_REFERENCE_NEW_ROW	NEW
+CREATED	2022-01-13 08:23:06.47
+SQL_MODE	STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
+DEFINER	
+CHARACTER_SET_CLIENT	utf8mb3
+COLLATION_CONNECTION	utf8mb3_general_ci
+DATABASE_COLLATION	latin1_swedish_ci
+SET time_zone=DEFAULT;
+# Listing trigger files
+t1.TRG
+tr1.TRN
+# Listing trigger files done
+DROP TABLE t1;
+# Listing trigger files
+# Listing trigger files done
+# END: Total triggers 1, broken triggers 1, DROP TABLE
+# START: Total triggers 1, broken triggers 1, DROP TRIGGER
+CREATE TABLE t1 (a INT);
+INSERT INTO t1 VALUES (1);
+FLUSH TABLES;
+DELETE FROM t1 WHERE a=1;
+ERROR 42000: Trigger 'tr1' has an error in its body: 'Undeclared variable: unknown_variable'
+INSERT INTO t1 VALUES (2);
+ERROR 42000: Trigger 'tr1' has an error in its body: 'Undeclared variable: unknown_variable'
+SET time_zone='+00:00';
+SHOW TRIGGERS LIKE 't1';
+Trigger	tr1
+Event	DELETE
+Table	t1
+Statement	CREATE DEFINER=`root`@`localhost` TRIGGER tr1 AFTER DELETE ON t1 FOR EACH ROW
+BEGIN
+  IF unknown_variable
+  THEN
+    INSERT INTO t2 VALUES (OLD.a);
+  END IF;
+END
+Timing	AFTER
+Created	2022-01-13 08:23:06.47
+sql_mode	STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
+Definer	
+character_set_client	utf8mb3
+collation_connection	utf8mb3_general_ci
+Database Collation	latin1_swedish_ci
+SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE TRIGGER_NAME='tr1';
+TRIGGER_CATALOG	def
+TRIGGER_SCHEMA	test
+TRIGGER_NAME	tr1
+EVENT_MANIPULATION	DELETE
+EVENT_OBJECT_CATALOG	def
+EVENT_OBJECT_SCHEMA	test
+EVENT_OBJECT_TABLE	t1
+ACTION_ORDER	1
+ACTION_CONDITION	NULL
+ACTION_STATEMENT	CREATE DEFINER=`root`@`localhost` TRIGGER tr1 AFTER DELETE ON t1 FOR EACH ROW
+BEGIN
+  IF unknown_variable
+  THEN
+    INSERT INTO t2 VALUES (OLD.a);
+  END IF;
+END
+ACTION_ORIENTATION	ROW
+ACTION_TIMING	AFTER
+ACTION_REFERENCE_OLD_TABLE	NULL
+ACTION_REFERENCE_NEW_TABLE	NULL
+ACTION_REFERENCE_OLD_ROW	OLD
+ACTION_REFERENCE_NEW_ROW	NEW
+CREATED	2022-01-13 08:23:06.47
+SQL_MODE	STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
+DEFINER	
+CHARACTER_SET_CLIENT	utf8mb3
+COLLATION_CONNECTION	utf8mb3_general_ci
+DATABASE_COLLATION	latin1_swedish_ci
+SET time_zone=DEFAULT;
+# Listing trigger files
+t1.TRG
+tr1.TRN
+# Listing trigger files done
+DROP TRIGGER tr1;
+# Listing trigger files
+# Listing trigger files done
+DROP TABLE t1;
+# END: Total triggers 1, broken triggers 1, DROP TRIGGER
+# START: Total triggers 2, broken triggers 1, DROP TABLE
+CREATE TABLE t1 (a INT);
+INSERT INTO t1 VALUES (1);
+FLUSH TABLES;
+DELETE FROM t1 WHERE a=1;
+ERROR 42000: Trigger 'tr1' has an error in its body: 'Undeclared variable: unknown_variable'
+INSERT INTO t1 VALUES (2);
+ERROR 42000: Trigger 'tr1' has an error in its body: 'Undeclared variable: unknown_variable'
+SET time_zone='+00:00';
+SHOW TRIGGERS LIKE 't1';
+Trigger	tr2
+Event	INSERT
+Table	t1
+Statement	INSERT INTO t2 VALUES (NEW.a+100)
+Timing	AFTER
+Created	2022-01-13 10:01:48.74
+sql_mode	STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
+Definer	root@localhost
+character_set_client	utf8mb3
+collation_connection	utf8mb3_general_ci
+Database Collation	latin1_swedish_ci
+Trigger	tr1
+Event	DELETE
+Table	t1
+Statement	CREATE DEFINER=`root`@`localhost` TRIGGER tr1 AFTER DELETE ON t1 FOR EACH ROW
+BEGIN
+  IF unknown_variable
+  THEN
+    INSERT INTO t2 VALUES (OLD.a);
+  END IF;
+END
+Timing	AFTER
+Created	2022-01-13 10:01:48.73
+sql_mode	STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
+Definer	
+character_set_client	utf8mb3
+collation_connection	utf8mb3_general_ci
+Database Collation	latin1_swedish_ci
+SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE TRIGGER_NAME='tr1';
+TRIGGER_CATALOG	def
+TRIGGER_SCHEMA	test
+TRIGGER_NAME	tr1
+EVENT_MANIPULATION	DELETE
+EVENT_OBJECT_CATALOG	def
+EVENT_OBJECT_SCHEMA	test
+EVENT_OBJECT_TABLE	t1
+ACTION_ORDER	1
+ACTION_CONDITION	NULL
+ACTION_STATEMENT	CREATE DEFINER=`root`@`localhost` TRIGGER tr1 AFTER DELETE ON t1 FOR EACH ROW
+BEGIN
+  IF unknown_variable
+  THEN
+    INSERT INTO t2 VALUES (OLD.a);
+  END IF;
+END
+ACTION_ORIENTATION	ROW
+ACTION_TIMING	AFTER
+ACTION_REFERENCE_OLD_TABLE	NULL
+ACTION_REFERENCE_NEW_TABLE	NULL
+ACTION_REFERENCE_OLD_ROW	OLD
+ACTION_REFERENCE_NEW_ROW	NEW
+CREATED	2022-01-13 10:01:48.73
+SQL_MODE	STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
+DEFINER	
+CHARACTER_SET_CLIENT	utf8mb3
+COLLATION_CONNECTION	utf8mb3_general_ci
+DATABASE_COLLATION	latin1_swedish_ci
+SET time_zone=DEFAULT;
+# Listing trigger files
+t1.TRG
+tr1.TRN
+tr2.TRN
+# Listing trigger files done
+DROP TABLE t1;
+# Listing trigger files
+# Listing trigger files done
+# END: Total triggers 2, broken triggers 1, using DROP TABLE
+# START: Total triggers 2, broken triggers 1, DROP TRIGGER
+CREATE TABLE t1 (a INT);
+INSERT INTO t1 VALUES (1);
+FLUSH TABLES;
+DELETE FROM t1 WHERE a=1;
+ERROR 42000: Trigger 'tr1' has an error in its body: 'Undeclared variable: unknown_variable'
+INSERT INTO t1 VALUES (2);
+ERROR 42000: Trigger 'tr1' has an error in its body: 'Undeclared variable: unknown_variable'
+SET time_zone='+00:00';
+SHOW TRIGGERS LIKE 't1';
+Trigger	tr2
+Event	INSERT
+Table	t1
+Statement	INSERT INTO t2 VALUES (NEW.a+100)
+Timing	AFTER
+Created	2022-01-13 10:01:48.74
+sql_mode	STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
+Definer	root@localhost
+character_set_client	utf8mb3
+collation_connection	utf8mb3_general_ci
+Database Collation	latin1_swedish_ci
+Trigger	tr1
+Event	DELETE
+Table	t1
+Statement	CREATE DEFINER=`root`@`localhost` TRIGGER tr1 AFTER DELETE ON t1 FOR EACH ROW
+BEGIN
+  IF unknown_variable
+  THEN
+    INSERT INTO t2 VALUES (OLD.a);
+  END IF;
+END
+Timing	AFTER
+Created	2022-01-13 10:01:48.73
+sql_mode	STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
+Definer	
+character_set_client	utf8mb3
+collation_connection	utf8mb3_general_ci
+Database Collation	latin1_swedish_ci
+SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE TRIGGER_NAME='tr1';
+TRIGGER_CATALOG	def
+TRIGGER_SCHEMA	test
+TRIGGER_NAME	tr1
+EVENT_MANIPULATION	DELETE
+EVENT_OBJECT_CATALOG	def
+EVENT_OBJECT_SCHEMA	test
+EVENT_OBJECT_TABLE	t1
+ACTION_ORDER	1
+ACTION_CONDITION	NULL
+ACTION_STATEMENT	CREATE DEFINER=`root`@`localhost` TRIGGER tr1 AFTER DELETE ON t1 FOR EACH ROW
+BEGIN
+  IF unknown_variable
+  THEN
+    INSERT INTO t2 VALUES (OLD.a);
+  END IF;
+END
+ACTION_ORIENTATION	ROW
+ACTION_TIMING	AFTER
+ACTION_REFERENCE_OLD_TABLE	NULL
+ACTION_REFERENCE_NEW_TABLE	NULL
+ACTION_REFERENCE_OLD_ROW	OLD
+ACTION_REFERENCE_NEW_ROW	NEW
+CREATED	2022-01-13 10:01:48.73
+SQL_MODE	STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
+DEFINER	
+CHARACTER_SET_CLIENT	utf8mb3
+COLLATION_CONNECTION	utf8mb3_general_ci
+DATABASE_COLLATION	latin1_swedish_ci
+SET time_zone=DEFAULT;
+# Listing trigger files
+t1.TRG
+tr1.TRN
+tr2.TRN
+# Listing trigger files done
+DROP TRIGGER tr1;
+# Listing trigger files
+t1.TRG
+tr2.TRN
+# Listing trigger files done
+INSERT INTO t1 VALUES (100);
+ERROR 42S02: Table 'test.t2' doesn't exist
+DROP TABLE t1;
+# Listing trigger files
+# Listing trigger files done
+# END: Total triggers 2, broken triggers 1, using DROP TRIGGER
diff --git a/mysql-test/main/trigger-compat.test b/mysql-test/main/trigger-compat.test
index baf3cad11d6..4d9160c7728 100644
--- a/mysql-test/main/trigger-compat.test
+++ b/mysql-test/main/trigger-compat.test
@@ -289,3 +289,219 @@ DROP TRIGGER tr11;
 
 DROP TABLE t1;
 DROP TABLE t2;
+
+
+--echo #
+--echo # MDEV-25659 trigger name is empty after upgrade to 10.4
+--echo #
+
+--echo # START: Total triggers 1, broken triggers 1, DROP TABLE
+
+CREATE TABLE t1 (a INT);
+INSERT INTO t1 VALUES (1);
+
+--write_file $MYSQLD_DATADIR/test/tr1.TRN
+TYPE=TRIGGERNAME
+trigger_table=t1
+EOF
+
+--write_file $MYSQLD_DATADIR/test/t1.TRG
+TYPE=TRIGGERS
+triggers='CREATE DEFINER=`root`@`localhost` TRIGGER tr1 AFTER DELETE ON t1 FOR EACH ROW\nBEGIN\n  IF unknown_variable\n  THEN\n    INSERT INTO t2 VALUES (OLD.a);\n  END IF;\nEND'
+sql_modes=1411383296
+definers='root@localhost'
+client_cs_names='utf8'
+connection_cl_names='utf8_general_ci'
+db_cl_names='latin1_swedish_ci'
+created=164206218647
+EOF
+
+FLUSH TABLES;
+--error ER_PARSE_ERROR
+DELETE FROM t1 WHERE a=1;
+--error ER_PARSE_ERROR
+INSERT INTO t1 VALUES (2);
+
+SET time_zone='+00:00';
+--vertical_results
+SHOW TRIGGERS LIKE 't1';
+SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE TRIGGER_NAME='tr1';
+--horizontal_results
+SET time_zone=DEFAULT;
+
+--echo # Listing trigger files
+--list_files $MYSQLD_DATADIR/test *.TR?
+--echo # Listing trigger files done
+
+DROP TABLE t1;
+
+--echo # Listing trigger files
+--list_files $MYSQLD_DATADIR/test *.TR?
+--echo # Listing trigger files done
+
+--echo # END: Total triggers 1, broken triggers 1, DROP TABLE
+
+
+--echo # START: Total triggers 1, broken triggers 1, DROP TRIGGER
+
+CREATE TABLE t1 (a INT);
+INSERT INTO t1 VALUES (1);
+
+--write_file $MYSQLD_DATADIR/test/tr1.TRN
+TYPE=TRIGGERNAME
+trigger_table=t1
+EOF
+
+--write_file $MYSQLD_DATADIR/test/t1.TRG
+TYPE=TRIGGERS
+triggers='CREATE DEFINER=`root`@`localhost` TRIGGER tr1 AFTER DELETE ON t1 FOR EACH ROW\nBEGIN\n  IF unknown_variable\n  THEN\n    INSERT INTO t2 VALUES (OLD.a);\n  END IF;\nEND'
+sql_modes=1411383296
+definers='root@localhost'
+client_cs_names='utf8'
+connection_cl_names='utf8_general_ci'
+db_cl_names='latin1_swedish_ci'
+created=164206218647
+EOF
+
+FLUSH TABLES;
+--error ER_PARSE_ERROR
+DELETE FROM t1 WHERE a=1;
+--error ER_PARSE_ERROR
+INSERT INTO t1 VALUES (2);
+
+SET time_zone='+00:00';
+--vertical_results
+SHOW TRIGGERS LIKE 't1';
+SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE TRIGGER_NAME='tr1';
+--horizontal_results
+SET time_zone=DEFAULT;
+
+--echo # Listing trigger files
+--list_files $MYSQLD_DATADIR/test *.TR?
+--echo # Listing trigger files done
+
+DROP TRIGGER tr1;
+
+--echo # Listing trigger files
+--list_files $MYSQLD_DATADIR/test *.TR?
+--echo # Listing trigger files done
+
+DROP TABLE t1;
+
+--echo # END: Total triggers 1, broken triggers 1, DROP TRIGGER
+
+
+--echo # START: Total triggers 2, broken triggers 1, DROP TABLE
+
+CREATE TABLE t1 (a INT);
+INSERT INTO t1 VALUES (1);
+
+--write_file $MYSQLD_DATADIR/test/tr1.TRN
+TYPE=TRIGGERNAME
+trigger_table=t1
+EOF
+
+--write_file $MYSQLD_DATADIR/test/tr2.TRN
+TYPE=TRIGGERNAME
+trigger_table=t1
+EOF
+
+--write_file $MYSQLD_DATADIR/test/t1.TRG
+TYPE=TRIGGERS
+triggers='CREATE DEFINER=`root`@`localhost` TRIGGER tr2 AFTER INSERT ON t1 FOR EACH ROW INSERT INTO t2 VALUES (NEW.a+100)' 'CREATE DEFINER=`root`@`localhost` TRIGGER tr1 AFTER DELETE ON t1 FOR EACH ROW\nBEGIN\n  IF unknown_variable\n  THEN\n    INSERT INTO t2 VALUES (OLD.a);\n  END IF;\nEND'
+sql_modes=1411383296 1411383296
+definers='root@localhost' 'root@localhost'
+client_cs_names='utf8' 'utf8'
+connection_cl_names='utf8_general_ci' 'utf8_general_ci'
+db_cl_names='latin1_swedish_ci' 'latin1_swedish_ci'
+created=164206810874 164206810873
+EOF
+
+FLUSH TABLES;
+--error ER_PARSE_ERROR
+DELETE FROM t1 WHERE a=1;
+--error ER_PARSE_ERROR
+INSERT INTO t1 VALUES (2);
+
+SET time_zone='+00:00';
+--vertical_results
+SHOW TRIGGERS LIKE 't1';
+SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE TRIGGER_NAME='tr1';
+--horizontal_results
+SET time_zone=DEFAULT;
+
+--echo # Listing trigger files
+--list_files $MYSQLD_DATADIR/test *.TR?
+--echo # Listing trigger files done
+
+DROP TABLE t1;
+
+--echo # Listing trigger files
+--list_files $MYSQLD_DATADIR/test *.TR?
+--echo # Listing trigger files done
+
+--echo # END: Total triggers 2, broken triggers 1, using DROP TABLE
+
+
+--echo # START: Total triggers 2, broken triggers 1, DROP TRIGGER
+
+CREATE TABLE t1 (a INT);
+INSERT INTO t1 VALUES (1);
+
+--write_file $MYSQLD_DATADIR/test/tr1.TRN
+TYPE=TRIGGERNAME
+trigger_table=t1
+EOF
+
+--write_file $MYSQLD_DATADIR/test/tr2.TRN
+TYPE=TRIGGERNAME
+trigger_table=t1
+EOF
+
+--write_file $MYSQLD_DATADIR/test/t1.TRG
+TYPE=TRIGGERS
+triggers='CREATE DEFINER=`root`@`localhost` TRIGGER tr2 AFTER INSERT ON t1 FOR EACH ROW INSERT INTO t2 VALUES (NEW.a+100)' 'CREATE DEFINER=`root`@`localhost` TRIGGER tr1 AFTER DELETE ON t1 FOR EACH ROW\nBEGIN\n  IF unknown_variable\n  THEN\n    INSERT INTO t2 VALUES (OLD.a);\n  END IF;\nEND'
+sql_modes=1411383296 1411383296
+definers='root@localhost' 'root@localhost'
+client_cs_names='utf8' 'utf8'
+connection_cl_names='utf8_general_ci' 'utf8_general_ci'
+db_cl_names='latin1_swedish_ci' 'latin1_swedish_ci'
+created=164206810874 164206810873
+EOF
+
+FLUSH TABLES;
+--error ER_PARSE_ERROR
+DELETE FROM t1 WHERE a=1;
+--error ER_PARSE_ERROR
+INSERT INTO t1 VALUES (2);
+
+SET time_zone='+00:00';
+--vertical_results
+SHOW TRIGGERS LIKE 't1';
+SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE TRIGGER_NAME='tr1';
+--horizontal_results
+SET time_zone=DEFAULT;
+
+--echo # Listing trigger files
+--list_files $MYSQLD_DATADIR/test *.TR?
+--echo # Listing trigger files done
+
+DROP TRIGGER tr1;
+
+--echo # Listing trigger files
+--list_files $MYSQLD_DATADIR/test *.TR?
+--echo # Listing trigger files done
+
+# Now we dropped the broken trigger. Make sure the good one is fired.
+# If everything goes as expected, it will try to insert into t2,
+# which does not exists, hence the (expected) error.
+--error ER_NO_SUCH_TABLE
+INSERT INTO t1 VALUES (100);
+
+DROP TABLE t1;
+
+--echo # Listing trigger files
+--list_files $MYSQLD_DATADIR/test *.TR?
+--echo # Listing trigger files done
+
+--echo # END: Total triggers 2, broken triggers 1, using DROP TRIGGER
diff --git a/mysql-test/main/trigger.result b/mysql-test/main/trigger.result
index e54ee8fa99f..ea4bb41efb3 100644
--- a/mysql-test/main/trigger.result
+++ b/mysql-test/main/trigger.result
@@ -2428,6 +2428,13 @@ CREATE TRIGGER t1_trigger BEFORE INSERT ON t1 FOR EACH ROW BEGIN END;
 INSERT INTO t1 () VALUES ();
 DROP TABLE t1;
 #
+# Bug#33141958 - THE FIRST ASAN UAF ISSUE OF MYSQL SERVER
+#
+create table t1 (a int);
+create trigger tr1 after insert on t1 for each row alter table t1 tablespace s2;
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
+drop table t1;
+#
 # End of 10.2 tests
 #
 #
diff --git a/mysql-test/main/trigger.test b/mysql-test/main/trigger.test
index 6fb194ed8dd..32827975e14 100644
--- a/mysql-test/main/trigger.test
+++ b/mysql-test/main/trigger.test
@@ -2761,6 +2761,14 @@ INSERT INTO t1 () VALUES ();
 DROP TABLE t1;
 
 --echo #
+--echo # Bug#33141958 - THE FIRST ASAN UAF ISSUE OF MYSQL SERVER
+--echo #
+create table t1 (a int);
+--error ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG
+create trigger tr1 after insert on t1 for each row alter table t1 tablespace s2;
+drop table t1;
+
+--echo #
 --echo # End of 10.2 tests
 --echo #
 
diff --git a/mysql-test/main/type_enum.result b/mysql-test/main/type_enum.result
index d8b558c7ce0..9b251fb414b 100644
--- a/mysql-test/main/type_enum.result
+++ b/mysql-test/main/type_enum.result
@@ -2219,6 +2219,27 @@ a
 
 DROP TABLE t1;
 #
+# MDEV-26129 Bad results with join comparing case insensitive VARCHAR/ENUM/SET expression to a _bin ENUM column
+#
+CREATE TABLE t1 (a ENUM('a') CHARACTER SET latin1 PRIMARY KEY);
+INSERT INTO t1 VALUES ('a');
+CREATE TABLE t2 (a ENUM('a','A','b','B','c','C','d','D','e','E') CHARACTER SET latin1 COLLATE latin1_bin);
+INSERT INTO t2 VALUES ('a'),('A');
+INSERT INTO t2 VALUES ('b'),('B'),('c'),('C'),('d'),('D'),('e'),('E');
+ALTER TABLE t2 ADD PRIMARY KEY(a);
+SELECT t1.a res FROM t1 JOIN t2 ON t1.a COLLATE latin1_swedish_ci=t2.a;
+res
+a
+a
+SELECT t1.a res FROM t1 LEFT JOIN t2 ON t1.a COLLATE latin1_swedish_ci=t2.a;
+res
+a
+a
+DROP TABLE IF EXISTS t1,t2;
+#
+# End of 10.2. tests
+#
+#
 # Start of 10.3 tests
 #
 #
diff --git a/mysql-test/main/type_enum.test b/mysql-test/main/type_enum.test
index a36d63f8725..6ff3e257feb 100644
--- a/mysql-test/main/type_enum.test
+++ b/mysql-test/main/type_enum.test
@@ -458,6 +458,26 @@ SELECT * FROM t1;
 DROP TABLE t1;
 
 --echo #
+--echo # MDEV-26129 Bad results with join comparing case insensitive VARCHAR/ENUM/SET expression to a _bin ENUM column
+--echo #
+
+CREATE TABLE t1 (a ENUM('a') CHARACTER SET latin1 PRIMARY KEY);
+INSERT INTO t1 VALUES ('a');
+CREATE TABLE t2 (a ENUM('a','A','b','B','c','C','d','D','e','E') CHARACTER SET latin1 COLLATE latin1_bin);
+INSERT INTO t2 VALUES ('a'),('A');
+# without the following insert the bug doesn't show, was fixed in MDEV-6978
+INSERT INTO t2 VALUES ('b'),('B'),('c'),('C'),('d'),('D'),('e'),('E');
+ALTER TABLE t2 ADD PRIMARY KEY(a);
+SELECT t1.a res FROM t1 JOIN t2 ON t1.a COLLATE latin1_swedish_ci=t2.a;
+SELECT t1.a res FROM t1 LEFT JOIN t2 ON t1.a COLLATE latin1_swedish_ci=t2.a;
+DROP TABLE IF EXISTS t1,t2;
+
+
+--echo #
+--echo # End of 10.2. tests
+--echo #
+
+--echo #
 --echo # Start of 10.3 tests
 --echo #
 
diff --git a/mysql-test/main/type_json.result b/mysql-test/main/type_json.result
index dfe4699b361..92be74fb2f4 100644
--- a/mysql-test/main/type_json.result
+++ b/mysql-test/main/type_json.result
@@ -126,5 +126,38 @@ def					JSON_COMPACT('{}')	253 (format=json)	6	0	Y	0	0	33
 js0	JSON_COMPACT(js0)	JSON_COMPACT('{}')
 DROP TABLE t1;
 #
+# MDEV-27361 Hybrid functions with JSON arguments do not send format metadata
+#
+CREATE TABLE t1 (a JSON);
+INSERT INTO t1 VALUES ('{"a":"b"}');
+SELECT a, JSON_COMPACT(a), COALESCE(a) FROM t1;
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def	test	t1	t1	a	a	252 (format=json)	4294967295	9	Y	144	0	33
+def					JSON_COMPACT(a)	251 (format=json)	4294967295	9	Y	128	0	33
+def					COALESCE(a)	251 (format=json)	4294967295	9	Y	128	39	33
+a	JSON_COMPACT(a)	COALESCE(a)
+{"a":"b"}	{"a":"b"}	{"a":"b"}
+SELECT JSON_ARRAYAGG(1), JSON_ARRAYAGG(a) FROM t1;
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					JSON_ARRAYAGG(1)	252 (format=json)	9437184	3	Y	0	0	33
+def					JSON_ARRAYAGG(a)	252 (format=json)	12582912	11	Y	128	0	33
+JSON_ARRAYAGG(1)	JSON_ARRAYAGG(a)
+[1]	[{"a":"b"}]
+SELECT JSON_OBJECTAGG('a','b'), JSON_OBJECTAGG('a',a) FROM t1;
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					JSON_OBJECTAGG('a','b')	252 (format=json)	9437184	9	Y	0	0	33
+def					JSON_OBJECTAGG('a',a)	252 (format=json)	12582912	15	Y	128	0	33
+JSON_OBJECTAGG('a','b')	JSON_OBJECTAGG('a',a)
+{"a":"b"}	{"a":{"a":"b"}}
+DROP TABLE t1;
+#
+# MDEV-27018 IF and COALESCE lose "json" property
+#
+SELECT json_object('a', (SELECT json_objectagg(b, c) FROM (SELECT 'b','c') d)) AS j FROM DUAL;
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					j	250 (format=json)	9437283	16	Y	0	39	33
+j
+{"a": {"b":"c"}}
+#
 # End of 10.5 tests
 #
diff --git a/mysql-test/main/type_json.test b/mysql-test/main/type_json.test
index 7ab0af20e03..bc8716161ac 100644
--- a/mysql-test/main/type_json.test
+++ b/mysql-test/main/type_json.test
@@ -88,6 +88,34 @@ SELECT js0, JSON_COMPACT(js0), JSON_COMPACT('{}') FROM t1;
 --enable_ps_protocol
 DROP TABLE t1;
 
+
+--echo #
+--echo # MDEV-27361 Hybrid functions with JSON arguments do not send format metadata
+--echo #
+
+CREATE TABLE t1 (a JSON);
+INSERT INTO t1 VALUES ('{"a":"b"}');
+--disable_ps_protocol
+--enable_metadata
+SELECT a, JSON_COMPACT(a), COALESCE(a) FROM t1;
+SELECT JSON_ARRAYAGG(1), JSON_ARRAYAGG(a) FROM t1;
+SELECT JSON_OBJECTAGG('a','b'), JSON_OBJECTAGG('a',a) FROM t1;
+--disable_metadata
+--disable_ps_protocol
+DROP TABLE t1;
+
+
+--echo #
+--echo # MDEV-27018 IF and COALESCE lose "json" property
+--echo #
+
+--disable_ps_protocol
+--enable_metadata
+SELECT json_object('a', (SELECT json_objectagg(b, c) FROM (SELECT 'b','c') d)) AS j FROM DUAL;
+--disable_metadata
+--disable_ps_protocol
+
+
 --echo #
 --echo # End of 10.5 tests
 --echo #
diff --git a/mysql-test/main/userstat.result b/mysql-test/main/userstat.result
index 9152f602304..5315317e33a 100644
--- a/mysql-test/main/userstat.result
+++ b/mysql-test/main/userstat.result
@@ -3,71 +3,71 @@ Warnings:
 Warning	1287	'<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
 show columns from information_schema.client_statistics;
 Field	Type	Null	Key	Default	Extra
-CLIENT	varchar(64)	NO			
-TOTAL_CONNECTIONS	bigint(21)	NO		0	
-CONCURRENT_CONNECTIONS	bigint(21)	NO		0	
-CONNECTED_TIME	bigint(21)	NO		0	
-BUSY_TIME	double	NO		0	
-CPU_TIME	double	NO		0	
-BYTES_RECEIVED	bigint(21)	NO		0	
-BYTES_SENT	bigint(21)	NO		0	
-BINLOG_BYTES_WRITTEN	bigint(21)	NO		0	
-ROWS_READ	bigint(21)	NO		0	
-ROWS_SENT	bigint(21)	NO		0	
-ROWS_DELETED	bigint(21)	NO		0	
-ROWS_INSERTED	bigint(21)	NO		0	
-ROWS_UPDATED	bigint(21)	NO		0	
-SELECT_COMMANDS	bigint(21)	NO		0	
-UPDATE_COMMANDS	bigint(21)	NO		0	
-OTHER_COMMANDS	bigint(21)	NO		0	
-COMMIT_TRANSACTIONS	bigint(21)	NO		0	
-ROLLBACK_TRANSACTIONS	bigint(21)	NO		0	
-DENIED_CONNECTIONS	bigint(21)	NO		0	
-LOST_CONNECTIONS	bigint(21)	NO		0	
-ACCESS_DENIED	bigint(21)	NO		0	
-EMPTY_QUERIES	bigint(21)	NO		0	
-TOTAL_SSL_CONNECTIONS	bigint(21) unsigned	NO		0	
-MAX_STATEMENT_TIME_EXCEEDED	bigint(21)	NO		0	
+CLIENT	varchar(64)	NO		NULL	
+TOTAL_CONNECTIONS	bigint(21)	NO		NULL	
+CONCURRENT_CONNECTIONS	bigint(21)	NO		NULL	
+CONNECTED_TIME	bigint(21)	NO		NULL	
+BUSY_TIME	double	NO		NULL	
+CPU_TIME	double	NO		NULL	
+BYTES_RECEIVED	bigint(21)	NO		NULL	
+BYTES_SENT	bigint(21)	NO		NULL	
+BINLOG_BYTES_WRITTEN	bigint(21)	NO		NULL	
+ROWS_READ	bigint(21)	NO		NULL	
+ROWS_SENT	bigint(21)	NO		NULL	
+ROWS_DELETED	bigint(21)	NO		NULL	
+ROWS_INSERTED	bigint(21)	NO		NULL	
+ROWS_UPDATED	bigint(21)	NO		NULL	
+SELECT_COMMANDS	bigint(21)	NO		NULL	
+UPDATE_COMMANDS	bigint(21)	NO		NULL	
+OTHER_COMMANDS	bigint(21)	NO		NULL	
+COMMIT_TRANSACTIONS	bigint(21)	NO		NULL	
+ROLLBACK_TRANSACTIONS	bigint(21)	NO		NULL	
+DENIED_CONNECTIONS	bigint(21)	NO		NULL	
+LOST_CONNECTIONS	bigint(21)	NO		NULL	
+ACCESS_DENIED	bigint(21)	NO		NULL	
+EMPTY_QUERIES	bigint(21)	NO		NULL	
+TOTAL_SSL_CONNECTIONS	bigint(21) unsigned	NO		NULL	
+MAX_STATEMENT_TIME_EXCEEDED	bigint(21)	NO		NULL	
 show columns from information_schema.user_statistics;
 Field	Type	Null	Key	Default	Extra
-USER	varchar(128)	NO			
-TOTAL_CONNECTIONS	int(11)	NO		0	
-CONCURRENT_CONNECTIONS	int(11)	NO		0	
-CONNECTED_TIME	int(11)	NO		0	
-BUSY_TIME	double	NO		0	
-CPU_TIME	double	NO		0	
-BYTES_RECEIVED	bigint(21)	NO		0	
-BYTES_SENT	bigint(21)	NO		0	
-BINLOG_BYTES_WRITTEN	bigint(21)	NO		0	
-ROWS_READ	bigint(21)	NO		0	
-ROWS_SENT	bigint(21)	NO		0	
-ROWS_DELETED	bigint(21)	NO		0	
-ROWS_INSERTED	bigint(21)	NO		0	
-ROWS_UPDATED	bigint(21)	NO		0	
-SELECT_COMMANDS	bigint(21)	NO		0	
-UPDATE_COMMANDS	bigint(21)	NO		0	
-OTHER_COMMANDS	bigint(21)	NO		0	
-COMMIT_TRANSACTIONS	bigint(21)	NO		0	
-ROLLBACK_TRANSACTIONS	bigint(21)	NO		0	
-DENIED_CONNECTIONS	bigint(21)	NO		0	
-LOST_CONNECTIONS	bigint(21)	NO		0	
-ACCESS_DENIED	bigint(21)	NO		0	
-EMPTY_QUERIES	bigint(21)	NO		0	
-TOTAL_SSL_CONNECTIONS	bigint(21) unsigned	NO		0	
-MAX_STATEMENT_TIME_EXCEEDED	bigint(21)	NO		0	
+USER	varchar(128)	NO		NULL	
+TOTAL_CONNECTIONS	int(11)	NO		NULL	
+CONCURRENT_CONNECTIONS	int(11)	NO		NULL	
+CONNECTED_TIME	int(11)	NO		NULL	
+BUSY_TIME	double	NO		NULL	
+CPU_TIME	double	NO		NULL	
+BYTES_RECEIVED	bigint(21)	NO		NULL	
+BYTES_SENT	bigint(21)	NO		NULL	
+BINLOG_BYTES_WRITTEN	bigint(21)	NO		NULL	
+ROWS_READ	bigint(21)	NO		NULL	
+ROWS_SENT	bigint(21)	NO		NULL	
+ROWS_DELETED	bigint(21)	NO		NULL	
+ROWS_INSERTED	bigint(21)	NO		NULL	
+ROWS_UPDATED	bigint(21)	NO		NULL	
+SELECT_COMMANDS	bigint(21)	NO		NULL	
+UPDATE_COMMANDS	bigint(21)	NO		NULL	
+OTHER_COMMANDS	bigint(21)	NO		NULL	
+COMMIT_TRANSACTIONS	bigint(21)	NO		NULL	
+ROLLBACK_TRANSACTIONS	bigint(21)	NO		NULL	
+DENIED_CONNECTIONS	bigint(21)	NO		NULL	
+LOST_CONNECTIONS	bigint(21)	NO		NULL	
+ACCESS_DENIED	bigint(21)	NO		NULL	
+EMPTY_QUERIES	bigint(21)	NO		NULL	
+TOTAL_SSL_CONNECTIONS	bigint(21) unsigned	NO		NULL	
+MAX_STATEMENT_TIME_EXCEEDED	bigint(21)	NO		NULL	
 show columns from information_schema.index_statistics;
 Field	Type	Null	Key	Default	Extra
-TABLE_SCHEMA	varchar(192)	NO			
-TABLE_NAME	varchar(192)	NO			
-INDEX_NAME	varchar(192)	NO			
-ROWS_READ	bigint(21)	NO		0	
+TABLE_SCHEMA	varchar(192)	NO		NULL	
+TABLE_NAME	varchar(192)	NO		NULL	
+INDEX_NAME	varchar(192)	NO		NULL	
+ROWS_READ	bigint(21)	NO		NULL	
 show columns from information_schema.table_statistics;
 Field	Type	Null	Key	Default	Extra
-TABLE_SCHEMA	varchar(192)	NO			
-TABLE_NAME	varchar(192)	NO			
-ROWS_READ	bigint(21)	NO		0	
-ROWS_CHANGED	bigint(21)	NO		0	
-ROWS_CHANGED_X_INDEXES	bigint(21)	NO		0	
+TABLE_SCHEMA	varchar(192)	NO		NULL	
+TABLE_NAME	varchar(192)	NO		NULL	
+ROWS_READ	bigint(21)	NO		NULL	
+ROWS_CHANGED	bigint(21)	NO		NULL	
+ROWS_CHANGED_X_INDEXES	bigint(21)	NO		NULL	
 set @save_general_log=@@global.general_log;
 set @@global.general_log=0;
 set @@global.userstat=1;
diff --git a/mysql-test/main/view.result b/mysql-test/main/view.result
index 44f475ede84..27c091a71d1 100644
--- a/mysql-test/main/view.result
+++ b/mysql-test/main/view.result
@@ -6792,49 +6792,6 @@ sum(z)
 DROP TABLE t1;
 DROP VIEW v1;
 #
-# MDEV-24454: Crash at change_item_tree
-#
-CREATE TABLE t1(f0 INT);
-CREATE VIEW v1 AS
-SELECT
-f0 AS f1
-FROM t1;
-CREATE VIEW v2 AS
-SELECT
-(SELECT GROUP_CONCAT(v1.f1 SEPARATOR ', ')
-FROM v1 n) AS f2,
-GROUP_CONCAT('' SEPARATOR ', ') AS f3
-FROM v1;
-CREATE VIEW v3 AS
-SELECT 1 as f4 FROM v2;
-CREATE PROCEDURE p1()
-SELECT * FROM v3;
-CALL p1();
-f4
-1
-CALL p1();
-f4
-1
-drop procedure p1;
-drop view v1,v2,v3;
-drop table t1;
-#
-# MDEV-25631: Crash in st_select_lex::mark_as_dependent with
-# VIEW, aggregate and subquery
-#
-CREATE TABLE t1 (i1 int);
-insert into t1 values (1),(2),(3);
-CREATE VIEW v1 AS
-SELECT t1.i1 FROM (t1 a JOIN t1 ON (t1.i1 = (SELECT t1.i1 FROM t1 b)));
-SELECT 1 FROM (SELECT count(((SELECT i1 FROM v1))) FROM v1) dt ;
-ERROR 21000: Subquery returns more than 1 row
-delete from t1 where i1 > 1;
-SELECT 1 FROM (SELECT count(((SELECT i1 FROM v1))) FROM v1) dt ;
-1
-1
-drop view v1;
-drop table t1;
-#
 # MDEV-26299: Some views force server (and mysqldump) to generate
 # invalid SQL for their definitions
 #
@@ -6846,6 +6803,24 @@ drop view v1;
 CREATE VIEW v1 AS select `t1`.`12345678901234567890123456789012345678901234567890123456789012345` AS `Name_exp_1` from (select '12345678901234567890123456789012345678901234567890123456789012345') `t1`;
 drop view v1;
 #
+# MDEV-25631: view with outer reference in select used
+#             as argument of set function
+#
+create table t1 (c int);
+insert into t1 values (1);
+create view v1 as select c from t1 where (select t1.c from t1 t) = 1;
+select * from (select sum((select * from v1)) as r) dt;
+r
+1
+with cte as (select c from t1 where (select t1.c from t1 t) = 1)
+select * from (select sum((select * from cte)) as r) dt1
+union
+select * from (select sum((select * from cte)) as r) dt2;
+r
+1
+drop view v1;
+drop table t1;
+#
 # End of 10.2 tests
 #
 #
diff --git a/mysql-test/main/view.test b/mysql-test/main/view.test
index 4bc688efa3d..1b09bb146f4 100644
--- a/mysql-test/main/view.test
+++ b/mysql-test/main/view.test
@@ -6512,56 +6512,6 @@ DROP TABLE t1;
 DROP VIEW v1;
 
 --echo #
---echo # MDEV-24454: Crash at change_item_tree
---echo #
-
-CREATE TABLE t1(f0 INT);
-
-CREATE VIEW v1 AS
-SELECT
-  f0 AS f1
-FROM t1;
-
-CREATE VIEW v2 AS
-SELECT
-  (SELECT GROUP_CONCAT(v1.f1 SEPARATOR ', ')
-   FROM v1 n) AS f2,
-  GROUP_CONCAT('' SEPARATOR ', ') AS f3
-FROM v1;
-
-CREATE VIEW v3 AS
-SELECT 1 as f4 FROM v2;
-
-CREATE PROCEDURE p1()
-  SELECT * FROM v3;
-
-CALL p1();
-CALL p1();
-
-drop procedure p1;
-drop view v1,v2,v3;
-drop table t1;
-
---echo #
---echo # MDEV-25631: Crash in st_select_lex::mark_as_dependent with
---echo # VIEW, aggregate and subquery
---echo #
-
-CREATE TABLE t1 (i1 int);
-insert into t1 values (1),(2),(3); #not important
-CREATE VIEW v1 AS
-	SELECT t1.i1 FROM (t1 a JOIN t1 ON (t1.i1 = (SELECT t1.i1 FROM t1 b)));
-
---error ER_SUBQUERY_NO_1_ROW
-SELECT 1 FROM (SELECT count(((SELECT i1 FROM v1))) FROM v1) dt ;
-delete from t1 where i1 > 1;
-SELECT 1 FROM (SELECT count(((SELECT i1 FROM v1))) FROM v1) dt ;
-
-drop view v1;
-drop table t1;
-
-
---echo #
 --echo # MDEV-26299: Some views force server (and mysqldump) to generate
 --echo # invalid SQL for their definitions
 --echo #
@@ -6577,9 +6527,29 @@ drop view v1;
 
 eval CREATE VIEW v1 AS $definition;
 
+
 drop view v1;
 
 --echo #
+--echo # MDEV-25631: view with outer reference in select used
+--echo #             as argument of set function
+--echo #
+
+create table t1 (c int);
+insert into t1 values (1);
+create view v1 as select c from t1 where (select t1.c from t1 t) = 1;
+
+select * from (select sum((select * from v1)) as r) dt;
+
+with cte as (select c from t1 where (select t1.c from t1 t) = 1)
+select * from (select sum((select * from cte)) as r) dt1
+union
+select * from (select sum((select * from cte)) as r) dt2;
+
+drop view v1;
+drop table t1;
+
+--echo #
 --echo # End of 10.2 tests
 --echo #
 
diff --git a/mysql-test/mariadb-test-run.pl b/mysql-test/mariadb-test-run.pl
index bf2d6e9be00..62a70caca40 100755
--- a/mysql-test/mariadb-test-run.pl
+++ b/mysql-test/mariadb-test-run.pl
@@ -1844,7 +1844,7 @@ sub executable_setup () {
   $exe_mysql_plugin=   mtr_exe_exists("$path_client_bindir/mysql_plugin");
   $exe_mariadb_conv=   mtr_exe_exists("$path_client_bindir/mariadb-conv");
 
-  $exe_mysql_embedded= mtr_exe_maybe_exists("$basedir/libmysqld/examples/mysql_embedded");
+  $exe_mysql_embedded= mtr_exe_maybe_exists("$bindir/libmysqld/examples/mysql_embedded");
 
   # Look for mysqltest executable
   if ( $opt_embedded_server )
diff --git a/mysql-test/suite/binlog/include/mysqlbinlog_row_engine.inc b/mysql-test/suite/binlog/include/mysqlbinlog_row_engine.inc
index 763029c32ff..e0987b97c05 100644
--- a/mysql-test/suite/binlog/include/mysqlbinlog_row_engine.inc
+++ b/mysql-test/suite/binlog/include/mysqlbinlog_row_engine.inc
@@ -1921,3 +1921,28 @@ let $MYSQLD_DATADIR= `select @@datadir`;
 DROP TABLE t1;
 
 
+--echo #
+--echo # Beginning of 10.2 test
+--echo #
+--echo # MDEV-25460: Assertion `!is_set() || (m_status == DA_OK_BULK &&
+--echo # is_bulk_op())' failed in Diagnostics_area::set_ok_status in my_ok
+--echo # from mysql_sql_stmt_prepare
+--echo #
+
+CREATE TEMPORARY TABLE a (c INT) ENGINE=InnoDB;
+CREATE TABLE b (c INT) ENGINE=InnoDB;
+
+--error ER_TEMP_TABLE_PREVENTS_SWITCH_OUT_OF_RBR
+PREPARE s FROM 'SET STATEMENT binlog_format=ROW FOR SELECT * FROM b';
+
+DROP TABLE b;
+DROP TEMPORARY TABLE a;
+
+CREATE TEMPORARY TABLE t (c INT);
+--error ER_TEMP_TABLE_PREVENTS_SWITCH_OUT_OF_RBR
+PREPARE s FROM 'SET STATEMENT binlog_format=ROW FOR SELECT 1';
+DROP TEMPORARY TABLE t;
+
+--echo #
+--echo # End of 10.2 test
+--echo #
diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result
index 8cc020311b9..5db32763533 100644
--- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result
+++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result
@@ -6374,4 +6374,24 @@ ROLLBACK /* added by mysqlbinlog */;
 # Cleanup.
 #
 DROP TABLE t1;
+#
+# Beginning of 10.2 test
+#
+# MDEV-25460: Assertion `!is_set() || (m_status == DA_OK_BULK &&
+# is_bulk_op())' failed in Diagnostics_area::set_ok_status in my_ok
+# from mysql_sql_stmt_prepare
+#
+CREATE TEMPORARY TABLE a (c INT) ENGINE=InnoDB;
+CREATE TABLE b (c INT) ENGINE=InnoDB;
+PREPARE s FROM 'SET STATEMENT binlog_format=ROW FOR SELECT * FROM b';
+ERROR HY000: Cannot switch out of the row-based binary log format when the session has open temporary tables
+DROP TABLE b;
+DROP TEMPORARY TABLE a;
+CREATE TEMPORARY TABLE t (c INT);
+PREPARE s FROM 'SET STATEMENT binlog_format=ROW FOR SELECT 1';
+ERROR HY000: Cannot switch out of the row-based binary log format when the session has open temporary tables
+DROP TEMPORARY TABLE t;
+#
+# End of 10.2 test
+#
 SET GLOBAL innodb_stats_auto_recalc=@save_stats_auto_recalc;
diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result
index 854d733bd99..62dcca4d7a2 100644
--- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result
+++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result
@@ -6413,3 +6413,29 @@ ROLLBACK /* added by mysqlbinlog */;
 # Cleanup.
 #
 DROP TABLE t1;
+#
+# Beginning of 10.2 test
+#
+# MDEV-25460: Assertion `!is_set() || (m_status == DA_OK_BULK &&
+# is_bulk_op())' failed in Diagnostics_area::set_ok_status in my_ok
+# from mysql_sql_stmt_prepare
+#
+CREATE TEMPORARY TABLE a (c INT) ENGINE=InnoDB;
+Warnings:
+Warning	1286	Unknown storage engine 'InnoDB'
+Warning	1266	Using storage engine MyISAM for table 'a'
+CREATE TABLE b (c INT) ENGINE=InnoDB;
+Warnings:
+Warning	1286	Unknown storage engine 'InnoDB'
+Warning	1266	Using storage engine MyISAM for table 'b'
+PREPARE s FROM 'SET STATEMENT binlog_format=ROW FOR SELECT * FROM b';
+ERROR HY000: Cannot switch out of the row-based binary log format when the session has open temporary tables
+DROP TABLE b;
+DROP TEMPORARY TABLE a;
+CREATE TEMPORARY TABLE t (c INT);
+PREPARE s FROM 'SET STATEMENT binlog_format=ROW FOR SELECT 1';
+ERROR HY000: Cannot switch out of the row-based binary log format when the session has open temporary tables
+DROP TEMPORARY TABLE t;
+#
+# End of 10.2 test
+#
diff --git a/mysql-test/suite/binlog/r/binlog_parallel_replication_ddl.result b/mysql-test/suite/binlog/r/binlog_parallel_replication_ddl.result
new file mode 100644
index 00000000000..34d8bbf5999
--- /dev/null
+++ b/mysql-test/suite/binlog/r/binlog_parallel_replication_ddl.result
@@ -0,0 +1,8 @@
+RESET MASTER;
+CREATE OR REPLACE SEQUENCE s1;
+DROP SEQUENCE s1;
+FLUSH LOGS;
+FOUND 2 /GTID [0-9]+-[0-9]+-[0-9]+/ in mysqlbinlog.sql
+The same as above number of samples must be found:
+FOUND 2 /GTID [0-9]+-[0-9]+-[0-9]+ ddl/ in mysqlbinlog.sql
+End of the tests
diff --git a/mysql-test/suite/binlog/r/binlog_xa_handling.result b/mysql-test/suite/binlog/r/binlog_xa_handling.result
new file mode 100644
index 00000000000..7a60fb59b9a
--- /dev/null
+++ b/mysql-test/suite/binlog/r/binlog_xa_handling.result
@@ -0,0 +1,11 @@
+connection default;
+CREATE TABLE t1(f1 int) ENGINE=Innodb;
+XA START 'xa';
+INSERT INTO t1 VALUES(10);
+BINLOG '
+SOgWTg8BAAAAbgAAAHIAAAAAAAQANS42LjMtbTUtZGVidWctbG9nAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAABI6BZOEzgNAAgAEgAEBAQEEgAAVgAEGggAAAAICAgCAAAAAAVAYI8=';
+XA END 'xa';
+XA PREPARE 'xa';
+XA ROLLBACK 'xa';
+DROP TABLE t1;
diff --git a/mysql-test/suite/binlog/t/binlog_parallel_replication_ddl.test b/mysql-test/suite/binlog/t/binlog_parallel_replication_ddl.test
new file mode 100644
index 00000000000..d861ecc96df
--- /dev/null
+++ b/mysql-test/suite/binlog/t/binlog_parallel_replication_ddl.test
@@ -0,0 +1,30 @@
+# Check binlog properties of various DDL:s.
+# Motivated by MDEV-27365.
+#
+--source include/have_log_bin.inc
+--source include/have_binlog_format_mixed.inc
+
+RESET MASTER;
+
+# MDEV-27365 CREATE-or-REPLACE SEQUENCE bilogged without DDL flag
+# Prove it is logged with the DDL flag.
+CREATE OR REPLACE SEQUENCE s1;
+
+# This one has been always correct.
+DROP SEQUENCE s1;
+FLUSH LOGS;
+
+--let $MYSQLD_DATADIR= `select @@datadir`
+--exec $MYSQL_BINLOG --base64-output=decode-rows $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog.sql
+
+--let SEARCH_PATTERN= GTID [0-9]+-[0-9]+-[0-9]+
+--let SEARCH_FILE= $MYSQLTEST_VARDIR/tmp/mysqlbinlog.sql
+--source include/search_pattern_in_file.inc
+
+--echo The same as above number of samples must be found:
+--let SEARCH_PATTERN= GTID [0-9]+-[0-9]+-[0-9]+ ddl
+--let SEARCH_FILE= $MYSQLTEST_VARDIR/tmp/mysqlbinlog.sql
+--source include/search_pattern_in_file.inc
+--remove_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog.sql
+
+--echo End of the tests
diff --git a/mysql-test/suite/binlog/t/binlog_xa_handling.test b/mysql-test/suite/binlog/t/binlog_xa_handling.test
new file mode 100644
index 00000000000..c454e83169e
--- /dev/null
+++ b/mysql-test/suite/binlog/t/binlog_xa_handling.test
@@ -0,0 +1,28 @@
+###############################################################################
+# Bug#19928622: ASSERTION `! IS_SET()' FAILED. | ABORT IN
+# DIAGNOSTICS_AREA::SET_OK_STATUS
+#
+# MDEV-27536 Invalid BINLOG_BASE64_EVENT and assertion Diagnostics_area:: !is_set()
+#
+# Test:
+# =====
+# Begin an XA transaction and execte a DML statement so that XA state becomes
+# XA_ACTIVE. Execute the BINLOG command it should not cause any assert.
+# Execution should be successful.
+###############################################################################
+--source include/have_log_bin.inc
+--source include/have_innodb.inc
+
+--connection default
+CREATE TABLE t1(f1 int) ENGINE=Innodb;
+
+XA START 'xa';
+INSERT INTO t1 VALUES(10);
+BINLOG '
+SOgWTg8BAAAAbgAAAHIAAAAAAAQANS42LjMtbTUtZGVidWctbG9nAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAABI6BZOEzgNAAgAEgAEBAQEEgAAVgAEGggAAAAICAgCAAAAAAVAYI8=';
+XA END 'xa';
+XA PREPARE 'xa';
+XA ROLLBACK 'xa';
+
+DROP TABLE t1;
diff --git a/mysql-test/suite/federated/optimizer.result b/mysql-test/suite/federated/optimizer.result
new file mode 100644
index 00000000000..5d7072e0b35
--- /dev/null
+++ b/mysql-test/suite/federated/optimizer.result
@@ -0,0 +1,52 @@
+connect  master,127.0.0.1,root,,test,$MASTER_MYPORT,;
+connect  slave,127.0.0.1,root,,test,$SLAVE_MYPORT,;
+connection master;
+CREATE DATABASE federated;
+connection slave;
+CREATE DATABASE federated;
+connection default;
+#
+# MDEV-14907 FEDERATEDX doesn't respect DISTINCT
+#
+CREATE TABLE t1 (
+`foo_id` bigint(20) unsigned NOT NULL,
+`foo_name` varchar(255) DEFAULT NULL,
+`parent_foo_id` bigint(20) unsigned DEFAULT NULL,
+PRIMARY KEY (`foo_id`),
+KEY `foo_name` (`foo_name`),
+KEY `parent_foo_id` (`parent_foo_id`)
+) DEFAULT CHARSET=utf8;
+CREATE TABLE `fed_t1` ENGINE=FEDERATED DEFAULT CHARSET=utf8 CONNECTION='mysql://root@127.0.0.1:MASTER_PORT/test/t1';
+INSERT INTO t1 VALUES (968903, 'STRING - 0', 822857);
+INSERT INTO t1 VALUES (968953, 'STRING - 1', 822857);
+INSERT INTO t1 VALUES (971603, 'STRING - 2', 822857);
+INSERT INTO t1 VALUES (971803, 'STRING - 3', 822857);
+INSERT INTO t1 VALUES (975103, 'STRING - 4', 822857);
+INSERT INTO t1 VALUES (822857, 'STRING', NULL);
+select foo_id,parent_foo_id,foo_name from t1 where parent_foo_id = 822857 or foo_name like 'STRING%';
+foo_id	parent_foo_id	foo_name
+968903	822857	STRING - 0
+968953	822857	STRING - 1
+971603	822857	STRING - 2
+971803	822857	STRING - 3
+975103	822857	STRING - 4
+822857	NULL	STRING
+explain
+select foo_id,parent_foo_id,foo_name from fed_t1 where parent_foo_id = 822857 or foo_name like 'STRING%';
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	fed_t1	ALL	foo_name,parent_foo_id	NULL	NULL	NULL	6	Using where
+select foo_id,parent_foo_id,foo_name from fed_t1 where parent_foo_id = 822857 or foo_name like 'STRING%';
+foo_id	parent_foo_id	foo_name
+968903	822857	STRING - 0
+968953	822857	STRING - 1
+971603	822857	STRING - 2
+971803	822857	STRING - 3
+975103	822857	STRING - 4
+822857	NULL	STRING
+DROP TABLE fed_t1, t1;
+connection master;
+DROP TABLE IF EXISTS federated.t1;
+DROP DATABASE IF EXISTS federated;
+connection slave;
+DROP TABLE IF EXISTS federated.t1;
+DROP DATABASE IF EXISTS federated;
diff --git a/mysql-test/suite/federated/optimizer.test b/mysql-test/suite/federated/optimizer.test
new file mode 100644
index 00000000000..4263060fab5
--- /dev/null
+++ b/mysql-test/suite/federated/optimizer.test
@@ -0,0 +1,39 @@
+#
+#Test optimizer flags related to federated tables
+#
+
+--source have_federatedx.inc
+--source include/federated.inc
+
+connection default;
+
+--echo #
+--echo # MDEV-14907 FEDERATEDX doesn't respect DISTINCT
+--echo #
+
+CREATE TABLE t1 (
+  `foo_id` bigint(20) unsigned NOT NULL,
+  `foo_name` varchar(255) DEFAULT NULL,
+  `parent_foo_id` bigint(20) unsigned DEFAULT NULL,
+  PRIMARY KEY (`foo_id`),
+  KEY `foo_name` (`foo_name`),
+  KEY `parent_foo_id` (`parent_foo_id`)
+) DEFAULT CHARSET=utf8;
+ 
+--replace_result $MASTER_MYPORT MASTER_PORT
+eval CREATE TABLE `fed_t1` ENGINE=FEDERATED DEFAULT CHARSET=utf8 CONNECTION='mysql://root@127.0.0.1:$MASTER_MYPORT/test/t1';
+INSERT INTO t1 VALUES (968903, 'STRING - 0', 822857);
+INSERT INTO t1 VALUES (968953, 'STRING - 1', 822857);
+INSERT INTO t1 VALUES (971603, 'STRING - 2', 822857);
+INSERT INTO t1 VALUES (971803, 'STRING - 3', 822857);
+INSERT INTO t1 VALUES (975103, 'STRING - 4', 822857);
+INSERT INTO t1 VALUES (822857, 'STRING', NULL);
+
+select foo_id,parent_foo_id,foo_name from t1 where parent_foo_id = 822857 or foo_name like 'STRING%';
+
+explain
+select foo_id,parent_foo_id,foo_name from fed_t1 where parent_foo_id = 822857 or foo_name like 'STRING%';
+select foo_id,parent_foo_id,foo_name from fed_t1 where parent_foo_id = 822857 or foo_name like 'STRING%';
+DROP TABLE fed_t1, t1;
+
+source include/federated_cleanup.inc;
diff --git a/mysql-test/suite/federated/rpl.result b/mysql-test/suite/federated/rpl.result
new file mode 100644
index 00000000000..71821411c91
--- /dev/null
+++ b/mysql-test/suite/federated/rpl.result
@@ -0,0 +1,18 @@
+include/master-slave.inc
+[connection master]
+create table t1 (a int primary key, b int);
+connection slave;
+rename table t1 to t2;
+create table t1 (a int primary key, b int) engine=federated connection='mysql://root@127.0.0.1:$SLAVE_MYPORT/test/t2';
+connection master;
+insert t1 values (1,1),(2,2),(3,1);
+delete from t1 where a=2;
+connection slave;
+select * from t1;
+a	b
+1	1
+3	1
+drop table t2;
+connection master;
+drop table t1;
+include/rpl_end.inc
diff --git a/mysql-test/suite/federated/rpl.test b/mysql-test/suite/federated/rpl.test
new file mode 100644
index 00000000000..6ec4bec5a1a
--- /dev/null
+++ b/mysql-test/suite/federated/rpl.test
@@ -0,0 +1,19 @@
+source include/have_binlog_format_row.inc;
+source include/master-slave.inc;
+
+create table t1 (a int primary key, b int);
+
+sync_slave_with_master;
+rename table t1 to t2;
+evalp create table t1 (a int primary key, b int) engine=federated connection='mysql://root@127.0.0.1:$SLAVE_MYPORT/test/t2';
+connection master;
+
+insert t1 values (1,1),(2,2),(3,1);
+delete from t1 where a=2;
+sync_slave_with_master;
+select * from t1;
+drop table t2;
+
+connection master;
+drop table t1;
+source include/rpl_end.inc;
diff --git a/mysql-test/suite/funcs_1/datadict/columns.inc b/mysql-test/suite/funcs_1/datadict/columns.inc
index 64318492b00..a03fef9c0dd 100644
--- a/mysql-test/suite/funcs_1/datadict/columns.inc
+++ b/mysql-test/suite/funcs_1/datadict/columns.inc
@@ -25,6 +25,10 @@
 #
 
 --source suite/funcs_1/datadict/datadict_bug_12777.inc
+
+# The following is needed as embedded server can be compiled with and without
+# privlege tables
+
 eval
 SELECT * FROM information_schema.columns
 $my_where
diff --git a/mysql-test/suite/funcs_1/r/is_character_sets.result b/mysql-test/suite/funcs_1/r/is_character_sets.result
index af4dca9c666..9b5caf7448b 100644
--- a/mysql-test/suite/funcs_1/r/is_character_sets.result
+++ b/mysql-test/suite/funcs_1/r/is_character_sets.result
@@ -28,24 +28,24 @@ DROP FUNCTION test.f1;
 #########################################################################
 DESCRIBE          information_schema.CHARACTER_SETS;
 Field	Type	Null	Key	Default	Extra
-CHARACTER_SET_NAME	varchar(32)	NO			
-DEFAULT_COLLATE_NAME	varchar(32)	NO			
-DESCRIPTION	varchar(60)	NO			
-MAXLEN	bigint(3)	NO		0	
+CHARACTER_SET_NAME	varchar(32)	NO		NULL	
+DEFAULT_COLLATE_NAME	varchar(32)	NO		NULL	
+DESCRIPTION	varchar(60)	NO		NULL	
+MAXLEN	bigint(3)	NO		NULL	
 SHOW CREATE TABLE information_schema.CHARACTER_SETS;
 Table	Create Table
 CHARACTER_SETS	CREATE TEMPORARY TABLE `CHARACTER_SETS` (
-  `CHARACTER_SET_NAME` varchar(32) NOT NULL DEFAULT '',
-  `DEFAULT_COLLATE_NAME` varchar(32) NOT NULL DEFAULT '',
-  `DESCRIPTION` varchar(60) NOT NULL DEFAULT '',
-  `MAXLEN` bigint(3) NOT NULL DEFAULT 0
+  `CHARACTER_SET_NAME` varchar(32) NOT NULL,
+  `DEFAULT_COLLATE_NAME` varchar(32) NOT NULL,
+  `DESCRIPTION` varchar(60) NOT NULL,
+  `MAXLEN` bigint(3) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
 SHOW COLUMNS FROM information_schema.CHARACTER_SETS;
 Field	Type	Null	Key	Default	Extra
-CHARACTER_SET_NAME	varchar(32)	NO			
-DEFAULT_COLLATE_NAME	varchar(32)	NO			
-DESCRIPTION	varchar(60)	NO			
-MAXLEN	bigint(3)	NO		0	
+CHARACTER_SET_NAME	varchar(32)	NO		NULL	
+DEFAULT_COLLATE_NAME	varchar(32)	NO		NULL	
+DESCRIPTION	varchar(60)	NO		NULL	
+MAXLEN	bigint(3)	NO		NULL	
 # Testcases 3.2.2.2 and 3.2.2.3 are checked in suite/funcs_1/t/charset_collation*.test
 ########################################################################
 # Testcases 3.2.1.3-3.2.1.5 + 3.2.1.8-3.2.1.12: INSERT/UPDATE/DELETE and
diff --git a/mysql-test/suite/funcs_1/r/is_coll_char_set_appl.result b/mysql-test/suite/funcs_1/r/is_coll_char_set_appl.result
index b72681689e1..6e4c8b14f1f 100644
--- a/mysql-test/suite/funcs_1/r/is_coll_char_set_appl.result
+++ b/mysql-test/suite/funcs_1/r/is_coll_char_set_appl.result
@@ -28,18 +28,18 @@ DROP FUNCTION test.f1;
 #########################################################################
 DESCRIBE          information_schema.COLLATION_CHARACTER_SET_APPLICABILITY;
 Field	Type	Null	Key	Default	Extra
-COLLATION_NAME	varchar(32)	NO			
-CHARACTER_SET_NAME	varchar(32)	NO			
+COLLATION_NAME	varchar(32)	NO		NULL	
+CHARACTER_SET_NAME	varchar(32)	NO		NULL	
 SHOW CREATE TABLE information_schema.COLLATION_CHARACTER_SET_APPLICABILITY;
 Table	Create Table
 COLLATION_CHARACTER_SET_APPLICABILITY	CREATE TEMPORARY TABLE `COLLATION_CHARACTER_SET_APPLICABILITY` (
-  `COLLATION_NAME` varchar(32) NOT NULL DEFAULT '',
-  `CHARACTER_SET_NAME` varchar(32) NOT NULL DEFAULT ''
+  `COLLATION_NAME` varchar(32) NOT NULL,
+  `CHARACTER_SET_NAME` varchar(32) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
 SHOW COLUMNS FROM information_schema.COLLATION_CHARACTER_SET_APPLICABILITY;
 Field	Type	Null	Key	Default	Extra
-COLLATION_NAME	varchar(32)	NO			
-CHARACTER_SET_NAME	varchar(32)	NO			
+COLLATION_NAME	varchar(32)	NO		NULL	
+CHARACTER_SET_NAME	varchar(32)	NO		NULL	
 # Testcases 3.2.4.2 and 3.2.4.3 are checked in suite/funcs_1/t/charset_collation*.test
 ########################################################################
 # Testcases 3.2.1.3-3.2.1.5 + 3.2.1.8-3.2.1.12: INSERT/UPDATE/DELETE and
diff --git a/mysql-test/suite/funcs_1/r/is_collations.result b/mysql-test/suite/funcs_1/r/is_collations.result
index 465baa64ee9..f4054af8655 100644
--- a/mysql-test/suite/funcs_1/r/is_collations.result
+++ b/mysql-test/suite/funcs_1/r/is_collations.result
@@ -28,30 +28,30 @@ DROP FUNCTION test.f1;
 #########################################################################
 DESCRIBE          information_schema.COLLATIONS;
 Field	Type	Null	Key	Default	Extra
-COLLATION_NAME	varchar(32)	NO			
-CHARACTER_SET_NAME	varchar(32)	NO			
-ID	bigint(11)	NO		0	
-IS_DEFAULT	varchar(3)	NO			
-IS_COMPILED	varchar(3)	NO			
-SORTLEN	bigint(3)	NO		0	
+COLLATION_NAME	varchar(32)	NO		NULL	
+CHARACTER_SET_NAME	varchar(32)	NO		NULL	
+ID	bigint(11)	NO		NULL	
+IS_DEFAULT	varchar(3)	NO		NULL	
+IS_COMPILED	varchar(3)	NO		NULL	
+SORTLEN	bigint(3)	NO		NULL	
 SHOW CREATE TABLE information_schema.COLLATIONS;
 Table	Create Table
 COLLATIONS	CREATE TEMPORARY TABLE `COLLATIONS` (
-  `COLLATION_NAME` varchar(32) NOT NULL DEFAULT '',
-  `CHARACTER_SET_NAME` varchar(32) NOT NULL DEFAULT '',
-  `ID` bigint(11) NOT NULL DEFAULT 0,
-  `IS_DEFAULT` varchar(3) NOT NULL DEFAULT '',
-  `IS_COMPILED` varchar(3) NOT NULL DEFAULT '',
-  `SORTLEN` bigint(3) NOT NULL DEFAULT 0
+  `COLLATION_NAME` varchar(32) NOT NULL,
+  `CHARACTER_SET_NAME` varchar(32) NOT NULL,
+  `ID` bigint(11) NOT NULL,
+  `IS_DEFAULT` varchar(3) NOT NULL,
+  `IS_COMPILED` varchar(3) NOT NULL,
+  `SORTLEN` bigint(3) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
 SHOW COLUMNS FROM information_schema.COLLATIONS;
 Field	Type	Null	Key	Default	Extra
-COLLATION_NAME	varchar(32)	NO			
-CHARACTER_SET_NAME	varchar(32)	NO			
-ID	bigint(11)	NO		0	
-IS_DEFAULT	varchar(3)	NO			
-IS_COMPILED	varchar(3)	NO			
-SORTLEN	bigint(3)	NO		0	
+COLLATION_NAME	varchar(32)	NO		NULL	
+CHARACTER_SET_NAME	varchar(32)	NO		NULL	
+ID	bigint(11)	NO		NULL	
+IS_DEFAULT	varchar(3)	NO		NULL	
+IS_COMPILED	varchar(3)	NO		NULL	
+SORTLEN	bigint(3)	NO		NULL	
 # Testcases 3.2.3.2 and 3.2.3.3 are checked in suite/funcs_1/t/charset_collation*.test
 ########################################################################
 # Testcases 3.2.1.3-3.2.1.5 + 3.2.1.8-3.2.1.12: INSERT/UPDATE/DELETE and
diff --git a/mysql-test/suite/funcs_1/r/is_column_privileges.result b/mysql-test/suite/funcs_1/r/is_column_privileges.result
index 4a013956ef7..1d945a31ffc 100644
--- a/mysql-test/suite/funcs_1/r/is_column_privileges.result
+++ b/mysql-test/suite/funcs_1/r/is_column_privileges.result
@@ -28,33 +28,33 @@ DROP FUNCTION test.f1;
 #########################################################################
 DESCRIBE          information_schema.COLUMN_PRIVILEGES;
 Field	Type	Null	Key	Default	Extra
-GRANTEE	varchar(385)	NO			
-TABLE_CATALOG	varchar(512)	NO			
-TABLE_SCHEMA	varchar(64)	NO			
-TABLE_NAME	varchar(64)	NO			
-COLUMN_NAME	varchar(64)	NO			
-PRIVILEGE_TYPE	varchar(64)	NO			
-IS_GRANTABLE	varchar(3)	NO			
+GRANTEE	varchar(385)	NO		NULL	
+TABLE_CATALOG	varchar(512)	NO		NULL	
+TABLE_SCHEMA	varchar(64)	NO		NULL	
+TABLE_NAME	varchar(64)	NO		NULL	
+COLUMN_NAME	varchar(64)	NO		NULL	
+PRIVILEGE_TYPE	varchar(64)	NO		NULL	
+IS_GRANTABLE	varchar(3)	NO		NULL	
 SHOW CREATE TABLE information_schema.COLUMN_PRIVILEGES;
 Table	Create Table
 COLUMN_PRIVILEGES	CREATE TEMPORARY TABLE `COLUMN_PRIVILEGES` (
-  `GRANTEE` varchar(385) NOT NULL DEFAULT '',
-  `TABLE_CATALOG` varchar(512) NOT NULL DEFAULT '',
-  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `COLUMN_NAME` varchar(64) NOT NULL DEFAULT '',
-  `PRIVILEGE_TYPE` varchar(64) NOT NULL DEFAULT '',
-  `IS_GRANTABLE` varchar(3) NOT NULL DEFAULT ''
+  `GRANTEE` varchar(385) NOT NULL,
+  `TABLE_CATALOG` varchar(512) NOT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL,
+  `TABLE_NAME` varchar(64) NOT NULL,
+  `COLUMN_NAME` varchar(64) NOT NULL,
+  `PRIVILEGE_TYPE` varchar(64) NOT NULL,
+  `IS_GRANTABLE` varchar(3) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
 SHOW COLUMNS FROM information_schema.COLUMN_PRIVILEGES;
 Field	Type	Null	Key	Default	Extra
-GRANTEE	varchar(385)	NO			
-TABLE_CATALOG	varchar(512)	NO			
-TABLE_SCHEMA	varchar(64)	NO			
-TABLE_NAME	varchar(64)	NO			
-COLUMN_NAME	varchar(64)	NO			
-PRIVILEGE_TYPE	varchar(64)	NO			
-IS_GRANTABLE	varchar(3)	NO			
+GRANTEE	varchar(385)	NO		NULL	
+TABLE_CATALOG	varchar(512)	NO		NULL	
+TABLE_SCHEMA	varchar(64)	NO		NULL	
+TABLE_NAME	varchar(64)	NO		NULL	
+COLUMN_NAME	varchar(64)	NO		NULL	
+PRIVILEGE_TYPE	varchar(64)	NO		NULL	
+IS_GRANTABLE	varchar(3)	NO		NULL	
 SELECT table_catalog, table_schema, table_name, column_name, privilege_type
 FROM information_schema.column_privileges WHERE table_catalog IS NOT NULL;
 table_catalog	table_schema	table_name	column_name	privilege_type
diff --git a/mysql-test/suite/funcs_1/r/is_columns.result b/mysql-test/suite/funcs_1/r/is_columns.result
index 76b724f2f40..bff145b7469 100644
--- a/mysql-test/suite/funcs_1/r/is_columns.result
+++ b/mysql-test/suite/funcs_1/r/is_columns.result
@@ -28,14 +28,14 @@ DROP FUNCTION test.f1;
 #########################################################################
 DESCRIBE          information_schema.COLUMNS;
 Field	Type	Null	Key	Default	Extra
-TABLE_CATALOG	varchar(512)	NO			
-TABLE_SCHEMA	varchar(64)	NO			
-TABLE_NAME	varchar(64)	NO			
-COLUMN_NAME	varchar(64)	NO			
-ORDINAL_POSITION	bigint(21) unsigned	NO		0	
+TABLE_CATALOG	varchar(512)	NO		NULL	
+TABLE_SCHEMA	varchar(64)	NO		NULL	
+TABLE_NAME	varchar(64)	NO		NULL	
+COLUMN_NAME	varchar(64)	NO		NULL	
+ORDINAL_POSITION	bigint(21) unsigned	NO		NULL	
 COLUMN_DEFAULT	longtext	YES		NULL	
-IS_NULLABLE	varchar(3)	NO			
-DATA_TYPE	varchar(64)	NO			
+IS_NULLABLE	varchar(3)	NO		NULL	
+DATA_TYPE	varchar(64)	NO		NULL	
 CHARACTER_MAXIMUM_LENGTH	bigint(21) unsigned	YES		NULL	
 CHARACTER_OCTET_LENGTH	bigint(21) unsigned	YES		NULL	
 NUMERIC_PRECISION	bigint(21) unsigned	YES		NULL	
@@ -43,49 +43,49 @@ NUMERIC_SCALE	bigint(21) unsigned	YES		NULL
 DATETIME_PRECISION	bigint(21) unsigned	YES		NULL	
 CHARACTER_SET_NAME	varchar(32)	YES		NULL	
 COLLATION_NAME	varchar(32)	YES		NULL	
-COLUMN_TYPE	longtext	NO			
-COLUMN_KEY	varchar(3)	NO			
-EXTRA	varchar(30)	NO			
-PRIVILEGES	varchar(80)	NO			
-COLUMN_COMMENT	varchar(1024)	NO			
-IS_GENERATED	varchar(6)	NO			
+COLUMN_TYPE	longtext	NO		NULL	
+COLUMN_KEY	varchar(3)	NO		NULL	
+EXTRA	varchar(30)	NO		NULL	
+PRIVILEGES	varchar(80)	NO		NULL	
+COLUMN_COMMENT	varchar(1024)	NO		NULL	
+IS_GENERATED	varchar(6)	NO		NULL	
 GENERATION_EXPRESSION	longtext	YES		NULL	
 SHOW CREATE TABLE information_schema.COLUMNS;
 Table	Create Table
 COLUMNS	CREATE TEMPORARY TABLE `COLUMNS` (
-  `TABLE_CATALOG` varchar(512) NOT NULL DEFAULT '',
-  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `COLUMN_NAME` varchar(64) NOT NULL DEFAULT '',
-  `ORDINAL_POSITION` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `COLUMN_DEFAULT` longtext DEFAULT NULL,
-  `IS_NULLABLE` varchar(3) NOT NULL DEFAULT '',
-  `DATA_TYPE` varchar(64) NOT NULL DEFAULT '',
-  `CHARACTER_MAXIMUM_LENGTH` bigint(21) unsigned DEFAULT NULL,
-  `CHARACTER_OCTET_LENGTH` bigint(21) unsigned DEFAULT NULL,
-  `NUMERIC_PRECISION` bigint(21) unsigned DEFAULT NULL,
-  `NUMERIC_SCALE` bigint(21) unsigned DEFAULT NULL,
-  `DATETIME_PRECISION` bigint(21) unsigned DEFAULT NULL,
-  `CHARACTER_SET_NAME` varchar(32) DEFAULT NULL,
-  `COLLATION_NAME` varchar(32) DEFAULT NULL,
-  `COLUMN_TYPE` longtext NOT NULL DEFAULT '',
-  `COLUMN_KEY` varchar(3) NOT NULL DEFAULT '',
-  `EXTRA` varchar(30) NOT NULL DEFAULT '',
-  `PRIVILEGES` varchar(80) NOT NULL DEFAULT '',
-  `COLUMN_COMMENT` varchar(1024) NOT NULL DEFAULT '',
-  `IS_GENERATED` varchar(6) NOT NULL DEFAULT '',
-  `GENERATION_EXPRESSION` longtext DEFAULT NULL
+  `TABLE_CATALOG` varchar(512) NOT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL,
+  `TABLE_NAME` varchar(64) NOT NULL,
+  `COLUMN_NAME` varchar(64) NOT NULL,
+  `ORDINAL_POSITION` bigint(21) unsigned NOT NULL,
+  `COLUMN_DEFAULT` longtext,
+  `IS_NULLABLE` varchar(3) NOT NULL,
+  `DATA_TYPE` varchar(64) NOT NULL,
+  `CHARACTER_MAXIMUM_LENGTH` bigint(21) unsigned,
+  `CHARACTER_OCTET_LENGTH` bigint(21) unsigned,
+  `NUMERIC_PRECISION` bigint(21) unsigned,
+  `NUMERIC_SCALE` bigint(21) unsigned,
+  `DATETIME_PRECISION` bigint(21) unsigned,
+  `CHARACTER_SET_NAME` varchar(32),
+  `COLLATION_NAME` varchar(32),
+  `COLUMN_TYPE` longtext NOT NULL,
+  `COLUMN_KEY` varchar(3) NOT NULL,
+  `EXTRA` varchar(30) NOT NULL,
+  `PRIVILEGES` varchar(80) NOT NULL,
+  `COLUMN_COMMENT` varchar(1024) NOT NULL,
+  `IS_GENERATED` varchar(6) NOT NULL,
+  `GENERATION_EXPRESSION` longtext
 )  DEFAULT CHARSET=utf8mb3
 SHOW COLUMNS FROM information_schema.COLUMNS;
 Field	Type	Null	Key	Default	Extra
-TABLE_CATALOG	varchar(512)	NO			
-TABLE_SCHEMA	varchar(64)	NO			
-TABLE_NAME	varchar(64)	NO			
-COLUMN_NAME	varchar(64)	NO			
-ORDINAL_POSITION	bigint(21) unsigned	NO		0	
+TABLE_CATALOG	varchar(512)	NO		NULL	
+TABLE_SCHEMA	varchar(64)	NO		NULL	
+TABLE_NAME	varchar(64)	NO		NULL	
+COLUMN_NAME	varchar(64)	NO		NULL	
+ORDINAL_POSITION	bigint(21) unsigned	NO		NULL	
 COLUMN_DEFAULT	longtext	YES		NULL	
-IS_NULLABLE	varchar(3)	NO			
-DATA_TYPE	varchar(64)	NO			
+IS_NULLABLE	varchar(3)	NO		NULL	
+DATA_TYPE	varchar(64)	NO		NULL	
 CHARACTER_MAXIMUM_LENGTH	bigint(21) unsigned	YES		NULL	
 CHARACTER_OCTET_LENGTH	bigint(21) unsigned	YES		NULL	
 NUMERIC_PRECISION	bigint(21) unsigned	YES		NULL	
@@ -93,12 +93,12 @@ NUMERIC_SCALE	bigint(21) unsigned	YES		NULL
 DATETIME_PRECISION	bigint(21) unsigned	YES		NULL	
 CHARACTER_SET_NAME	varchar(32)	YES		NULL	
 COLLATION_NAME	varchar(32)	YES		NULL	
-COLUMN_TYPE	longtext	NO			
-COLUMN_KEY	varchar(3)	NO			
-EXTRA	varchar(30)	NO			
-PRIVILEGES	varchar(80)	NO			
-COLUMN_COMMENT	varchar(1024)	NO			
-IS_GENERATED	varchar(6)	NO			
+COLUMN_TYPE	longtext	NO		NULL	
+COLUMN_KEY	varchar(3)	NO		NULL	
+EXTRA	varchar(30)	NO		NULL	
+PRIVILEGES	varchar(80)	NO		NULL	
+COLUMN_COMMENT	varchar(1024)	NO		NULL	
+IS_GENERATED	varchar(6)	NO		NULL	
 GENERATION_EXPRESSION	longtext	YES		NULL	
 SELECT table_catalog, table_schema, table_name, column_name
 FROM information_schema.columns WHERE table_catalog IS NULL OR table_catalog <> 'def';
diff --git a/mysql-test/suite/funcs_1/r/is_columns_is.result b/mysql-test/suite/funcs_1/r/is_columns_is.result
index 5d239dd8393..a72fed20bc9 100644
--- a/mysql-test/suite/funcs_1/r/is_columns_is.result
+++ b/mysql-test/suite/funcs_1/r/is_columns_is.result
@@ -3,126 +3,126 @@ WHERE table_schema = 'information_schema'
 AND table_name <> 'profiling' AND table_name not like 'innodb_%'
 ORDER BY table_schema, table_name, column_name;
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT	IS_GENERATED	GENERATION_EXPRESSION
-def	information_schema	ALL_PLUGINS	LOAD_OPTION	11	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	ALL_PLUGINS	LOAD_OPTION	11	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
 def	information_schema	ALL_PLUGINS	PLUGIN_AUTHOR	8	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
 def	information_schema	ALL_PLUGINS	PLUGIN_AUTH_VERSION	13	NULL	YES	varchar	80	240	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(80)			select		NEVER	NULL
 def	information_schema	ALL_PLUGINS	PLUGIN_DESCRIPTION	9	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext			select		NEVER	NULL
 def	information_schema	ALL_PLUGINS	PLUGIN_LIBRARY	6	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
 def	information_schema	ALL_PLUGINS	PLUGIN_LIBRARY_VERSION	7	NULL	YES	varchar	20	60	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(20)			select		NEVER	NULL
-def	information_schema	ALL_PLUGINS	PLUGIN_LICENSE	10	''	NO	varchar	80	240	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(80)			select		NEVER	NULL
-def	information_schema	ALL_PLUGINS	PLUGIN_MATURITY	12	''	NO	varchar	12	36	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(12)			select		NEVER	NULL
-def	information_schema	ALL_PLUGINS	PLUGIN_NAME	1	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	ALL_PLUGINS	PLUGIN_STATUS	3	''	NO	varchar	16	48	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(16)			select		NEVER	NULL
-def	information_schema	ALL_PLUGINS	PLUGIN_TYPE	4	''	NO	varchar	80	240	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(80)			select		NEVER	NULL
-def	information_schema	ALL_PLUGINS	PLUGIN_TYPE_VERSION	5	''	NO	varchar	20	60	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(20)			select		NEVER	NULL
-def	information_schema	ALL_PLUGINS	PLUGIN_VERSION	2	''	NO	varchar	20	60	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(20)			select		NEVER	NULL
-def	information_schema	APPLICABLE_ROLES	GRANTEE	1	''	NO	varchar	385	1155	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(385)			select		NEVER	NULL
+def	information_schema	ALL_PLUGINS	PLUGIN_LICENSE	10	NULL	NO	varchar	80	240	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(80)			select		NEVER	NULL
+def	information_schema	ALL_PLUGINS	PLUGIN_MATURITY	12	NULL	NO	varchar	12	36	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(12)			select		NEVER	NULL
+def	information_schema	ALL_PLUGINS	PLUGIN_NAME	1	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	ALL_PLUGINS	PLUGIN_STATUS	3	NULL	NO	varchar	16	48	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(16)			select		NEVER	NULL
+def	information_schema	ALL_PLUGINS	PLUGIN_TYPE	4	NULL	NO	varchar	80	240	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(80)			select		NEVER	NULL
+def	information_schema	ALL_PLUGINS	PLUGIN_TYPE_VERSION	5	NULL	NO	varchar	20	60	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(20)			select		NEVER	NULL
+def	information_schema	ALL_PLUGINS	PLUGIN_VERSION	2	NULL	NO	varchar	20	60	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(20)			select		NEVER	NULL
+def	information_schema	APPLICABLE_ROLES	GRANTEE	1	NULL	NO	varchar	385	1155	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(385)			select		NEVER	NULL
 def	information_schema	APPLICABLE_ROLES	IS_DEFAULT	4	NULL	YES	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)			select		NEVER	NULL
-def	information_schema	APPLICABLE_ROLES	IS_GRANTABLE	3	''	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)			select		NEVER	NULL
-def	information_schema	APPLICABLE_ROLES	ROLE_NAME	2	''	NO	varchar	128	384	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(128)			select		NEVER	NULL
-def	information_schema	CHARACTER_SETS	CHARACTER_SET_NAME	1	''	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)			select		NEVER	NULL
-def	information_schema	CHARACTER_SETS	DEFAULT_COLLATE_NAME	2	''	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)			select		NEVER	NULL
-def	information_schema	CHARACTER_SETS	DESCRIPTION	3	''	NO	varchar	60	180	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(60)			select		NEVER	NULL
-def	information_schema	CHARACTER_SETS	MAXLEN	4	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(3)			select		NEVER	NULL
-def	information_schema	CHECK_CONSTRAINTS	CHECK_CLAUSE	6	''	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext			select		NEVER	NULL
-def	information_schema	CHECK_CONSTRAINTS	CONSTRAINT_CATALOG	1	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
-def	information_schema	CHECK_CONSTRAINTS	CONSTRAINT_NAME	4	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	CHECK_CONSTRAINTS	CONSTRAINT_SCHEMA	2	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	CHECK_CONSTRAINTS	LEVEL	5	''	NO	varchar	6	18	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(6)			select		NEVER	NULL
-def	information_schema	CHECK_CONSTRAINTS	TABLE_NAME	3	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	ACCESS_DENIED	22	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	BINLOG_BYTES_WRITTEN	9	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	BUSY_TIME	5	0	NO	double	NULL	NULL	21	NULL	NULL	NULL	NULL	double			select		NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	BYTES_RECEIVED	7	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	BYTES_SENT	8	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	CLIENT	1	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	COMMIT_TRANSACTIONS	18	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	CONCURRENT_CONNECTIONS	3	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	CONNECTED_TIME	4	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	CPU_TIME	6	0	NO	double	NULL	NULL	21	NULL	NULL	NULL	NULL	double			select		NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	DENIED_CONNECTIONS	20	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	EMPTY_QUERIES	23	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	LOST_CONNECTIONS	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	MAX_STATEMENT_TIME_EXCEEDED	25	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	OTHER_COMMANDS	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	ROLLBACK_TRANSACTIONS	19	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	ROWS_DELETED	12	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	ROWS_INSERTED	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	ROWS_READ	10	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	ROWS_SENT	11	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	ROWS_UPDATED	14	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	SELECT_COMMANDS	15	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	TOTAL_CONNECTIONS	2	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	TOTAL_SSL_CONNECTIONS	24	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	UPDATE_COMMANDS	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
-def	information_schema	COLLATIONS	CHARACTER_SET_NAME	2	''	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)			select		NEVER	NULL
-def	information_schema	COLLATIONS	COLLATION_NAME	1	''	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)			select		NEVER	NULL
-def	information_schema	COLLATIONS	ID	3	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(11)			select		NEVER	NULL
-def	information_schema	COLLATIONS	IS_COMPILED	5	''	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)			select		NEVER	NULL
-def	information_schema	COLLATIONS	IS_DEFAULT	4	''	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)			select		NEVER	NULL
-def	information_schema	COLLATIONS	SORTLEN	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(3)			select		NEVER	NULL
-def	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	CHARACTER_SET_NAME	2	''	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)			select		NEVER	NULL
-def	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	COLLATION_NAME	1	''	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)			select		NEVER	NULL
+def	information_schema	APPLICABLE_ROLES	IS_GRANTABLE	3	NULL	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)			select		NEVER	NULL
+def	information_schema	APPLICABLE_ROLES	ROLE_NAME	2	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(128)			select		NEVER	NULL
+def	information_schema	CHARACTER_SETS	CHARACTER_SET_NAME	1	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)			select		NEVER	NULL
+def	information_schema	CHARACTER_SETS	DEFAULT_COLLATE_NAME	2	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)			select		NEVER	NULL
+def	information_schema	CHARACTER_SETS	DESCRIPTION	3	NULL	NO	varchar	60	180	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(60)			select		NEVER	NULL
+def	information_schema	CHARACTER_SETS	MAXLEN	4	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(3)			select		NEVER	NULL
+def	information_schema	CHECK_CONSTRAINTS	CHECK_CLAUSE	6	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext			select		NEVER	NULL
+def	information_schema	CHECK_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
+def	information_schema	CHECK_CONSTRAINTS	CONSTRAINT_NAME	4	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	CHECK_CONSTRAINTS	CONSTRAINT_SCHEMA	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	CHECK_CONSTRAINTS	LEVEL	5	NULL	NO	varchar	6	18	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(6)			select		NEVER	NULL
+def	information_schema	CHECK_CONSTRAINTS	TABLE_NAME	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	ACCESS_DENIED	22	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	BINLOG_BYTES_WRITTEN	9	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	BUSY_TIME	5	NULL	NO	double	NULL	NULL	21	NULL	NULL	NULL	NULL	double			select		NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	BYTES_RECEIVED	7	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	BYTES_SENT	8	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	CLIENT	1	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	COMMIT_TRANSACTIONS	18	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	CONCURRENT_CONNECTIONS	3	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	CONNECTED_TIME	4	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	CPU_TIME	6	NULL	NO	double	NULL	NULL	21	NULL	NULL	NULL	NULL	double			select		NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	DENIED_CONNECTIONS	20	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	EMPTY_QUERIES	23	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	LOST_CONNECTIONS	21	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	MAX_STATEMENT_TIME_EXCEEDED	25	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	OTHER_COMMANDS	17	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	ROLLBACK_TRANSACTIONS	19	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	ROWS_DELETED	12	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	ROWS_INSERTED	13	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	ROWS_READ	10	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	ROWS_SENT	11	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	ROWS_UPDATED	14	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	SELECT_COMMANDS	15	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	TOTAL_CONNECTIONS	2	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	TOTAL_SSL_CONNECTIONS	24	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	UPDATE_COMMANDS	16	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
+def	information_schema	COLLATIONS	CHARACTER_SET_NAME	2	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)			select		NEVER	NULL
+def	information_schema	COLLATIONS	COLLATION_NAME	1	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)			select		NEVER	NULL
+def	information_schema	COLLATIONS	ID	3	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(11)			select		NEVER	NULL
+def	information_schema	COLLATIONS	IS_COMPILED	5	NULL	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)			select		NEVER	NULL
+def	information_schema	COLLATIONS	IS_DEFAULT	4	NULL	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)			select		NEVER	NULL
+def	information_schema	COLLATIONS	SORTLEN	6	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(3)			select		NEVER	NULL
+def	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	CHARACTER_SET_NAME	2	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)			select		NEVER	NULL
+def	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	COLLATION_NAME	1	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)			select		NEVER	NULL
 def	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
 def	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
 def	information_schema	COLUMNS	CHARACTER_SET_NAME	14	NULL	YES	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)			select		NEVER	NULL
 def	information_schema	COLUMNS	COLLATION_NAME	15	NULL	YES	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)			select		NEVER	NULL
-def	information_schema	COLUMNS	COLUMN_COMMENT	20	''	NO	varchar	1024	3072	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(1024)			select		NEVER	NULL
+def	information_schema	COLUMNS	COLUMN_COMMENT	20	NULL	NO	varchar	1024	3072	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(1024)			select		NEVER	NULL
 def	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext			select		NEVER	NULL
-def	information_schema	COLUMNS	COLUMN_KEY	17	''	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)			select		NEVER	NULL
-def	information_schema	COLUMNS	COLUMN_NAME	4	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	COLUMNS	COLUMN_TYPE	16	''	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext			select		NEVER	NULL
-def	information_schema	COLUMNS	DATA_TYPE	8	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	COLUMNS	COLUMN_KEY	17	NULL	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)			select		NEVER	NULL
+def	information_schema	COLUMNS	COLUMN_NAME	4	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	COLUMNS	COLUMN_TYPE	16	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext			select		NEVER	NULL
+def	information_schema	COLUMNS	DATA_TYPE	8	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
 def	information_schema	COLUMNS	DATETIME_PRECISION	13	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
-def	information_schema	COLUMNS	EXTRA	18	''	NO	varchar	30	90	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(30)			select		NEVER	NULL
+def	information_schema	COLUMNS	EXTRA	18	NULL	NO	varchar	30	90	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(30)			select		NEVER	NULL
 def	information_schema	COLUMNS	GENERATION_EXPRESSION	22	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext			select		NEVER	NULL
-def	information_schema	COLUMNS	IS_GENERATED	21	''	NO	varchar	6	18	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(6)			select		NEVER	NULL
-def	information_schema	COLUMNS	IS_NULLABLE	7	''	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)			select		NEVER	NULL
+def	information_schema	COLUMNS	IS_GENERATED	21	NULL	NO	varchar	6	18	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(6)			select		NEVER	NULL
+def	information_schema	COLUMNS	IS_NULLABLE	7	NULL	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)			select		NEVER	NULL
 def	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
 def	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
-def	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
-def	information_schema	COLUMNS	PRIVILEGES	19	''	NO	varchar	80	240	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(80)			select		NEVER	NULL
-def	information_schema	COLUMNS	TABLE_CATALOG	1	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
-def	information_schema	COLUMNS	TABLE_NAME	3	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	COLUMNS	TABLE_SCHEMA	2	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	5	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	COLUMN_PRIVILEGES	GRANTEE	1	''	NO	varchar	385	1155	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(385)			select		NEVER	NULL
-def	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	7	''	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)			select		NEVER	NULL
-def	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	6	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	COLUMN_PRIVILEGES	TABLE_CATALOG	2	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
-def	information_schema	COLUMN_PRIVILEGES	TABLE_NAME	4	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	COLUMN_PRIVILEGES	TABLE_SCHEMA	3	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	COLUMNS	ORDINAL_POSITION	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
+def	information_schema	COLUMNS	PRIVILEGES	19	NULL	NO	varchar	80	240	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(80)			select		NEVER	NULL
+def	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
+def	information_schema	COLUMNS	TABLE_NAME	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	COLUMNS	TABLE_SCHEMA	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	5	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	COLUMN_PRIVILEGES	GRANTEE	1	NULL	NO	varchar	385	1155	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(385)			select		NEVER	NULL
+def	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	7	NULL	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)			select		NEVER	NULL
+def	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	6	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	COLUMN_PRIVILEGES	TABLE_CATALOG	2	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
+def	information_schema	COLUMN_PRIVILEGES	TABLE_NAME	4	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	COLUMN_PRIVILEGES	TABLE_SCHEMA	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
 def	information_schema	ENABLED_ROLES	ROLE_NAME	1	NULL	YES	varchar	128	384	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(128)			select		NEVER	NULL
-def	information_schema	ENGINES	COMMENT	3	''	NO	varchar	160	480	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(160)			select		NEVER	NULL
-def	information_schema	ENGINES	ENGINE	1	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	ENGINES	COMMENT	3	NULL	NO	varchar	160	480	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(160)			select		NEVER	NULL
+def	information_schema	ENGINES	ENGINE	1	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
 def	information_schema	ENGINES	SAVEPOINTS	6	NULL	YES	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)			select		NEVER	NULL
-def	information_schema	ENGINES	SUPPORT	2	''	NO	varchar	8	24	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(8)			select		NEVER	NULL
+def	information_schema	ENGINES	SUPPORT	2	NULL	NO	varchar	8	24	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(8)			select		NEVER	NULL
 def	information_schema	ENGINES	TRANSACTIONS	4	NULL	YES	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)			select		NEVER	NULL
 def	information_schema	ENGINES	XA	5	NULL	YES	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)			select		NEVER	NULL
-def	information_schema	EVENTS	CHARACTER_SET_CLIENT	22	''	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)			select		NEVER	NULL
-def	information_schema	EVENTS	COLLATION_CONNECTION	23	''	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)			select		NEVER	NULL
-def	information_schema	EVENTS	CREATED	17	'0000-00-00 00:00:00'	NO	datetime	NULL	NULL	NULL	NULL	0	NULL	NULL	datetime			select		NEVER	NULL
-def	information_schema	EVENTS	DATABASE_COLLATION	24	''	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)			select		NEVER	NULL
-def	information_schema	EVENTS	DEFINER	4	''	NO	varchar	384	1152	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(384)			select		NEVER	NULL
+def	information_schema	EVENTS	CHARACTER_SET_CLIENT	22	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)			select		NEVER	NULL
+def	information_schema	EVENTS	COLLATION_CONNECTION	23	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)			select		NEVER	NULL
+def	information_schema	EVENTS	CREATED	17	NULL	NO	datetime	NULL	NULL	NULL	NULL	0	NULL	NULL	datetime			select		NEVER	NULL
+def	information_schema	EVENTS	DATABASE_COLLATION	24	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)			select		NEVER	NULL
+def	information_schema	EVENTS	DEFINER	4	NULL	NO	varchar	384	1152	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(384)			select		NEVER	NULL
 def	information_schema	EVENTS	ENDS	14	NULL	YES	datetime	NULL	NULL	NULL	NULL	0	NULL	NULL	datetime			select		NEVER	NULL
-def	information_schema	EVENTS	EVENT_BODY	6	''	NO	varchar	8	24	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(8)			select		NEVER	NULL
-def	information_schema	EVENTS	EVENT_CATALOG	1	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	EVENTS	EVENT_COMMENT	20	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	EVENTS	EVENT_DEFINITION	7	''	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext			select		NEVER	NULL
-def	information_schema	EVENTS	EVENT_NAME	3	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	EVENTS	EVENT_SCHEMA	2	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	EVENTS	EVENT_TYPE	8	''	NO	varchar	9	27	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(9)			select		NEVER	NULL
+def	information_schema	EVENTS	EVENT_BODY	6	NULL	NO	varchar	8	24	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(8)			select		NEVER	NULL
+def	information_schema	EVENTS	EVENT_CATALOG	1	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	EVENTS	EVENT_COMMENT	20	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	EVENTS	EVENT_DEFINITION	7	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext			select		NEVER	NULL
+def	information_schema	EVENTS	EVENT_NAME	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	EVENTS	EVENT_SCHEMA	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	EVENTS	EVENT_TYPE	8	NULL	NO	varchar	9	27	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(9)			select		NEVER	NULL
 def	information_schema	EVENTS	EXECUTE_AT	9	NULL	YES	datetime	NULL	NULL	NULL	NULL	0	NULL	NULL	datetime			select		NEVER	NULL
 def	information_schema	EVENTS	INTERVAL_FIELD	11	NULL	YES	varchar	18	54	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(18)			select		NEVER	NULL
 def	information_schema	EVENTS	INTERVAL_VALUE	10	NULL	YES	varchar	256	768	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(256)			select		NEVER	NULL
-def	information_schema	EVENTS	LAST_ALTERED	18	'0000-00-00 00:00:00'	NO	datetime	NULL	NULL	NULL	NULL	0	NULL	NULL	datetime			select		NEVER	NULL
+def	information_schema	EVENTS	LAST_ALTERED	18	NULL	NO	datetime	NULL	NULL	NULL	NULL	0	NULL	NULL	datetime			select		NEVER	NULL
 def	information_schema	EVENTS	LAST_EXECUTED	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	0	NULL	NULL	datetime			select		NEVER	NULL
-def	information_schema	EVENTS	ON_COMPLETION	16	''	NO	varchar	12	36	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(12)			select		NEVER	NULL
-def	information_schema	EVENTS	ORIGINATOR	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(10)			select		NEVER	NULL
-def	information_schema	EVENTS	SQL_MODE	12	''	NO	varchar	8192	24576	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(8192)			select		NEVER	NULL
+def	information_schema	EVENTS	ON_COMPLETION	16	NULL	NO	varchar	12	36	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(12)			select		NEVER	NULL
+def	information_schema	EVENTS	ORIGINATOR	21	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(10)			select		NEVER	NULL
+def	information_schema	EVENTS	SQL_MODE	12	NULL	NO	varchar	8192	24576	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(8192)			select		NEVER	NULL
 def	information_schema	EVENTS	STARTS	13	NULL	YES	datetime	NULL	NULL	NULL	NULL	0	NULL	NULL	datetime			select		NEVER	NULL
-def	information_schema	EVENTS	STATUS	15	''	NO	varchar	18	54	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(18)			select		NEVER	NULL
-def	information_schema	EVENTS	TIME_ZONE	5	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	EVENTS	STATUS	15	NULL	NO	varchar	18	54	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(18)			select		NEVER	NULL
+def	information_schema	EVENTS	TIME_ZONE	5	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
 def	information_schema	FILES	AUTOEXTEND_SIZE	19	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
 def	information_schema	FILES	AVG_ROW_LENGTH	28	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
 def	information_schema	FILES	CHECKSUM	36	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
@@ -132,12 +132,12 @@ def	information_schema	FILES	CREATION_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	N
 def	information_schema	FILES	DATA_FREE	32	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
 def	information_schema	FILES	DATA_LENGTH	29	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
 def	information_schema	FILES	DELETED_ROWS	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(4)			select		NEVER	NULL
-def	information_schema	FILES	ENGINE	10	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	FILES	EXTENT_SIZE	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(4)			select		NEVER	NULL
+def	information_schema	FILES	ENGINE	10	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	FILES	EXTENT_SIZE	16	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(4)			select		NEVER	NULL
 def	information_schema	FILES	EXTRA	38	NULL	YES	varchar	255	765	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(255)			select		NEVER	NULL
-def	information_schema	FILES	FILE_ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(4)			select		NEVER	NULL
+def	information_schema	FILES	FILE_ID	1	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(4)			select		NEVER	NULL
 def	information_schema	FILES	FILE_NAME	2	NULL	YES	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
-def	information_schema	FILES	FILE_TYPE	3	''	NO	varchar	20	60	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(20)			select		NEVER	NULL
+def	information_schema	FILES	FILE_TYPE	3	NULL	NO	varchar	20	60	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(20)			select		NEVER	NULL
 def	information_schema	FILES	FREE_EXTENTS	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(4)			select		NEVER	NULL
 def	information_schema	FILES	FULLTEXT_KEYS	11	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
 def	information_schema	FILES	INDEX_LENGTH	31	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
@@ -150,9 +150,9 @@ def	information_schema	FILES	MAXIMUM_SIZE	18	NULL	YES	bigint	NULL	NULL	20	0	NULL
 def	information_schema	FILES	MAX_DATA_LENGTH	30	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
 def	information_schema	FILES	RECOVER_TIME	23	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(4)			select		NEVER	NULL
 def	information_schema	FILES	ROW_FORMAT	26	NULL	YES	varchar	10	30	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(10)			select		NEVER	NULL
-def	information_schema	FILES	STATUS	37	''	NO	varchar	20	60	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(20)			select		NEVER	NULL
+def	information_schema	FILES	STATUS	37	NULL	NO	varchar	20	60	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(20)			select		NEVER	NULL
 def	information_schema	FILES	TABLESPACE_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	FILES	TABLE_CATALOG	5	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	FILES	TABLE_CATALOG	5	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
 def	information_schema	FILES	TABLE_NAME	7	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
 def	information_schema	FILES	TABLE_ROWS	27	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
 def	information_schema	FILES	TABLE_SCHEMA	6	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
@@ -161,82 +161,82 @@ def	information_schema	FILES	TRANSACTION_COUNTER	24	NULL	YES	bigint	NULL	NULL	19
 def	information_schema	FILES	UPDATE_COUNT	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(4)			select		NEVER	NULL
 def	information_schema	FILES	UPDATE_TIME	34	NULL	YES	datetime	NULL	NULL	NULL	NULL	0	NULL	NULL	datetime			select		NEVER	NULL
 def	information_schema	FILES	VERSION	25	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
-def	information_schema	GEOMETRY_COLUMNS	COORD_DIMENSION	11	0	NO	tinyint	NULL	NULL	3	0	NULL	NULL	NULL	tinyint(2)			select		NEVER	NULL
-def	information_schema	GEOMETRY_COLUMNS	F_GEOMETRY_COLUMN	4	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	GEOMETRY_COLUMNS	F_TABLE_CATALOG	1	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
-def	information_schema	GEOMETRY_COLUMNS	F_TABLE_NAME	3	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	GEOMETRY_COLUMNS	F_TABLE_SCHEMA	2	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	GEOMETRY_COLUMNS	GEOMETRY_TYPE	10	0	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(7)			select		NEVER	NULL
-def	information_schema	GEOMETRY_COLUMNS	G_GEOMETRY_COLUMN	8	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	GEOMETRY_COLUMNS	G_TABLE_CATALOG	5	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
-def	information_schema	GEOMETRY_COLUMNS	G_TABLE_NAME	7	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	GEOMETRY_COLUMNS	G_TABLE_SCHEMA	6	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	GEOMETRY_COLUMNS	MAX_PPR	12	0	NO	tinyint	NULL	NULL	3	0	NULL	NULL	NULL	tinyint(2)			select		NEVER	NULL
-def	information_schema	GEOMETRY_COLUMNS	SRID	13	0	NO	smallint	NULL	NULL	5	0	NULL	NULL	NULL	smallint(5)			select		NEVER	NULL
-def	information_schema	GEOMETRY_COLUMNS	STORAGE_TYPE	9	0	NO	tinyint	NULL	NULL	3	0	NULL	NULL	NULL	tinyint(2)			select		NEVER	NULL
-def	information_schema	GLOBAL_STATUS	VARIABLE_NAME	1	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	GLOBAL_STATUS	VARIABLE_VALUE	2	''	NO	varchar	2048	6144	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(2048)			select		NEVER	NULL
-def	information_schema	GLOBAL_VARIABLES	VARIABLE_NAME	1	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	2	''	NO	varchar	2048	6144	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(2048)			select		NEVER	NULL
-def	information_schema	INDEX_STATISTICS	INDEX_NAME	3	''	NO	varchar	192	576	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(192)			select		NEVER	NULL
-def	information_schema	INDEX_STATISTICS	ROWS_READ	4	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
-def	information_schema	INDEX_STATISTICS	TABLE_NAME	2	''	NO	varchar	192	576	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(192)			select		NEVER	NULL
-def	information_schema	INDEX_STATISTICS	TABLE_SCHEMA	1	''	NO	varchar	192	576	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(192)			select		NEVER	NULL
+def	information_schema	GEOMETRY_COLUMNS	COORD_DIMENSION	11	NULL	NO	tinyint	NULL	NULL	3	0	NULL	NULL	NULL	tinyint(2)			select		NEVER	NULL
+def	information_schema	GEOMETRY_COLUMNS	F_GEOMETRY_COLUMN	4	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	GEOMETRY_COLUMNS	F_TABLE_CATALOG	1	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
+def	information_schema	GEOMETRY_COLUMNS	F_TABLE_NAME	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	GEOMETRY_COLUMNS	F_TABLE_SCHEMA	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	GEOMETRY_COLUMNS	GEOMETRY_TYPE	10	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(7)			select		NEVER	NULL
+def	information_schema	GEOMETRY_COLUMNS	G_GEOMETRY_COLUMN	8	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	GEOMETRY_COLUMNS	G_TABLE_CATALOG	5	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
+def	information_schema	GEOMETRY_COLUMNS	G_TABLE_NAME	7	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	GEOMETRY_COLUMNS	G_TABLE_SCHEMA	6	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	GEOMETRY_COLUMNS	MAX_PPR	12	NULL	NO	tinyint	NULL	NULL	3	0	NULL	NULL	NULL	tinyint(2)			select		NEVER	NULL
+def	information_schema	GEOMETRY_COLUMNS	SRID	13	NULL	NO	smallint	NULL	NULL	5	0	NULL	NULL	NULL	smallint(5)			select		NEVER	NULL
+def	information_schema	GEOMETRY_COLUMNS	STORAGE_TYPE	9	NULL	NO	tinyint	NULL	NULL	3	0	NULL	NULL	NULL	tinyint(2)			select		NEVER	NULL
+def	information_schema	GLOBAL_STATUS	VARIABLE_NAME	1	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	GLOBAL_STATUS	VARIABLE_VALUE	2	NULL	NO	varchar	2048	6144	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(2048)			select		NEVER	NULL
+def	information_schema	GLOBAL_VARIABLES	VARIABLE_NAME	1	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	2	NULL	NO	varchar	2048	6144	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(2048)			select		NEVER	NULL
+def	information_schema	INDEX_STATISTICS	INDEX_NAME	3	NULL	NO	varchar	192	576	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(192)			select		NEVER	NULL
+def	information_schema	INDEX_STATISTICS	ROWS_READ	4	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
+def	information_schema	INDEX_STATISTICS	TABLE_NAME	2	NULL	NO	varchar	192	576	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(192)			select		NEVER	NULL
+def	information_schema	INDEX_STATISTICS	TABLE_SCHEMA	1	NULL	NO	varchar	192	576	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(192)			select		NEVER	NULL
 def	information_schema	KEYWORDS	WORD	1	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	KEY_CACHES	BLOCK_SIZE	5	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
-def	information_schema	KEY_CACHES	DIRTY_BLOCKS	8	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
-def	information_schema	KEY_CACHES	FULL_SIZE	4	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
-def	information_schema	KEY_CACHES	KEY_CACHE_NAME	1	''	NO	varchar	192	576	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(192)			select		NEVER	NULL
-def	information_schema	KEY_CACHES	READS	10	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
-def	information_schema	KEY_CACHES	READ_REQUESTS	9	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
+def	information_schema	KEY_CACHES	BLOCK_SIZE	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
+def	information_schema	KEY_CACHES	DIRTY_BLOCKS	8	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
+def	information_schema	KEY_CACHES	FULL_SIZE	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
+def	information_schema	KEY_CACHES	KEY_CACHE_NAME	1	NULL	NO	varchar	192	576	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(192)			select		NEVER	NULL
+def	information_schema	KEY_CACHES	READS	10	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
+def	information_schema	KEY_CACHES	READ_REQUESTS	9	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
 def	information_schema	KEY_CACHES	SEGMENTS	2	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(3) unsigned			select		NEVER	NULL
 def	information_schema	KEY_CACHES	SEGMENT_NUMBER	3	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(3) unsigned			select		NEVER	NULL
-def	information_schema	KEY_CACHES	UNUSED_BLOCKS	7	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
-def	information_schema	KEY_CACHES	USED_BLOCKS	6	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
-def	information_schema	KEY_CACHES	WRITES	12	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
-def	information_schema	KEY_CACHES	WRITE_REQUESTS	11	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
-def	information_schema	KEY_COLUMN_USAGE	COLUMN_NAME	7	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	1	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
-def	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	3	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	2	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	KEY_COLUMN_USAGE	ORDINAL_POSITION	8	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(10)			select		NEVER	NULL
+def	information_schema	KEY_CACHES	UNUSED_BLOCKS	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
+def	information_schema	KEY_CACHES	USED_BLOCKS	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
+def	information_schema	KEY_CACHES	WRITES	12	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
+def	information_schema	KEY_CACHES	WRITE_REQUESTS	11	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
+def	information_schema	KEY_COLUMN_USAGE	COLUMN_NAME	7	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	1	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
+def	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	KEY_COLUMN_USAGE	ORDINAL_POSITION	8	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(10)			select		NEVER	NULL
 def	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(10)			select		NEVER	NULL
 def	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
 def	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	11	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
 def	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	KEY_COLUMN_USAGE	TABLE_CATALOG	4	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
-def	information_schema	KEY_COLUMN_USAGE	TABLE_NAME	6	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	KEY_COLUMN_USAGE	TABLE_SCHEMA	5	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	OPTIMIZER_TRACE	INSUFFICIENT_PRIVILEGES	4	0	NO	tinyint	NULL	NULL	3	0	NULL	NULL	NULL	tinyint(1)			select		NEVER	NULL
-def	information_schema	OPTIMIZER_TRACE	MISSING_BYTES_BEYOND_MAX_MEM_SIZE	3	0	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(20)			select		NEVER	NULL
-def	information_schema	OPTIMIZER_TRACE	QUERY	1	''	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext			select		NEVER	NULL
-def	information_schema	OPTIMIZER_TRACE	TRACE	2	''	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext			select		NEVER	NULL
+def	information_schema	KEY_COLUMN_USAGE	TABLE_CATALOG	4	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
+def	information_schema	KEY_COLUMN_USAGE	TABLE_NAME	6	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	KEY_COLUMN_USAGE	TABLE_SCHEMA	5	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	OPTIMIZER_TRACE	INSUFFICIENT_PRIVILEGES	4	NULL	NO	tinyint	NULL	NULL	3	0	NULL	NULL	NULL	tinyint(1)			select		NEVER	NULL
+def	information_schema	OPTIMIZER_TRACE	MISSING_BYTES_BEYOND_MAX_MEM_SIZE	3	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(20)			select		NEVER	NULL
+def	information_schema	OPTIMIZER_TRACE	QUERY	1	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext			select		NEVER	NULL
+def	information_schema	OPTIMIZER_TRACE	TRACE	2	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext			select		NEVER	NULL
 def	information_schema	PARAMETERS	CHARACTER_MAXIMUM_LENGTH	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(21)			select		NEVER	NULL
 def	information_schema	PARAMETERS	CHARACTER_OCTET_LENGTH	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(21)			select		NEVER	NULL
 def	information_schema	PARAMETERS	CHARACTER_SET_NAME	13	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
 def	information_schema	PARAMETERS	COLLATION_NAME	14	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	PARAMETERS	DATA_TYPE	7	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	PARAMETERS	DATA_TYPE	7	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
 def	information_schema	PARAMETERS	DATETIME_PRECISION	12	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
-def	information_schema	PARAMETERS	DTD_IDENTIFIER	15	''	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext			select		NEVER	NULL
+def	information_schema	PARAMETERS	DTD_IDENTIFIER	15	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext			select		NEVER	NULL
 def	information_schema	PARAMETERS	NUMERIC_PRECISION	10	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(21)			select		NEVER	NULL
 def	information_schema	PARAMETERS	NUMERIC_SCALE	11	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(21)			select		NEVER	NULL
-def	information_schema	PARAMETERS	ORDINAL_POSITION	4	0	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(21)			select		NEVER	NULL
+def	information_schema	PARAMETERS	ORDINAL_POSITION	4	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(21)			select		NEVER	NULL
 def	information_schema	PARAMETERS	PARAMETER_MODE	5	NULL	YES	varchar	5	15	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(5)			select		NEVER	NULL
 def	information_schema	PARAMETERS	PARAMETER_NAME	6	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	PARAMETERS	ROUTINE_TYPE	16	''	NO	varchar	9	27	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(9)			select		NEVER	NULL
-def	information_schema	PARAMETERS	SPECIFIC_CATALOG	1	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
-def	information_schema	PARAMETERS	SPECIFIC_NAME	3	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	PARAMETERS	SPECIFIC_SCHEMA	2	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	PARTITIONS	AVG_ROW_LENGTH	14	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
+def	information_schema	PARAMETERS	ROUTINE_TYPE	16	NULL	NO	varchar	9	27	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(9)			select		NEVER	NULL
+def	information_schema	PARAMETERS	SPECIFIC_CATALOG	1	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
+def	information_schema	PARAMETERS	SPECIFIC_NAME	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	PARAMETERS	SPECIFIC_SCHEMA	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	PARTITIONS	AVG_ROW_LENGTH	14	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
 def	information_schema	PARTITIONS	CHECKSUM	22	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
 def	information_schema	PARTITIONS	CHECK_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	0	NULL	NULL	datetime			select		NEVER	NULL
 def	information_schema	PARTITIONS	CREATE_TIME	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	0	NULL	NULL	datetime			select		NEVER	NULL
-def	information_schema	PARTITIONS	DATA_FREE	18	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
-def	information_schema	PARTITIONS	DATA_LENGTH	15	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
-def	information_schema	PARTITIONS	INDEX_LENGTH	17	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
+def	information_schema	PARTITIONS	DATA_FREE	18	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
+def	information_schema	PARTITIONS	DATA_LENGTH	15	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
+def	information_schema	PARTITIONS	INDEX_LENGTH	17	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
 def	information_schema	PARTITIONS	MAX_DATA_LENGTH	16	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
-def	information_schema	PARTITIONS	NODEGROUP	24	''	NO	varchar	12	36	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(12)			select		NEVER	NULL
-def	information_schema	PARTITIONS	PARTITION_COMMENT	23	''	NO	varchar	80	240	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(80)			select		NEVER	NULL
+def	information_schema	PARTITIONS	NODEGROUP	24	NULL	NO	varchar	12	36	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(12)			select		NEVER	NULL
+def	information_schema	PARTITIONS	PARTITION_COMMENT	23	NULL	NO	varchar	80	240	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(80)			select		NEVER	NULL
 def	information_schema	PARTITIONS	PARTITION_DESCRIPTION	12	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext			select		NEVER	NULL
 def	information_schema	PARTITIONS	PARTITION_EXPRESSION	10	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext			select		NEVER	NULL
 def	information_schema	PARTITIONS	PARTITION_METHOD	8	NULL	YES	varchar	18	54	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(18)			select		NEVER	NULL
@@ -247,136 +247,136 @@ def	information_schema	PARTITIONS	SUBPARTITION_METHOD	9	NULL	YES	varchar	12	36	N
 def	information_schema	PARTITIONS	SUBPARTITION_NAME	5	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
 def	information_schema	PARTITIONS	SUBPARTITION_ORDINAL_POSITION	7	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
 def	information_schema	PARTITIONS	TABLESPACE_NAME	25	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	PARTITIONS	TABLE_CATALOG	1	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
-def	information_schema	PARTITIONS	TABLE_NAME	3	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	PARTITIONS	TABLE_ROWS	13	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
-def	information_schema	PARTITIONS	TABLE_SCHEMA	2	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	PARTITIONS	TABLE_CATALOG	1	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
+def	information_schema	PARTITIONS	TABLE_NAME	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	PARTITIONS	TABLE_ROWS	13	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
+def	information_schema	PARTITIONS	TABLE_SCHEMA	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
 def	information_schema	PARTITIONS	UPDATE_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	0	NULL	NULL	datetime			select		NEVER	NULL
-def	information_schema	PLUGINS	LOAD_OPTION	11	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	PLUGINS	LOAD_OPTION	11	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
 def	information_schema	PLUGINS	PLUGIN_AUTHOR	8	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
 def	information_schema	PLUGINS	PLUGIN_AUTH_VERSION	13	NULL	YES	varchar	80	240	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(80)			select		NEVER	NULL
 def	information_schema	PLUGINS	PLUGIN_DESCRIPTION	9	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext			select		NEVER	NULL
 def	information_schema	PLUGINS	PLUGIN_LIBRARY	6	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
 def	information_schema	PLUGINS	PLUGIN_LIBRARY_VERSION	7	NULL	YES	varchar	20	60	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(20)			select		NEVER	NULL
-def	information_schema	PLUGINS	PLUGIN_LICENSE	10	''	NO	varchar	80	240	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(80)			select		NEVER	NULL
-def	information_schema	PLUGINS	PLUGIN_MATURITY	12	''	NO	varchar	12	36	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(12)			select		NEVER	NULL
-def	information_schema	PLUGINS	PLUGIN_NAME	1	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	PLUGINS	PLUGIN_STATUS	3	''	NO	varchar	16	48	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(16)			select		NEVER	NULL
-def	information_schema	PLUGINS	PLUGIN_TYPE	4	''	NO	varchar	80	240	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(80)			select		NEVER	NULL
-def	information_schema	PLUGINS	PLUGIN_TYPE_VERSION	5	''	NO	varchar	20	60	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(20)			select		NEVER	NULL
-def	information_schema	PLUGINS	PLUGIN_VERSION	2	''	NO	varchar	20	60	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(20)			select		NEVER	NULL
-def	information_schema	PROCESSLIST	COMMAND	5	''	NO	varchar	16	48	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(16)			select		NEVER	NULL
+def	information_schema	PLUGINS	PLUGIN_LICENSE	10	NULL	NO	varchar	80	240	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(80)			select		NEVER	NULL
+def	information_schema	PLUGINS	PLUGIN_MATURITY	12	NULL	NO	varchar	12	36	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(12)			select		NEVER	NULL
+def	information_schema	PLUGINS	PLUGIN_NAME	1	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	PLUGINS	PLUGIN_STATUS	3	NULL	NO	varchar	16	48	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(16)			select		NEVER	NULL
+def	information_schema	PLUGINS	PLUGIN_TYPE	4	NULL	NO	varchar	80	240	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(80)			select		NEVER	NULL
+def	information_schema	PLUGINS	PLUGIN_TYPE_VERSION	5	NULL	NO	varchar	20	60	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(20)			select		NEVER	NULL
+def	information_schema	PLUGINS	PLUGIN_VERSION	2	NULL	NO	varchar	20	60	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(20)			select		NEVER	NULL
+def	information_schema	PROCESSLIST	COMMAND	5	NULL	NO	varchar	16	48	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(16)			select		NEVER	NULL
 def	information_schema	PROCESSLIST	DB	4	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	PROCESSLIST	EXAMINED_ROWS	15	0	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(7)			select		NEVER	NULL
-def	information_schema	PROCESSLIST	HOST	3	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	PROCESSLIST	ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(4)			select		NEVER	NULL
+def	information_schema	PROCESSLIST	EXAMINED_ROWS	15	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(7)			select		NEVER	NULL
+def	information_schema	PROCESSLIST	HOST	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	PROCESSLIST	ID	1	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(4)			select		NEVER	NULL
 def	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext			select		NEVER	NULL
 def	information_schema	PROCESSLIST	INFO_BINARY	17	NULL	YES	blob	65535	65535	NULL	NULL	NULL	NULL	NULL	blob			select		NEVER	NULL
-def	information_schema	PROCESSLIST	MAX_MEMORY_USED	14	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(7)			select		NEVER	NULL
-def	information_schema	PROCESSLIST	MAX_STAGE	11	0	NO	tinyint	NULL	NULL	3	0	NULL	NULL	NULL	tinyint(2)			select		NEVER	NULL
-def	information_schema	PROCESSLIST	MEMORY_USED	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(7)			select		NEVER	NULL
-def	information_schema	PROCESSLIST	PROGRESS	12	0.000	NO	decimal	NULL	NULL	7	3	NULL	NULL	NULL	decimal(7,3)			select		NEVER	NULL
-def	information_schema	PROCESSLIST	QUERY_ID	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(4)			select		NEVER	NULL
-def	information_schema	PROCESSLIST	STAGE	10	0	NO	tinyint	NULL	NULL	3	0	NULL	NULL	NULL	tinyint(2)			select		NEVER	NULL
+def	information_schema	PROCESSLIST	MAX_MEMORY_USED	14	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(7)			select		NEVER	NULL
+def	information_schema	PROCESSLIST	MAX_STAGE	11	NULL	NO	tinyint	NULL	NULL	3	0	NULL	NULL	NULL	tinyint(2)			select		NEVER	NULL
+def	information_schema	PROCESSLIST	MEMORY_USED	13	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(7)			select		NEVER	NULL
+def	information_schema	PROCESSLIST	PROGRESS	12	NULL	NO	decimal	NULL	NULL	7	3	NULL	NULL	NULL	decimal(7,3)			select		NEVER	NULL
+def	information_schema	PROCESSLIST	QUERY_ID	16	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(4)			select		NEVER	NULL
+def	information_schema	PROCESSLIST	STAGE	10	NULL	NO	tinyint	NULL	NULL	3	0	NULL	NULL	NULL	tinyint(2)			select		NEVER	NULL
 def	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	PROCESSLIST	TID	18	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(4)			select		NEVER	NULL
-def	information_schema	PROCESSLIST	TIME	6	0	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(7)			select		NEVER	NULL
-def	information_schema	PROCESSLIST	TIME_MS	9	0.000	NO	decimal	NULL	NULL	22	3	NULL	NULL	NULL	decimal(22,3)			select		NEVER	NULL
-def	information_schema	PROCESSLIST	USER	2	''	NO	varchar	128	384	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(128)			select		NEVER	NULL
-def	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
-def	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	REFERENTIAL_CONSTRAINTS	DELETE_RULE	9	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	REFERENTIAL_CONSTRAINTS	MATCH_OPTION	7	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	11	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	REFERENTIAL_CONSTRAINTS	TABLE_NAME	10	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	4	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
+def	information_schema	PROCESSLIST	TID	18	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(4)			select		NEVER	NULL
+def	information_schema	PROCESSLIST	TIME	6	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(7)			select		NEVER	NULL
+def	information_schema	PROCESSLIST	TIME_MS	9	NULL	NO	decimal	NULL	NULL	22	3	NULL	NULL	NULL	decimal(22,3)			select		NEVER	NULL
+def	information_schema	PROCESSLIST	USER	2	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(128)			select		NEVER	NULL
+def	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
+def	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	REFERENTIAL_CONSTRAINTS	DELETE_RULE	9	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	REFERENTIAL_CONSTRAINTS	MATCH_OPTION	7	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	11	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	REFERENTIAL_CONSTRAINTS	TABLE_NAME	10	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	4	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
 def	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	6	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	5	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	REFERENTIAL_CONSTRAINTS	UPDATE_RULE	8	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	5	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	REFERENTIAL_CONSTRAINTS	UPDATE_RULE	8	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
 def	information_schema	ROUTINES	CHARACTER_MAXIMUM_LENGTH	7	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(21)			select		NEVER	NULL
 def	information_schema	ROUTINES	CHARACTER_OCTET_LENGTH	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(21)			select		NEVER	NULL
-def	information_schema	ROUTINES	CHARACTER_SET_CLIENT	29	''	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)			select		NEVER	NULL
+def	information_schema	ROUTINES	CHARACTER_SET_CLIENT	29	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)			select		NEVER	NULL
 def	information_schema	ROUTINES	CHARACTER_SET_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	ROUTINES	COLLATION_CONNECTION	30	''	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)			select		NEVER	NULL
+def	information_schema	ROUTINES	COLLATION_CONNECTION	30	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)			select		NEVER	NULL
 def	information_schema	ROUTINES	COLLATION_NAME	13	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	ROUTINES	CREATED	24	'0000-00-00 00:00:00'	NO	datetime	NULL	NULL	NULL	NULL	0	NULL	NULL	datetime			select		NEVER	NULL
-def	information_schema	ROUTINES	DATABASE_COLLATION	31	''	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)			select		NEVER	NULL
-def	information_schema	ROUTINES	DATA_TYPE	6	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	ROUTINES	CREATED	24	NULL	NO	datetime	NULL	NULL	NULL	NULL	0	NULL	NULL	datetime			select		NEVER	NULL
+def	information_schema	ROUTINES	DATABASE_COLLATION	31	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)			select		NEVER	NULL
+def	information_schema	ROUTINES	DATA_TYPE	6	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
 def	information_schema	ROUTINES	DATETIME_PRECISION	11	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
-def	information_schema	ROUTINES	DEFINER	28	''	NO	varchar	384	1152	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(384)			select		NEVER	NULL
+def	information_schema	ROUTINES	DEFINER	28	NULL	NO	varchar	384	1152	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(384)			select		NEVER	NULL
 def	information_schema	ROUTINES	DTD_IDENTIFIER	14	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext			select		NEVER	NULL
 def	information_schema	ROUTINES	EXTERNAL_LANGUAGE	18	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
 def	information_schema	ROUTINES	EXTERNAL_NAME	17	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	ROUTINES	IS_DETERMINISTIC	20	''	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)			select		NEVER	NULL
-def	information_schema	ROUTINES	LAST_ALTERED	25	'0000-00-00 00:00:00'	NO	datetime	NULL	NULL	NULL	NULL	0	NULL	NULL	datetime			select		NEVER	NULL
+def	information_schema	ROUTINES	IS_DETERMINISTIC	20	NULL	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)			select		NEVER	NULL
+def	information_schema	ROUTINES	LAST_ALTERED	25	NULL	NO	datetime	NULL	NULL	NULL	NULL	0	NULL	NULL	datetime			select		NEVER	NULL
 def	information_schema	ROUTINES	NUMERIC_PRECISION	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(21)			select		NEVER	NULL
 def	information_schema	ROUTINES	NUMERIC_SCALE	10	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(21)			select		NEVER	NULL
-def	information_schema	ROUTINES	PARAMETER_STYLE	19	''	NO	varchar	8	24	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(8)			select		NEVER	NULL
-def	information_schema	ROUTINES	ROUTINE_BODY	15	''	NO	varchar	8	24	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(8)			select		NEVER	NULL
-def	information_schema	ROUTINES	ROUTINE_CATALOG	2	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
-def	information_schema	ROUTINES	ROUTINE_COMMENT	27	''	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext			select		NEVER	NULL
+def	information_schema	ROUTINES	PARAMETER_STYLE	19	NULL	NO	varchar	8	24	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(8)			select		NEVER	NULL
+def	information_schema	ROUTINES	ROUTINE_BODY	15	NULL	NO	varchar	8	24	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(8)			select		NEVER	NULL
+def	information_schema	ROUTINES	ROUTINE_CATALOG	2	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
+def	information_schema	ROUTINES	ROUTINE_COMMENT	27	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext			select		NEVER	NULL
 def	information_schema	ROUTINES	ROUTINE_DEFINITION	16	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext			select		NEVER	NULL
-def	information_schema	ROUTINES	ROUTINE_NAME	4	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	ROUTINES	ROUTINE_SCHEMA	3	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	ROUTINES	ROUTINE_TYPE	5	''	NO	varchar	13	39	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(13)			select		NEVER	NULL
-def	information_schema	ROUTINES	SECURITY_TYPE	23	''	NO	varchar	7	21	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(7)			select		NEVER	NULL
-def	information_schema	ROUTINES	SPECIFIC_NAME	1	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	ROUTINES	SQL_DATA_ACCESS	21	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	ROUTINES	SQL_MODE	26	''	NO	varchar	8192	24576	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(8192)			select		NEVER	NULL
+def	information_schema	ROUTINES	ROUTINE_NAME	4	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	ROUTINES	ROUTINE_SCHEMA	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	ROUTINES	ROUTINE_TYPE	5	NULL	NO	varchar	13	39	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(13)			select		NEVER	NULL
+def	information_schema	ROUTINES	SECURITY_TYPE	23	NULL	NO	varchar	7	21	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(7)			select		NEVER	NULL
+def	information_schema	ROUTINES	SPECIFIC_NAME	1	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	ROUTINES	SQL_DATA_ACCESS	21	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	ROUTINES	SQL_MODE	26	NULL	NO	varchar	8192	24576	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(8192)			select		NEVER	NULL
 def	information_schema	ROUTINES	SQL_PATH	22	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	SCHEMATA	CATALOG_NAME	1	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
-def	information_schema	SCHEMATA	DEFAULT_CHARACTER_SET_NAME	3	''	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)			select		NEVER	NULL
-def	information_schema	SCHEMATA	DEFAULT_COLLATION_NAME	4	''	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)			select		NEVER	NULL
-def	information_schema	SCHEMATA	SCHEMA_COMMENT	6	''	NO	varchar	1024	3072	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(1024)			select		NEVER	NULL
-def	information_schema	SCHEMATA	SCHEMA_NAME	2	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	SCHEMATA	CATALOG_NAME	1	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
+def	information_schema	SCHEMATA	DEFAULT_CHARACTER_SET_NAME	3	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)			select		NEVER	NULL
+def	information_schema	SCHEMATA	DEFAULT_COLLATION_NAME	4	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)			select		NEVER	NULL
+def	information_schema	SCHEMATA	SCHEMA_COMMENT	6	NULL	NO	varchar	1024	3072	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(1024)			select		NEVER	NULL
+def	information_schema	SCHEMATA	SCHEMA_NAME	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
 def	information_schema	SCHEMATA	SQL_PATH	5	NULL	YES	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
-def	information_schema	SCHEMA_PRIVILEGES	GRANTEE	1	''	NO	varchar	385	1155	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(385)			select		NEVER	NULL
-def	information_schema	SCHEMA_PRIVILEGES	IS_GRANTABLE	5	''	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)			select		NEVER	NULL
-def	information_schema	SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	4	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG	2	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
-def	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	3	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	SESSION_STATUS	VARIABLE_NAME	1	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	SESSION_STATUS	VARIABLE_VALUE	2	''	NO	varchar	2048	6144	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(2048)			select		NEVER	NULL
-def	information_schema	SESSION_VARIABLES	VARIABLE_NAME	1	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	2	''	NO	varchar	2048	6144	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(2048)			select		NEVER	NULL
-def	information_schema	SPATIAL_REF_SYS	AUTH_NAME	2	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
-def	information_schema	SPATIAL_REF_SYS	AUTH_SRID	3	0	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(5)			select		NEVER	NULL
-def	information_schema	SPATIAL_REF_SYS	SRID	1	0	NO	smallint	NULL	NULL	5	0	NULL	NULL	NULL	smallint(5)			select		NEVER	NULL
-def	information_schema	SPATIAL_REF_SYS	SRTEXT	4	''	NO	varchar	2048	6144	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(2048)			select		NEVER	NULL
+def	information_schema	SCHEMA_PRIVILEGES	GRANTEE	1	NULL	NO	varchar	385	1155	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(385)			select		NEVER	NULL
+def	information_schema	SCHEMA_PRIVILEGES	IS_GRANTABLE	5	NULL	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)			select		NEVER	NULL
+def	information_schema	SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	4	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG	2	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
+def	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	SESSION_STATUS	VARIABLE_NAME	1	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	SESSION_STATUS	VARIABLE_VALUE	2	NULL	NO	varchar	2048	6144	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(2048)			select		NEVER	NULL
+def	information_schema	SESSION_VARIABLES	VARIABLE_NAME	1	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	2	NULL	NO	varchar	2048	6144	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(2048)			select		NEVER	NULL
+def	information_schema	SPATIAL_REF_SYS	AUTH_NAME	2	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
+def	information_schema	SPATIAL_REF_SYS	AUTH_SRID	3	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(5)			select		NEVER	NULL
+def	information_schema	SPATIAL_REF_SYS	SRID	1	NULL	NO	smallint	NULL	NULL	5	0	NULL	NULL	NULL	smallint(5)			select		NEVER	NULL
+def	information_schema	SPATIAL_REF_SYS	SRTEXT	4	NULL	NO	varchar	2048	6144	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(2048)			select		NEVER	NULL
 def	information_schema	SQL_FUNCTIONS	FUNCTION	1	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
 def	information_schema	STATISTICS	CARDINALITY	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
 def	information_schema	STATISTICS	COLLATION	9	NULL	YES	varchar	1	3	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(1)			select		NEVER	NULL
-def	information_schema	STATISTICS	COLUMN_NAME	8	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	STATISTICS	COLUMN_NAME	8	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
 def	information_schema	STATISTICS	COMMENT	15	NULL	YES	varchar	16	48	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(16)			select		NEVER	NULL
-def	information_schema	STATISTICS	IGNORED	17	''	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)			select		NEVER	NULL
-def	information_schema	STATISTICS	INDEX_COMMENT	16	''	NO	varchar	1024	3072	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(1024)			select		NEVER	NULL
-def	information_schema	STATISTICS	INDEX_NAME	6	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	STATISTICS	INDEX_SCHEMA	5	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	STATISTICS	INDEX_TYPE	14	''	NO	varchar	16	48	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(16)			select		NEVER	NULL
-def	information_schema	STATISTICS	NON_UNIQUE	4	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(1)			select		NEVER	NULL
-def	information_schema	STATISTICS	NULLABLE	13	''	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)			select		NEVER	NULL
+def	information_schema	STATISTICS	IGNORED	17	NULL	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)			select		NEVER	NULL
+def	information_schema	STATISTICS	INDEX_COMMENT	16	NULL	NO	varchar	1024	3072	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(1024)			select		NEVER	NULL
+def	information_schema	STATISTICS	INDEX_NAME	6	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	STATISTICS	INDEX_SCHEMA	5	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	STATISTICS	INDEX_TYPE	14	NULL	NO	varchar	16	48	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(16)			select		NEVER	NULL
+def	information_schema	STATISTICS	NON_UNIQUE	4	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(1)			select		NEVER	NULL
+def	information_schema	STATISTICS	NULLABLE	13	NULL	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)			select		NEVER	NULL
 def	information_schema	STATISTICS	PACKED	12	NULL	YES	varchar	10	30	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(10)			select		NEVER	NULL
-def	information_schema	STATISTICS	SEQ_IN_INDEX	7	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(2)			select		NEVER	NULL
+def	information_schema	STATISTICS	SEQ_IN_INDEX	7	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(2)			select		NEVER	NULL
 def	information_schema	STATISTICS	SUB_PART	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(3)			select		NEVER	NULL
-def	information_schema	STATISTICS	TABLE_CATALOG	1	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
-def	information_schema	STATISTICS	TABLE_NAME	3	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	STATISTICS	TABLE_SCHEMA	2	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	STATISTICS	TABLE_CATALOG	1	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
+def	information_schema	STATISTICS	TABLE_NAME	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	STATISTICS	TABLE_SCHEMA	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
 def	information_schema	SYSTEM_VARIABLES	COMMAND_LINE_ARGUMENT	14	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
 def	information_schema	SYSTEM_VARIABLES	DEFAULT_VALUE	5	NULL	YES	varchar	2048	6144	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(2048)			select		NEVER	NULL
 def	information_schema	SYSTEM_VARIABLES	ENUM_VALUE_LIST	12	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext			select		NEVER	NULL
 def	information_schema	SYSTEM_VARIABLES	GLOBAL_VALUE	3	NULL	YES	varchar	2048	6144	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(2048)			select		NEVER	NULL
-def	information_schema	SYSTEM_VARIABLES	GLOBAL_VALUE_ORIGIN	4	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	SYSTEM_VARIABLES	GLOBAL_VALUE_ORIGIN	4	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
 def	information_schema	SYSTEM_VARIABLES	GLOBAL_VALUE_PATH	15	NULL	YES	varchar	2048	6144	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(2048)			select		NEVER	NULL
 def	information_schema	SYSTEM_VARIABLES	NUMERIC_BLOCK_SIZE	11	NULL	YES	varchar	21	63	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(21)			select		NEVER	NULL
 def	information_schema	SYSTEM_VARIABLES	NUMERIC_MAX_VALUE	10	NULL	YES	varchar	21	63	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(21)			select		NEVER	NULL
 def	information_schema	SYSTEM_VARIABLES	NUMERIC_MIN_VALUE	9	NULL	YES	varchar	21	63	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(21)			select		NEVER	NULL
-def	information_schema	SYSTEM_VARIABLES	READ_ONLY	13	''	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)			select		NEVER	NULL
+def	information_schema	SYSTEM_VARIABLES	READ_ONLY	13	NULL	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)			select		NEVER	NULL
 def	information_schema	SYSTEM_VARIABLES	SESSION_VALUE	2	NULL	YES	varchar	2048	6144	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(2048)			select		NEVER	NULL
-def	information_schema	SYSTEM_VARIABLES	VARIABLE_COMMENT	8	''	NO	varchar	2048	6144	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(2048)			select		NEVER	NULL
-def	information_schema	SYSTEM_VARIABLES	VARIABLE_NAME	1	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	SYSTEM_VARIABLES	VARIABLE_SCOPE	6	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	SYSTEM_VARIABLES	VARIABLE_TYPE	7	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	SYSTEM_VARIABLES	VARIABLE_COMMENT	8	NULL	NO	varchar	2048	6144	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(2048)			select		NEVER	NULL
+def	information_schema	SYSTEM_VARIABLES	VARIABLE_NAME	1	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	SYSTEM_VARIABLES	VARIABLE_SCOPE	6	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	SYSTEM_VARIABLES	VARIABLE_TYPE	7	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
 def	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
 def	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
 def	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
@@ -390,104 +390,104 @@ def	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	20	0	NUL
 def	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
 def	information_schema	TABLES	MAX_INDEX_LENGTH	22	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
 def	information_schema	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(10)			select		NEVER	NULL
-def	information_schema	TABLES	TABLE_CATALOG	1	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
+def	information_schema	TABLES	TABLE_CATALOG	1	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
 def	information_schema	TABLES	TABLE_COLLATION	18	NULL	YES	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)			select		NEVER	NULL
-def	information_schema	TABLES	TABLE_COMMENT	21	''	NO	varchar	2048	6144	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(2048)			select		NEVER	NULL
-def	information_schema	TABLES	TABLE_NAME	3	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	TABLES	TABLE_COMMENT	21	NULL	NO	varchar	2048	6144	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(2048)			select		NEVER	NULL
+def	information_schema	TABLES	TABLE_NAME	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
 def	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
-def	information_schema	TABLES	TABLE_SCHEMA	2	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	TABLES	TABLE_TYPE	4	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	TABLES	TABLE_SCHEMA	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	TABLES	TABLE_TYPE	4	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
 def	information_schema	TABLES	TEMPORARY	23	NULL	YES	varchar	1	3	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(1)			select		NEVER	NULL
 def	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	0	NULL	NULL	datetime			select		NEVER	NULL
 def	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
 def	information_schema	TABLESPACES	AUTOEXTEND_SIZE	6	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
-def	information_schema	TABLESPACES	ENGINE	2	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	TABLESPACES	ENGINE	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
 def	information_schema	TABLESPACES	EXTENT_SIZE	5	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
 def	information_schema	TABLESPACES	LOGFILE_GROUP_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
 def	information_schema	TABLESPACES	MAXIMUM_SIZE	7	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
 def	information_schema	TABLESPACES	NODEGROUP_ID	8	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
 def	information_schema	TABLESPACES	TABLESPACE_COMMENT	9	NULL	YES	varchar	2048	6144	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(2048)			select		NEVER	NULL
-def	information_schema	TABLESPACES	TABLESPACE_NAME	1	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	TABLESPACES	TABLESPACE_NAME	1	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
 def	information_schema	TABLESPACES	TABLESPACE_TYPE	3	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	1	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
-def	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_NAME	3	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_SCHEMA	2	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_TYPE	6	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	TABLE_CONSTRAINTS	TABLE_NAME	5	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	TABLE_CONSTRAINTS	TABLE_SCHEMA	4	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	TABLE_PRIVILEGES	GRANTEE	1	''	NO	varchar	385	1155	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(385)			select		NEVER	NULL
-def	information_schema	TABLE_PRIVILEGES	IS_GRANTABLE	6	''	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)			select		NEVER	NULL
-def	information_schema	TABLE_PRIVILEGES	PRIVILEGE_TYPE	5	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	TABLE_PRIVILEGES	TABLE_CATALOG	2	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
-def	information_schema	TABLE_PRIVILEGES	TABLE_NAME	4	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	TABLE_PRIVILEGES	TABLE_SCHEMA	3	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	TABLE_STATISTICS	ROWS_CHANGED	4	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
-def	information_schema	TABLE_STATISTICS	ROWS_CHANGED_X_INDEXES	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
-def	information_schema	TABLE_STATISTICS	ROWS_READ	3	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
-def	information_schema	TABLE_STATISTICS	TABLE_NAME	2	''	NO	varchar	192	576	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(192)			select		NEVER	NULL
-def	information_schema	TABLE_STATISTICS	TABLE_SCHEMA	1	''	NO	varchar	192	576	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(192)			select		NEVER	NULL
+def	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
+def	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_NAME	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_SCHEMA	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_TYPE	6	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	TABLE_CONSTRAINTS	TABLE_NAME	5	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	TABLE_CONSTRAINTS	TABLE_SCHEMA	4	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	TABLE_PRIVILEGES	GRANTEE	1	NULL	NO	varchar	385	1155	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(385)			select		NEVER	NULL
+def	information_schema	TABLE_PRIVILEGES	IS_GRANTABLE	6	NULL	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)			select		NEVER	NULL
+def	information_schema	TABLE_PRIVILEGES	PRIVILEGE_TYPE	5	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	TABLE_PRIVILEGES	TABLE_CATALOG	2	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
+def	information_schema	TABLE_PRIVILEGES	TABLE_NAME	4	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	TABLE_PRIVILEGES	TABLE_SCHEMA	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	TABLE_STATISTICS	ROWS_CHANGED	4	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
+def	information_schema	TABLE_STATISTICS	ROWS_CHANGED_X_INDEXES	5	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
+def	information_schema	TABLE_STATISTICS	ROWS_READ	3	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
+def	information_schema	TABLE_STATISTICS	TABLE_NAME	2	NULL	NO	varchar	192	576	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(192)			select		NEVER	NULL
+def	information_schema	TABLE_STATISTICS	TABLE_SCHEMA	1	NULL	NO	varchar	192	576	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(192)			select		NEVER	NULL
 def	information_schema	TRIGGERS	ACTION_CONDITION	9	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext			select		NEVER	NULL
-def	information_schema	TRIGGERS	ACTION_ORDER	8	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(4)			select		NEVER	NULL
-def	information_schema	TRIGGERS	ACTION_ORIENTATION	11	''	NO	varchar	9	27	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(9)			select		NEVER	NULL
-def	information_schema	TRIGGERS	ACTION_REFERENCE_NEW_ROW	16	''	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)			select		NEVER	NULL
+def	information_schema	TRIGGERS	ACTION_ORDER	8	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(4)			select		NEVER	NULL
+def	information_schema	TRIGGERS	ACTION_ORIENTATION	11	NULL	NO	varchar	9	27	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(9)			select		NEVER	NULL
+def	information_schema	TRIGGERS	ACTION_REFERENCE_NEW_ROW	16	NULL	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)			select		NEVER	NULL
 def	information_schema	TRIGGERS	ACTION_REFERENCE_NEW_TABLE	14	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	TRIGGERS	ACTION_REFERENCE_OLD_ROW	15	''	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)			select		NEVER	NULL
+def	information_schema	TRIGGERS	ACTION_REFERENCE_OLD_ROW	15	NULL	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)			select		NEVER	NULL
 def	information_schema	TRIGGERS	ACTION_REFERENCE_OLD_TABLE	13	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	TRIGGERS	ACTION_STATEMENT	10	''	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext			select		NEVER	NULL
-def	information_schema	TRIGGERS	ACTION_TIMING	12	''	NO	varchar	6	18	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(6)			select		NEVER	NULL
-def	information_schema	TRIGGERS	CHARACTER_SET_CLIENT	20	''	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)			select		NEVER	NULL
-def	information_schema	TRIGGERS	COLLATION_CONNECTION	21	''	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)			select		NEVER	NULL
+def	information_schema	TRIGGERS	ACTION_STATEMENT	10	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext			select		NEVER	NULL
+def	information_schema	TRIGGERS	ACTION_TIMING	12	NULL	NO	varchar	6	18	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(6)			select		NEVER	NULL
+def	information_schema	TRIGGERS	CHARACTER_SET_CLIENT	20	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)			select		NEVER	NULL
+def	information_schema	TRIGGERS	COLLATION_CONNECTION	21	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)			select		NEVER	NULL
 def	information_schema	TRIGGERS	CREATED	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	2	NULL	NULL	datetime(2)			select		NEVER	NULL
-def	information_schema	TRIGGERS	DATABASE_COLLATION	22	''	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)			select		NEVER	NULL
-def	information_schema	TRIGGERS	DEFINER	19	''	NO	varchar	384	1152	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(384)			select		NEVER	NULL
-def	information_schema	TRIGGERS	EVENT_MANIPULATION	4	''	NO	varchar	6	18	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(6)			select		NEVER	NULL
-def	information_schema	TRIGGERS	EVENT_OBJECT_CATALOG	5	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
-def	information_schema	TRIGGERS	EVENT_OBJECT_SCHEMA	6	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	TRIGGERS	EVENT_OBJECT_TABLE	7	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	TRIGGERS	SQL_MODE	18	''	NO	varchar	8192	24576	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(8192)			select		NEVER	NULL
-def	information_schema	TRIGGERS	TRIGGER_CATALOG	1	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
-def	information_schema	TRIGGERS	TRIGGER_NAME	3	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	TRIGGERS	TRIGGER_SCHEMA	2	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	USER_PRIVILEGES	GRANTEE	1	''	NO	varchar	385	1155	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(385)			select		NEVER	NULL
-def	information_schema	USER_PRIVILEGES	IS_GRANTABLE	4	''	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)			select		NEVER	NULL
-def	information_schema	USER_PRIVILEGES	PRIVILEGE_TYPE	3	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	USER_PRIVILEGES	TABLE_CATALOG	2	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
-def	information_schema	USER_STATISTICS	ACCESS_DENIED	22	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
-def	information_schema	USER_STATISTICS	BINLOG_BYTES_WRITTEN	9	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
-def	information_schema	USER_STATISTICS	BUSY_TIME	5	0	NO	double	NULL	NULL	21	NULL	NULL	NULL	NULL	double			select		NEVER	NULL
-def	information_schema	USER_STATISTICS	BYTES_RECEIVED	7	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
-def	information_schema	USER_STATISTICS	BYTES_SENT	8	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
-def	information_schema	USER_STATISTICS	COMMIT_TRANSACTIONS	18	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
-def	information_schema	USER_STATISTICS	CONCURRENT_CONNECTIONS	3	0	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select		NEVER	NULL
-def	information_schema	USER_STATISTICS	CONNECTED_TIME	4	0	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select		NEVER	NULL
-def	information_schema	USER_STATISTICS	CPU_TIME	6	0	NO	double	NULL	NULL	21	NULL	NULL	NULL	NULL	double			select		NEVER	NULL
-def	information_schema	USER_STATISTICS	DENIED_CONNECTIONS	20	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
-def	information_schema	USER_STATISTICS	EMPTY_QUERIES	23	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
-def	information_schema	USER_STATISTICS	LOST_CONNECTIONS	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
-def	information_schema	USER_STATISTICS	MAX_STATEMENT_TIME_EXCEEDED	25	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
-def	information_schema	USER_STATISTICS	OTHER_COMMANDS	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
-def	information_schema	USER_STATISTICS	ROLLBACK_TRANSACTIONS	19	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
-def	information_schema	USER_STATISTICS	ROWS_DELETED	12	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
-def	information_schema	USER_STATISTICS	ROWS_INSERTED	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
-def	information_schema	USER_STATISTICS	ROWS_READ	10	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
-def	information_schema	USER_STATISTICS	ROWS_SENT	11	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
-def	information_schema	USER_STATISTICS	ROWS_UPDATED	14	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
-def	information_schema	USER_STATISTICS	SELECT_COMMANDS	15	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
-def	information_schema	USER_STATISTICS	TOTAL_CONNECTIONS	2	0	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select		NEVER	NULL
-def	information_schema	USER_STATISTICS	TOTAL_SSL_CONNECTIONS	24	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
-def	information_schema	USER_STATISTICS	UPDATE_COMMANDS	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
-def	information_schema	USER_STATISTICS	USER	1	''	NO	varchar	128	384	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(128)			select		NEVER	NULL
-def	information_schema	VIEWS	ALGORITHM	11	''	NO	varchar	10	30	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(10)			select		NEVER	NULL
-def	information_schema	VIEWS	CHARACTER_SET_CLIENT	9	''	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)			select		NEVER	NULL
-def	information_schema	VIEWS	CHECK_OPTION	5	''	NO	varchar	8	24	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(8)			select		NEVER	NULL
-def	information_schema	VIEWS	COLLATION_CONNECTION	10	''	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)			select		NEVER	NULL
-def	information_schema	VIEWS	DEFINER	7	''	NO	varchar	384	1152	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(384)			select		NEVER	NULL
-def	information_schema	VIEWS	IS_UPDATABLE	6	''	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)			select		NEVER	NULL
-def	information_schema	VIEWS	SECURITY_TYPE	8	''	NO	varchar	7	21	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(7)			select		NEVER	NULL
-def	information_schema	VIEWS	TABLE_CATALOG	1	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
-def	information_schema	VIEWS	TABLE_NAME	3	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	VIEWS	TABLE_SCHEMA	2	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
-def	information_schema	VIEWS	VIEW_DEFINITION	4	''	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext			select		NEVER	NULL
+def	information_schema	TRIGGERS	DATABASE_COLLATION	22	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)			select		NEVER	NULL
+def	information_schema	TRIGGERS	DEFINER	19	NULL	NO	varchar	384	1152	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(384)			select		NEVER	NULL
+def	information_schema	TRIGGERS	EVENT_MANIPULATION	4	NULL	NO	varchar	6	18	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(6)			select		NEVER	NULL
+def	information_schema	TRIGGERS	EVENT_OBJECT_CATALOG	5	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
+def	information_schema	TRIGGERS	EVENT_OBJECT_SCHEMA	6	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	TRIGGERS	EVENT_OBJECT_TABLE	7	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	TRIGGERS	SQL_MODE	18	NULL	NO	varchar	8192	24576	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(8192)			select		NEVER	NULL
+def	information_schema	TRIGGERS	TRIGGER_CATALOG	1	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
+def	information_schema	TRIGGERS	TRIGGER_NAME	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	TRIGGERS	TRIGGER_SCHEMA	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	USER_PRIVILEGES	GRANTEE	1	NULL	NO	varchar	385	1155	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(385)			select		NEVER	NULL
+def	information_schema	USER_PRIVILEGES	IS_GRANTABLE	4	NULL	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)			select		NEVER	NULL
+def	information_schema	USER_PRIVILEGES	PRIVILEGE_TYPE	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	USER_PRIVILEGES	TABLE_CATALOG	2	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
+def	information_schema	USER_STATISTICS	ACCESS_DENIED	22	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
+def	information_schema	USER_STATISTICS	BINLOG_BYTES_WRITTEN	9	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
+def	information_schema	USER_STATISTICS	BUSY_TIME	5	NULL	NO	double	NULL	NULL	21	NULL	NULL	NULL	NULL	double			select		NEVER	NULL
+def	information_schema	USER_STATISTICS	BYTES_RECEIVED	7	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
+def	information_schema	USER_STATISTICS	BYTES_SENT	8	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
+def	information_schema	USER_STATISTICS	COMMIT_TRANSACTIONS	18	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
+def	information_schema	USER_STATISTICS	CONCURRENT_CONNECTIONS	3	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select		NEVER	NULL
+def	information_schema	USER_STATISTICS	CONNECTED_TIME	4	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select		NEVER	NULL
+def	information_schema	USER_STATISTICS	CPU_TIME	6	NULL	NO	double	NULL	NULL	21	NULL	NULL	NULL	NULL	double			select		NEVER	NULL
+def	information_schema	USER_STATISTICS	DENIED_CONNECTIONS	20	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
+def	information_schema	USER_STATISTICS	EMPTY_QUERIES	23	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
+def	information_schema	USER_STATISTICS	LOST_CONNECTIONS	21	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
+def	information_schema	USER_STATISTICS	MAX_STATEMENT_TIME_EXCEEDED	25	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
+def	information_schema	USER_STATISTICS	OTHER_COMMANDS	17	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
+def	information_schema	USER_STATISTICS	ROLLBACK_TRANSACTIONS	19	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
+def	information_schema	USER_STATISTICS	ROWS_DELETED	12	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
+def	information_schema	USER_STATISTICS	ROWS_INSERTED	13	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
+def	information_schema	USER_STATISTICS	ROWS_READ	10	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
+def	information_schema	USER_STATISTICS	ROWS_SENT	11	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
+def	information_schema	USER_STATISTICS	ROWS_UPDATED	14	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
+def	information_schema	USER_STATISTICS	SELECT_COMMANDS	15	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
+def	information_schema	USER_STATISTICS	TOTAL_CONNECTIONS	2	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select		NEVER	NULL
+def	information_schema	USER_STATISTICS	TOTAL_SSL_CONNECTIONS	24	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
+def	information_schema	USER_STATISTICS	UPDATE_COMMANDS	16	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
+def	information_schema	USER_STATISTICS	USER	1	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(128)			select		NEVER	NULL
+def	information_schema	VIEWS	ALGORITHM	11	NULL	NO	varchar	10	30	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(10)			select		NEVER	NULL
+def	information_schema	VIEWS	CHARACTER_SET_CLIENT	9	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)			select		NEVER	NULL
+def	information_schema	VIEWS	CHECK_OPTION	5	NULL	NO	varchar	8	24	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(8)			select		NEVER	NULL
+def	information_schema	VIEWS	COLLATION_CONNECTION	10	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)			select		NEVER	NULL
+def	information_schema	VIEWS	DEFINER	7	NULL	NO	varchar	384	1152	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(384)			select		NEVER	NULL
+def	information_schema	VIEWS	IS_UPDATABLE	6	NULL	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)			select		NEVER	NULL
+def	information_schema	VIEWS	SECURITY_TYPE	8	NULL	NO	varchar	7	21	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(7)			select		NEVER	NULL
+def	information_schema	VIEWS	TABLE_CATALOG	1	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL
+def	information_schema	VIEWS	TABLE_NAME	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	VIEWS	TABLE_SCHEMA	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL
+def	information_schema	VIEWS	VIEW_DEFINITION	4	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext			select		NEVER	NULL
 ##########################################################################
 # Show the quotient of CHARACTER_OCTET_LENGTH and CHARACTER_MAXIMUM_LENGTH
 ##########################################################################
diff --git a/mysql-test/suite/funcs_1/r/is_columns_is_embedded.result b/mysql-test/suite/funcs_1/r/is_columns_is_embedded.result
index d021272b8c2..e3b2a7d58ed 100644
--- a/mysql-test/suite/funcs_1/r/is_columns_is_embedded.result
+++ b/mysql-test/suite/funcs_1/r/is_columns_is_embedded.result
@@ -3,126 +3,126 @@ WHERE table_schema = 'information_schema'
 AND table_name <> 'profiling' AND table_name not like 'innodb_%'
 ORDER BY table_schema, table_name, column_name;
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT	IS_GENERATED	GENERATION_EXPRESSION
-def	information_schema	ALL_PLUGINS	LOAD_OPTION	11	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	ALL_PLUGINS	LOAD_OPTION	11	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
 def	information_schema	ALL_PLUGINS	PLUGIN_AUTHOR	8	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
 def	information_schema	ALL_PLUGINS	PLUGIN_AUTH_VERSION	13	NULL	YES	varchar	80	240	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(80)					NEVER	NULL
 def	information_schema	ALL_PLUGINS	PLUGIN_DESCRIPTION	9	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext					NEVER	NULL
 def	information_schema	ALL_PLUGINS	PLUGIN_LIBRARY	6	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
 def	information_schema	ALL_PLUGINS	PLUGIN_LIBRARY_VERSION	7	NULL	YES	varchar	20	60	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(20)					NEVER	NULL
-def	information_schema	ALL_PLUGINS	PLUGIN_LICENSE	10	''	NO	varchar	80	240	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(80)					NEVER	NULL
-def	information_schema	ALL_PLUGINS	PLUGIN_MATURITY	12	''	NO	varchar	12	36	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(12)					NEVER	NULL
-def	information_schema	ALL_PLUGINS	PLUGIN_NAME	1	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	ALL_PLUGINS	PLUGIN_STATUS	3	''	NO	varchar	16	48	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(16)					NEVER	NULL
-def	information_schema	ALL_PLUGINS	PLUGIN_TYPE	4	''	NO	varchar	80	240	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(80)					NEVER	NULL
-def	information_schema	ALL_PLUGINS	PLUGIN_TYPE_VERSION	5	''	NO	varchar	20	60	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(20)					NEVER	NULL
-def	information_schema	ALL_PLUGINS	PLUGIN_VERSION	2	''	NO	varchar	20	60	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(20)					NEVER	NULL
-def	information_schema	APPLICABLE_ROLES	GRANTEE	1	''	NO	varchar	385	1155	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(385)					NEVER	NULL
+def	information_schema	ALL_PLUGINS	PLUGIN_LICENSE	10	NULL	NO	varchar	80	240	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(80)					NEVER	NULL
+def	information_schema	ALL_PLUGINS	PLUGIN_MATURITY	12	NULL	NO	varchar	12	36	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(12)					NEVER	NULL
+def	information_schema	ALL_PLUGINS	PLUGIN_NAME	1	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	ALL_PLUGINS	PLUGIN_STATUS	3	NULL	NO	varchar	16	48	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(16)					NEVER	NULL
+def	information_schema	ALL_PLUGINS	PLUGIN_TYPE	4	NULL	NO	varchar	80	240	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(80)					NEVER	NULL
+def	information_schema	ALL_PLUGINS	PLUGIN_TYPE_VERSION	5	NULL	NO	varchar	20	60	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(20)					NEVER	NULL
+def	information_schema	ALL_PLUGINS	PLUGIN_VERSION	2	NULL	NO	varchar	20	60	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(20)					NEVER	NULL
+def	information_schema	APPLICABLE_ROLES	GRANTEE	1	NULL	NO	varchar	385	1155	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(385)					NEVER	NULL
 def	information_schema	APPLICABLE_ROLES	IS_DEFAULT	4	NULL	YES	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)					NEVER	NULL
-def	information_schema	APPLICABLE_ROLES	IS_GRANTABLE	3	''	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)					NEVER	NULL
-def	information_schema	APPLICABLE_ROLES	ROLE_NAME	2	''	NO	varchar	128	384	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(128)					NEVER	NULL
-def	information_schema	CHARACTER_SETS	CHARACTER_SET_NAME	1	''	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)					NEVER	NULL
-def	information_schema	CHARACTER_SETS	DEFAULT_COLLATE_NAME	2	''	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)					NEVER	NULL
-def	information_schema	CHARACTER_SETS	DESCRIPTION	3	''	NO	varchar	60	180	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(60)					NEVER	NULL
-def	information_schema	CHARACTER_SETS	MAXLEN	4	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(3)					NEVER	NULL
-def	information_schema	CHECK_CONSTRAINTS	CHECK_CLAUSE	6	''	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext					NEVER	NULL
-def	information_schema	CHECK_CONSTRAINTS	CONSTRAINT_CATALOG	1	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
-def	information_schema	CHECK_CONSTRAINTS	CONSTRAINT_NAME	4	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	CHECK_CONSTRAINTS	CONSTRAINT_SCHEMA	2	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	CHECK_CONSTRAINTS	LEVEL	5	''	NO	varchar	6	18	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(6)					NEVER	NULL
-def	information_schema	CHECK_CONSTRAINTS	TABLE_NAME	3	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	ACCESS_DENIED	22	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	BINLOG_BYTES_WRITTEN	9	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	BUSY_TIME	5	0	NO	double	NULL	NULL	21	NULL	NULL	NULL	NULL	double					NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	BYTES_RECEIVED	7	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	BYTES_SENT	8	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	CLIENT	1	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	COMMIT_TRANSACTIONS	18	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	CONCURRENT_CONNECTIONS	3	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	CONNECTED_TIME	4	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	CPU_TIME	6	0	NO	double	NULL	NULL	21	NULL	NULL	NULL	NULL	double					NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	DENIED_CONNECTIONS	20	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	EMPTY_QUERIES	23	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	LOST_CONNECTIONS	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	MAX_STATEMENT_TIME_EXCEEDED	25	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	OTHER_COMMANDS	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	ROLLBACK_TRANSACTIONS	19	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	ROWS_DELETED	12	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	ROWS_INSERTED	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	ROWS_READ	10	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	ROWS_SENT	11	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	ROWS_UPDATED	14	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	SELECT_COMMANDS	15	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	TOTAL_CONNECTIONS	2	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	TOTAL_SSL_CONNECTIONS	24	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
-def	information_schema	CLIENT_STATISTICS	UPDATE_COMMANDS	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
-def	information_schema	COLLATIONS	CHARACTER_SET_NAME	2	''	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)					NEVER	NULL
-def	information_schema	COLLATIONS	COLLATION_NAME	1	''	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)					NEVER	NULL
-def	information_schema	COLLATIONS	ID	3	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(11)					NEVER	NULL
-def	information_schema	COLLATIONS	IS_COMPILED	5	''	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)					NEVER	NULL
-def	information_schema	COLLATIONS	IS_DEFAULT	4	''	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)					NEVER	NULL
-def	information_schema	COLLATIONS	SORTLEN	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(3)					NEVER	NULL
-def	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	CHARACTER_SET_NAME	2	''	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)					NEVER	NULL
-def	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	COLLATION_NAME	1	''	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)					NEVER	NULL
+def	information_schema	APPLICABLE_ROLES	IS_GRANTABLE	3	NULL	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)					NEVER	NULL
+def	information_schema	APPLICABLE_ROLES	ROLE_NAME	2	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(128)					NEVER	NULL
+def	information_schema	CHARACTER_SETS	CHARACTER_SET_NAME	1	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)					NEVER	NULL
+def	information_schema	CHARACTER_SETS	DEFAULT_COLLATE_NAME	2	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)					NEVER	NULL
+def	information_schema	CHARACTER_SETS	DESCRIPTION	3	NULL	NO	varchar	60	180	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(60)					NEVER	NULL
+def	information_schema	CHARACTER_SETS	MAXLEN	4	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(3)					NEVER	NULL
+def	information_schema	CHECK_CONSTRAINTS	CHECK_CLAUSE	6	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext					NEVER	NULL
+def	information_schema	CHECK_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
+def	information_schema	CHECK_CONSTRAINTS	CONSTRAINT_NAME	4	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	CHECK_CONSTRAINTS	CONSTRAINT_SCHEMA	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	CHECK_CONSTRAINTS	LEVEL	5	NULL	NO	varchar	6	18	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(6)					NEVER	NULL
+def	information_schema	CHECK_CONSTRAINTS	TABLE_NAME	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	ACCESS_DENIED	22	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	BINLOG_BYTES_WRITTEN	9	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	BUSY_TIME	5	NULL	NO	double	NULL	NULL	21	NULL	NULL	NULL	NULL	double					NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	BYTES_RECEIVED	7	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	BYTES_SENT	8	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	CLIENT	1	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	COMMIT_TRANSACTIONS	18	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	CONCURRENT_CONNECTIONS	3	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	CONNECTED_TIME	4	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	CPU_TIME	6	NULL	NO	double	NULL	NULL	21	NULL	NULL	NULL	NULL	double					NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	DENIED_CONNECTIONS	20	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	EMPTY_QUERIES	23	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	LOST_CONNECTIONS	21	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	MAX_STATEMENT_TIME_EXCEEDED	25	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	OTHER_COMMANDS	17	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	ROLLBACK_TRANSACTIONS	19	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	ROWS_DELETED	12	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	ROWS_INSERTED	13	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	ROWS_READ	10	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	ROWS_SENT	11	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	ROWS_UPDATED	14	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	SELECT_COMMANDS	15	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	TOTAL_CONNECTIONS	2	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	TOTAL_SSL_CONNECTIONS	24	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
+def	information_schema	CLIENT_STATISTICS	UPDATE_COMMANDS	16	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
+def	information_schema	COLLATIONS	CHARACTER_SET_NAME	2	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)					NEVER	NULL
+def	information_schema	COLLATIONS	COLLATION_NAME	1	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)					NEVER	NULL
+def	information_schema	COLLATIONS	ID	3	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(11)					NEVER	NULL
+def	information_schema	COLLATIONS	IS_COMPILED	5	NULL	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)					NEVER	NULL
+def	information_schema	COLLATIONS	IS_DEFAULT	4	NULL	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)					NEVER	NULL
+def	information_schema	COLLATIONS	SORTLEN	6	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(3)					NEVER	NULL
+def	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	CHARACTER_SET_NAME	2	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)					NEVER	NULL
+def	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	COLLATION_NAME	1	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)					NEVER	NULL
 def	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
 def	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
 def	information_schema	COLUMNS	CHARACTER_SET_NAME	14	NULL	YES	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)					NEVER	NULL
 def	information_schema	COLUMNS	COLLATION_NAME	15	NULL	YES	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)					NEVER	NULL
-def	information_schema	COLUMNS	COLUMN_COMMENT	20	''	NO	varchar	1024	3072	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(1024)					NEVER	NULL
+def	information_schema	COLUMNS	COLUMN_COMMENT	20	NULL	NO	varchar	1024	3072	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(1024)					NEVER	NULL
 def	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext					NEVER	NULL
-def	information_schema	COLUMNS	COLUMN_KEY	17	''	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)					NEVER	NULL
-def	information_schema	COLUMNS	COLUMN_NAME	4	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	COLUMNS	COLUMN_TYPE	16	''	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext					NEVER	NULL
-def	information_schema	COLUMNS	DATA_TYPE	8	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	COLUMNS	COLUMN_KEY	17	NULL	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)					NEVER	NULL
+def	information_schema	COLUMNS	COLUMN_NAME	4	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	COLUMNS	COLUMN_TYPE	16	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext					NEVER	NULL
+def	information_schema	COLUMNS	DATA_TYPE	8	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
 def	information_schema	COLUMNS	DATETIME_PRECISION	13	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
-def	information_schema	COLUMNS	EXTRA	18	''	NO	varchar	30	90	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(30)					NEVER	NULL
+def	information_schema	COLUMNS	EXTRA	18	NULL	NO	varchar	30	90	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(30)					NEVER	NULL
 def	information_schema	COLUMNS	GENERATION_EXPRESSION	22	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext					NEVER	NULL
-def	information_schema	COLUMNS	IS_GENERATED	21	''	NO	varchar	6	18	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(6)					NEVER	NULL
-def	information_schema	COLUMNS	IS_NULLABLE	7	''	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)					NEVER	NULL
+def	information_schema	COLUMNS	IS_GENERATED	21	NULL	NO	varchar	6	18	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(6)					NEVER	NULL
+def	information_schema	COLUMNS	IS_NULLABLE	7	NULL	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)					NEVER	NULL
 def	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
 def	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
-def	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
-def	information_schema	COLUMNS	PRIVILEGES	19	''	NO	varchar	80	240	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(80)					NEVER	NULL
-def	information_schema	COLUMNS	TABLE_CATALOG	1	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
-def	information_schema	COLUMNS	TABLE_NAME	3	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	COLUMNS	TABLE_SCHEMA	2	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	5	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	COLUMN_PRIVILEGES	GRANTEE	1	''	NO	varchar	385	1155	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(385)					NEVER	NULL
-def	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	7	''	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)					NEVER	NULL
-def	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	6	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	COLUMN_PRIVILEGES	TABLE_CATALOG	2	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
-def	information_schema	COLUMN_PRIVILEGES	TABLE_NAME	4	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	COLUMN_PRIVILEGES	TABLE_SCHEMA	3	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	COLUMNS	ORDINAL_POSITION	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
+def	information_schema	COLUMNS	PRIVILEGES	19	NULL	NO	varchar	80	240	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(80)					NEVER	NULL
+def	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
+def	information_schema	COLUMNS	TABLE_NAME	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	COLUMNS	TABLE_SCHEMA	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	5	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	COLUMN_PRIVILEGES	GRANTEE	1	NULL	NO	varchar	385	1155	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(385)					NEVER	NULL
+def	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	7	NULL	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)					NEVER	NULL
+def	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	6	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	COLUMN_PRIVILEGES	TABLE_CATALOG	2	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
+def	information_schema	COLUMN_PRIVILEGES	TABLE_NAME	4	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	COLUMN_PRIVILEGES	TABLE_SCHEMA	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
 def	information_schema	ENABLED_ROLES	ROLE_NAME	1	NULL	YES	varchar	128	384	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(128)					NEVER	NULL
-def	information_schema	ENGINES	COMMENT	3	''	NO	varchar	160	480	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(160)					NEVER	NULL
-def	information_schema	ENGINES	ENGINE	1	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	ENGINES	COMMENT	3	NULL	NO	varchar	160	480	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(160)					NEVER	NULL
+def	information_schema	ENGINES	ENGINE	1	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
 def	information_schema	ENGINES	SAVEPOINTS	6	NULL	YES	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)					NEVER	NULL
-def	information_schema	ENGINES	SUPPORT	2	''	NO	varchar	8	24	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(8)					NEVER	NULL
+def	information_schema	ENGINES	SUPPORT	2	NULL	NO	varchar	8	24	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(8)					NEVER	NULL
 def	information_schema	ENGINES	TRANSACTIONS	4	NULL	YES	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)					NEVER	NULL
 def	information_schema	ENGINES	XA	5	NULL	YES	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)					NEVER	NULL
-def	information_schema	EVENTS	CHARACTER_SET_CLIENT	22	''	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)					NEVER	NULL
-def	information_schema	EVENTS	COLLATION_CONNECTION	23	''	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)					NEVER	NULL
-def	information_schema	EVENTS	CREATED	17	'0000-00-00 00:00:00'	NO	datetime	NULL	NULL	NULL	NULL	0	NULL	NULL	datetime					NEVER	NULL
-def	information_schema	EVENTS	DATABASE_COLLATION	24	''	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)					NEVER	NULL
-def	information_schema	EVENTS	DEFINER	4	''	NO	varchar	384	1152	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(384)					NEVER	NULL
+def	information_schema	EVENTS	CHARACTER_SET_CLIENT	22	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)					NEVER	NULL
+def	information_schema	EVENTS	COLLATION_CONNECTION	23	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)					NEVER	NULL
+def	information_schema	EVENTS	CREATED	17	NULL	NO	datetime	NULL	NULL	NULL	NULL	0	NULL	NULL	datetime					NEVER	NULL
+def	information_schema	EVENTS	DATABASE_COLLATION	24	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)					NEVER	NULL
+def	information_schema	EVENTS	DEFINER	4	NULL	NO	varchar	384	1152	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(384)					NEVER	NULL
 def	information_schema	EVENTS	ENDS	14	NULL	YES	datetime	NULL	NULL	NULL	NULL	0	NULL	NULL	datetime					NEVER	NULL
-def	information_schema	EVENTS	EVENT_BODY	6	''	NO	varchar	8	24	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(8)					NEVER	NULL
-def	information_schema	EVENTS	EVENT_CATALOG	1	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	EVENTS	EVENT_COMMENT	20	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	EVENTS	EVENT_DEFINITION	7	''	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext					NEVER	NULL
-def	information_schema	EVENTS	EVENT_NAME	3	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	EVENTS	EVENT_SCHEMA	2	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	EVENTS	EVENT_TYPE	8	''	NO	varchar	9	27	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(9)					NEVER	NULL
+def	information_schema	EVENTS	EVENT_BODY	6	NULL	NO	varchar	8	24	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(8)					NEVER	NULL
+def	information_schema	EVENTS	EVENT_CATALOG	1	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	EVENTS	EVENT_COMMENT	20	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	EVENTS	EVENT_DEFINITION	7	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext					NEVER	NULL
+def	information_schema	EVENTS	EVENT_NAME	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	EVENTS	EVENT_SCHEMA	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	EVENTS	EVENT_TYPE	8	NULL	NO	varchar	9	27	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(9)					NEVER	NULL
 def	information_schema	EVENTS	EXECUTE_AT	9	NULL	YES	datetime	NULL	NULL	NULL	NULL	0	NULL	NULL	datetime					NEVER	NULL
 def	information_schema	EVENTS	INTERVAL_FIELD	11	NULL	YES	varchar	18	54	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(18)					NEVER	NULL
 def	information_schema	EVENTS	INTERVAL_VALUE	10	NULL	YES	varchar	256	768	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(256)					NEVER	NULL
-def	information_schema	EVENTS	LAST_ALTERED	18	'0000-00-00 00:00:00'	NO	datetime	NULL	NULL	NULL	NULL	0	NULL	NULL	datetime					NEVER	NULL
+def	information_schema	EVENTS	LAST_ALTERED	18	NULL	NO	datetime	NULL	NULL	NULL	NULL	0	NULL	NULL	datetime					NEVER	NULL
 def	information_schema	EVENTS	LAST_EXECUTED	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	0	NULL	NULL	datetime					NEVER	NULL
-def	information_schema	EVENTS	ON_COMPLETION	16	''	NO	varchar	12	36	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(12)					NEVER	NULL
-def	information_schema	EVENTS	ORIGINATOR	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(10)					NEVER	NULL
-def	information_schema	EVENTS	SQL_MODE	12	''	NO	varchar	8192	24576	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(8192)					NEVER	NULL
+def	information_schema	EVENTS	ON_COMPLETION	16	NULL	NO	varchar	12	36	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(12)					NEVER	NULL
+def	information_schema	EVENTS	ORIGINATOR	21	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(10)					NEVER	NULL
+def	information_schema	EVENTS	SQL_MODE	12	NULL	NO	varchar	8192	24576	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(8192)					NEVER	NULL
 def	information_schema	EVENTS	STARTS	13	NULL	YES	datetime	NULL	NULL	NULL	NULL	0	NULL	NULL	datetime					NEVER	NULL
-def	information_schema	EVENTS	STATUS	15	''	NO	varchar	18	54	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(18)					NEVER	NULL
-def	information_schema	EVENTS	TIME_ZONE	5	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	EVENTS	STATUS	15	NULL	NO	varchar	18	54	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(18)					NEVER	NULL
+def	information_schema	EVENTS	TIME_ZONE	5	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
 def	information_schema	FILES	AUTOEXTEND_SIZE	19	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
 def	information_schema	FILES	AVG_ROW_LENGTH	28	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
 def	information_schema	FILES	CHECKSUM	36	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
@@ -132,12 +132,12 @@ def	information_schema	FILES	CREATION_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	N
 def	information_schema	FILES	DATA_FREE	32	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
 def	information_schema	FILES	DATA_LENGTH	29	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
 def	information_schema	FILES	DELETED_ROWS	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(4)					NEVER	NULL
-def	information_schema	FILES	ENGINE	10	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	FILES	EXTENT_SIZE	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(4)					NEVER	NULL
+def	information_schema	FILES	ENGINE	10	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	FILES	EXTENT_SIZE	16	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(4)					NEVER	NULL
 def	information_schema	FILES	EXTRA	38	NULL	YES	varchar	255	765	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(255)					NEVER	NULL
-def	information_schema	FILES	FILE_ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(4)					NEVER	NULL
+def	information_schema	FILES	FILE_ID	1	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(4)					NEVER	NULL
 def	information_schema	FILES	FILE_NAME	2	NULL	YES	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
-def	information_schema	FILES	FILE_TYPE	3	''	NO	varchar	20	60	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(20)					NEVER	NULL
+def	information_schema	FILES	FILE_TYPE	3	NULL	NO	varchar	20	60	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(20)					NEVER	NULL
 def	information_schema	FILES	FREE_EXTENTS	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(4)					NEVER	NULL
 def	information_schema	FILES	FULLTEXT_KEYS	11	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
 def	information_schema	FILES	INDEX_LENGTH	31	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
@@ -150,9 +150,9 @@ def	information_schema	FILES	MAXIMUM_SIZE	18	NULL	YES	bigint	NULL	NULL	20	0	NULL
 def	information_schema	FILES	MAX_DATA_LENGTH	30	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
 def	information_schema	FILES	RECOVER_TIME	23	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(4)					NEVER	NULL
 def	information_schema	FILES	ROW_FORMAT	26	NULL	YES	varchar	10	30	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(10)					NEVER	NULL
-def	information_schema	FILES	STATUS	37	''	NO	varchar	20	60	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(20)					NEVER	NULL
+def	information_schema	FILES	STATUS	37	NULL	NO	varchar	20	60	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(20)					NEVER	NULL
 def	information_schema	FILES	TABLESPACE_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	FILES	TABLE_CATALOG	5	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	FILES	TABLE_CATALOG	5	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
 def	information_schema	FILES	TABLE_NAME	7	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
 def	information_schema	FILES	TABLE_ROWS	27	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
 def	information_schema	FILES	TABLE_SCHEMA	6	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
@@ -161,82 +161,82 @@ def	information_schema	FILES	TRANSACTION_COUNTER	24	NULL	YES	bigint	NULL	NULL	19
 def	information_schema	FILES	UPDATE_COUNT	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(4)					NEVER	NULL
 def	information_schema	FILES	UPDATE_TIME	34	NULL	YES	datetime	NULL	NULL	NULL	NULL	0	NULL	NULL	datetime					NEVER	NULL
 def	information_schema	FILES	VERSION	25	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
-def	information_schema	GEOMETRY_COLUMNS	COORD_DIMENSION	11	0	NO	tinyint	NULL	NULL	3	0	NULL	NULL	NULL	tinyint(2)					NEVER	NULL
-def	information_schema	GEOMETRY_COLUMNS	F_GEOMETRY_COLUMN	4	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	GEOMETRY_COLUMNS	F_TABLE_CATALOG	1	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
-def	information_schema	GEOMETRY_COLUMNS	F_TABLE_NAME	3	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	GEOMETRY_COLUMNS	F_TABLE_SCHEMA	2	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	GEOMETRY_COLUMNS	GEOMETRY_TYPE	10	0	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(7)					NEVER	NULL
-def	information_schema	GEOMETRY_COLUMNS	G_GEOMETRY_COLUMN	8	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	GEOMETRY_COLUMNS	G_TABLE_CATALOG	5	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
-def	information_schema	GEOMETRY_COLUMNS	G_TABLE_NAME	7	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	GEOMETRY_COLUMNS	G_TABLE_SCHEMA	6	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	GEOMETRY_COLUMNS	MAX_PPR	12	0	NO	tinyint	NULL	NULL	3	0	NULL	NULL	NULL	tinyint(2)					NEVER	NULL
-def	information_schema	GEOMETRY_COLUMNS	SRID	13	0	NO	smallint	NULL	NULL	5	0	NULL	NULL	NULL	smallint(5)					NEVER	NULL
-def	information_schema	GEOMETRY_COLUMNS	STORAGE_TYPE	9	0	NO	tinyint	NULL	NULL	3	0	NULL	NULL	NULL	tinyint(2)					NEVER	NULL
-def	information_schema	GLOBAL_STATUS	VARIABLE_NAME	1	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	GLOBAL_STATUS	VARIABLE_VALUE	2	''	NO	varchar	2048	6144	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(2048)					NEVER	NULL
-def	information_schema	GLOBAL_VARIABLES	VARIABLE_NAME	1	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	2	''	NO	varchar	2048	6144	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(2048)					NEVER	NULL
-def	information_schema	INDEX_STATISTICS	INDEX_NAME	3	''	NO	varchar	192	576	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(192)					NEVER	NULL
-def	information_schema	INDEX_STATISTICS	ROWS_READ	4	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
-def	information_schema	INDEX_STATISTICS	TABLE_NAME	2	''	NO	varchar	192	576	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(192)					NEVER	NULL
-def	information_schema	INDEX_STATISTICS	TABLE_SCHEMA	1	''	NO	varchar	192	576	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(192)					NEVER	NULL
+def	information_schema	GEOMETRY_COLUMNS	COORD_DIMENSION	11	NULL	NO	tinyint	NULL	NULL	3	0	NULL	NULL	NULL	tinyint(2)					NEVER	NULL
+def	information_schema	GEOMETRY_COLUMNS	F_GEOMETRY_COLUMN	4	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	GEOMETRY_COLUMNS	F_TABLE_CATALOG	1	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
+def	information_schema	GEOMETRY_COLUMNS	F_TABLE_NAME	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	GEOMETRY_COLUMNS	F_TABLE_SCHEMA	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	GEOMETRY_COLUMNS	GEOMETRY_TYPE	10	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(7)					NEVER	NULL
+def	information_schema	GEOMETRY_COLUMNS	G_GEOMETRY_COLUMN	8	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	GEOMETRY_COLUMNS	G_TABLE_CATALOG	5	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
+def	information_schema	GEOMETRY_COLUMNS	G_TABLE_NAME	7	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	GEOMETRY_COLUMNS	G_TABLE_SCHEMA	6	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	GEOMETRY_COLUMNS	MAX_PPR	12	NULL	NO	tinyint	NULL	NULL	3	0	NULL	NULL	NULL	tinyint(2)					NEVER	NULL
+def	information_schema	GEOMETRY_COLUMNS	SRID	13	NULL	NO	smallint	NULL	NULL	5	0	NULL	NULL	NULL	smallint(5)					NEVER	NULL
+def	information_schema	GEOMETRY_COLUMNS	STORAGE_TYPE	9	NULL	NO	tinyint	NULL	NULL	3	0	NULL	NULL	NULL	tinyint(2)					NEVER	NULL
+def	information_schema	GLOBAL_STATUS	VARIABLE_NAME	1	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	GLOBAL_STATUS	VARIABLE_VALUE	2	NULL	NO	varchar	2048	6144	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(2048)					NEVER	NULL
+def	information_schema	GLOBAL_VARIABLES	VARIABLE_NAME	1	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	2	NULL	NO	varchar	2048	6144	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(2048)					NEVER	NULL
+def	information_schema	INDEX_STATISTICS	INDEX_NAME	3	NULL	NO	varchar	192	576	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(192)					NEVER	NULL
+def	information_schema	INDEX_STATISTICS	ROWS_READ	4	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
+def	information_schema	INDEX_STATISTICS	TABLE_NAME	2	NULL	NO	varchar	192	576	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(192)					NEVER	NULL
+def	information_schema	INDEX_STATISTICS	TABLE_SCHEMA	1	NULL	NO	varchar	192	576	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(192)					NEVER	NULL
 def	information_schema	KEYWORDS	WORD	1	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	KEY_CACHES	BLOCK_SIZE	5	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
-def	information_schema	KEY_CACHES	DIRTY_BLOCKS	8	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
-def	information_schema	KEY_CACHES	FULL_SIZE	4	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
-def	information_schema	KEY_CACHES	KEY_CACHE_NAME	1	''	NO	varchar	192	576	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(192)					NEVER	NULL
-def	information_schema	KEY_CACHES	READS	10	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
-def	information_schema	KEY_CACHES	READ_REQUESTS	9	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
+def	information_schema	KEY_CACHES	BLOCK_SIZE	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
+def	information_schema	KEY_CACHES	DIRTY_BLOCKS	8	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
+def	information_schema	KEY_CACHES	FULL_SIZE	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
+def	information_schema	KEY_CACHES	KEY_CACHE_NAME	1	NULL	NO	varchar	192	576	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(192)					NEVER	NULL
+def	information_schema	KEY_CACHES	READS	10	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
+def	information_schema	KEY_CACHES	READ_REQUESTS	9	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
 def	information_schema	KEY_CACHES	SEGMENTS	2	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(3) unsigned					NEVER	NULL
 def	information_schema	KEY_CACHES	SEGMENT_NUMBER	3	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(3) unsigned					NEVER	NULL
-def	information_schema	KEY_CACHES	UNUSED_BLOCKS	7	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
-def	information_schema	KEY_CACHES	USED_BLOCKS	6	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
-def	information_schema	KEY_CACHES	WRITES	12	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
-def	information_schema	KEY_CACHES	WRITE_REQUESTS	11	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
-def	information_schema	KEY_COLUMN_USAGE	COLUMN_NAME	7	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	1	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
-def	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	3	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	2	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	KEY_COLUMN_USAGE	ORDINAL_POSITION	8	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(10)					NEVER	NULL
+def	information_schema	KEY_CACHES	UNUSED_BLOCKS	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
+def	information_schema	KEY_CACHES	USED_BLOCKS	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
+def	information_schema	KEY_CACHES	WRITES	12	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
+def	information_schema	KEY_CACHES	WRITE_REQUESTS	11	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
+def	information_schema	KEY_COLUMN_USAGE	COLUMN_NAME	7	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	1	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
+def	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	KEY_COLUMN_USAGE	ORDINAL_POSITION	8	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(10)					NEVER	NULL
 def	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(10)					NEVER	NULL
 def	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
 def	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	11	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
 def	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	KEY_COLUMN_USAGE	TABLE_CATALOG	4	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
-def	information_schema	KEY_COLUMN_USAGE	TABLE_NAME	6	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	KEY_COLUMN_USAGE	TABLE_SCHEMA	5	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	OPTIMIZER_TRACE	INSUFFICIENT_PRIVILEGES	4	0	NO	tinyint	NULL	NULL	3	0	NULL	NULL	NULL	tinyint(1)					NEVER	NULL
-def	information_schema	OPTIMIZER_TRACE	MISSING_BYTES_BEYOND_MAX_MEM_SIZE	3	0	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(20)					NEVER	NULL
-def	information_schema	OPTIMIZER_TRACE	QUERY	1	''	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext					NEVER	NULL
-def	information_schema	OPTIMIZER_TRACE	TRACE	2	''	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext					NEVER	NULL
+def	information_schema	KEY_COLUMN_USAGE	TABLE_CATALOG	4	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
+def	information_schema	KEY_COLUMN_USAGE	TABLE_NAME	6	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	KEY_COLUMN_USAGE	TABLE_SCHEMA	5	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	OPTIMIZER_TRACE	INSUFFICIENT_PRIVILEGES	4	NULL	NO	tinyint	NULL	NULL	3	0	NULL	NULL	NULL	tinyint(1)					NEVER	NULL
+def	information_schema	OPTIMIZER_TRACE	MISSING_BYTES_BEYOND_MAX_MEM_SIZE	3	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(20)					NEVER	NULL
+def	information_schema	OPTIMIZER_TRACE	QUERY	1	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext					NEVER	NULL
+def	information_schema	OPTIMIZER_TRACE	TRACE	2	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext					NEVER	NULL
 def	information_schema	PARAMETERS	CHARACTER_MAXIMUM_LENGTH	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(21)					NEVER	NULL
 def	information_schema	PARAMETERS	CHARACTER_OCTET_LENGTH	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(21)					NEVER	NULL
 def	information_schema	PARAMETERS	CHARACTER_SET_NAME	13	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
 def	information_schema	PARAMETERS	COLLATION_NAME	14	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	PARAMETERS	DATA_TYPE	7	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	PARAMETERS	DATA_TYPE	7	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
 def	information_schema	PARAMETERS	DATETIME_PRECISION	12	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
-def	information_schema	PARAMETERS	DTD_IDENTIFIER	15	''	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext					NEVER	NULL
+def	information_schema	PARAMETERS	DTD_IDENTIFIER	15	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext					NEVER	NULL
 def	information_schema	PARAMETERS	NUMERIC_PRECISION	10	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(21)					NEVER	NULL
 def	information_schema	PARAMETERS	NUMERIC_SCALE	11	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(21)					NEVER	NULL
-def	information_schema	PARAMETERS	ORDINAL_POSITION	4	0	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(21)					NEVER	NULL
+def	information_schema	PARAMETERS	ORDINAL_POSITION	4	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(21)					NEVER	NULL
 def	information_schema	PARAMETERS	PARAMETER_MODE	5	NULL	YES	varchar	5	15	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(5)					NEVER	NULL
 def	information_schema	PARAMETERS	PARAMETER_NAME	6	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	PARAMETERS	ROUTINE_TYPE	16	''	NO	varchar	9	27	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(9)					NEVER	NULL
-def	information_schema	PARAMETERS	SPECIFIC_CATALOG	1	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
-def	information_schema	PARAMETERS	SPECIFIC_NAME	3	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	PARAMETERS	SPECIFIC_SCHEMA	2	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	PARTITIONS	AVG_ROW_LENGTH	14	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
+def	information_schema	PARAMETERS	ROUTINE_TYPE	16	NULL	NO	varchar	9	27	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(9)					NEVER	NULL
+def	information_schema	PARAMETERS	SPECIFIC_CATALOG	1	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
+def	information_schema	PARAMETERS	SPECIFIC_NAME	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	PARAMETERS	SPECIFIC_SCHEMA	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	PARTITIONS	AVG_ROW_LENGTH	14	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
 def	information_schema	PARTITIONS	CHECKSUM	22	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
 def	information_schema	PARTITIONS	CHECK_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	0	NULL	NULL	datetime					NEVER	NULL
 def	information_schema	PARTITIONS	CREATE_TIME	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	0	NULL	NULL	datetime					NEVER	NULL
-def	information_schema	PARTITIONS	DATA_FREE	18	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
-def	information_schema	PARTITIONS	DATA_LENGTH	15	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
-def	information_schema	PARTITIONS	INDEX_LENGTH	17	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
+def	information_schema	PARTITIONS	DATA_FREE	18	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
+def	information_schema	PARTITIONS	DATA_LENGTH	15	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
+def	information_schema	PARTITIONS	INDEX_LENGTH	17	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
 def	information_schema	PARTITIONS	MAX_DATA_LENGTH	16	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
-def	information_schema	PARTITIONS	NODEGROUP	24	''	NO	varchar	12	36	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(12)					NEVER	NULL
-def	information_schema	PARTITIONS	PARTITION_COMMENT	23	''	NO	varchar	80	240	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(80)					NEVER	NULL
+def	information_schema	PARTITIONS	NODEGROUP	24	NULL	NO	varchar	12	36	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(12)					NEVER	NULL
+def	information_schema	PARTITIONS	PARTITION_COMMENT	23	NULL	NO	varchar	80	240	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(80)					NEVER	NULL
 def	information_schema	PARTITIONS	PARTITION_DESCRIPTION	12	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext					NEVER	NULL
 def	information_schema	PARTITIONS	PARTITION_EXPRESSION	10	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext					NEVER	NULL
 def	information_schema	PARTITIONS	PARTITION_METHOD	8	NULL	YES	varchar	18	54	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(18)					NEVER	NULL
@@ -247,136 +247,136 @@ def	information_schema	PARTITIONS	SUBPARTITION_METHOD	9	NULL	YES	varchar	12	36	N
 def	information_schema	PARTITIONS	SUBPARTITION_NAME	5	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
 def	information_schema	PARTITIONS	SUBPARTITION_ORDINAL_POSITION	7	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
 def	information_schema	PARTITIONS	TABLESPACE_NAME	25	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	PARTITIONS	TABLE_CATALOG	1	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
-def	information_schema	PARTITIONS	TABLE_NAME	3	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	PARTITIONS	TABLE_ROWS	13	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
-def	information_schema	PARTITIONS	TABLE_SCHEMA	2	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	PARTITIONS	TABLE_CATALOG	1	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
+def	information_schema	PARTITIONS	TABLE_NAME	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	PARTITIONS	TABLE_ROWS	13	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
+def	information_schema	PARTITIONS	TABLE_SCHEMA	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
 def	information_schema	PARTITIONS	UPDATE_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	0	NULL	NULL	datetime					NEVER	NULL
-def	information_schema	PLUGINS	LOAD_OPTION	11	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	PLUGINS	LOAD_OPTION	11	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
 def	information_schema	PLUGINS	PLUGIN_AUTHOR	8	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
 def	information_schema	PLUGINS	PLUGIN_AUTH_VERSION	13	NULL	YES	varchar	80	240	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(80)					NEVER	NULL
 def	information_schema	PLUGINS	PLUGIN_DESCRIPTION	9	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext					NEVER	NULL
 def	information_schema	PLUGINS	PLUGIN_LIBRARY	6	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
 def	information_schema	PLUGINS	PLUGIN_LIBRARY_VERSION	7	NULL	YES	varchar	20	60	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(20)					NEVER	NULL
-def	information_schema	PLUGINS	PLUGIN_LICENSE	10	''	NO	varchar	80	240	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(80)					NEVER	NULL
-def	information_schema	PLUGINS	PLUGIN_MATURITY	12	''	NO	varchar	12	36	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(12)					NEVER	NULL
-def	information_schema	PLUGINS	PLUGIN_NAME	1	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	PLUGINS	PLUGIN_STATUS	3	''	NO	varchar	16	48	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(16)					NEVER	NULL
-def	information_schema	PLUGINS	PLUGIN_TYPE	4	''	NO	varchar	80	240	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(80)					NEVER	NULL
-def	information_schema	PLUGINS	PLUGIN_TYPE_VERSION	5	''	NO	varchar	20	60	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(20)					NEVER	NULL
-def	information_schema	PLUGINS	PLUGIN_VERSION	2	''	NO	varchar	20	60	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(20)					NEVER	NULL
-def	information_schema	PROCESSLIST	COMMAND	5	''	NO	varchar	16	48	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(16)					NEVER	NULL
+def	information_schema	PLUGINS	PLUGIN_LICENSE	10	NULL	NO	varchar	80	240	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(80)					NEVER	NULL
+def	information_schema	PLUGINS	PLUGIN_MATURITY	12	NULL	NO	varchar	12	36	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(12)					NEVER	NULL
+def	information_schema	PLUGINS	PLUGIN_NAME	1	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	PLUGINS	PLUGIN_STATUS	3	NULL	NO	varchar	16	48	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(16)					NEVER	NULL
+def	information_schema	PLUGINS	PLUGIN_TYPE	4	NULL	NO	varchar	80	240	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(80)					NEVER	NULL
+def	information_schema	PLUGINS	PLUGIN_TYPE_VERSION	5	NULL	NO	varchar	20	60	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(20)					NEVER	NULL
+def	information_schema	PLUGINS	PLUGIN_VERSION	2	NULL	NO	varchar	20	60	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(20)					NEVER	NULL
+def	information_schema	PROCESSLIST	COMMAND	5	NULL	NO	varchar	16	48	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(16)					NEVER	NULL
 def	information_schema	PROCESSLIST	DB	4	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	PROCESSLIST	EXAMINED_ROWS	15	0	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(7)					NEVER	NULL
-def	information_schema	PROCESSLIST	HOST	3	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	PROCESSLIST	ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(4)					NEVER	NULL
+def	information_schema	PROCESSLIST	EXAMINED_ROWS	15	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(7)					NEVER	NULL
+def	information_schema	PROCESSLIST	HOST	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	PROCESSLIST	ID	1	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(4)					NEVER	NULL
 def	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext					NEVER	NULL
 def	information_schema	PROCESSLIST	INFO_BINARY	17	NULL	YES	blob	65535	65535	NULL	NULL	NULL	NULL	NULL	blob					NEVER	NULL
-def	information_schema	PROCESSLIST	MAX_MEMORY_USED	14	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(7)					NEVER	NULL
-def	information_schema	PROCESSLIST	MAX_STAGE	11	0	NO	tinyint	NULL	NULL	3	0	NULL	NULL	NULL	tinyint(2)					NEVER	NULL
-def	information_schema	PROCESSLIST	MEMORY_USED	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(7)					NEVER	NULL
-def	information_schema	PROCESSLIST	PROGRESS	12	0.000	NO	decimal	NULL	NULL	7	3	NULL	NULL	NULL	decimal(7,3)					NEVER	NULL
-def	information_schema	PROCESSLIST	QUERY_ID	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(4)					NEVER	NULL
-def	information_schema	PROCESSLIST	STAGE	10	0	NO	tinyint	NULL	NULL	3	0	NULL	NULL	NULL	tinyint(2)					NEVER	NULL
+def	information_schema	PROCESSLIST	MAX_MEMORY_USED	14	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(7)					NEVER	NULL
+def	information_schema	PROCESSLIST	MAX_STAGE	11	NULL	NO	tinyint	NULL	NULL	3	0	NULL	NULL	NULL	tinyint(2)					NEVER	NULL
+def	information_schema	PROCESSLIST	MEMORY_USED	13	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(7)					NEVER	NULL
+def	information_schema	PROCESSLIST	PROGRESS	12	NULL	NO	decimal	NULL	NULL	7	3	NULL	NULL	NULL	decimal(7,3)					NEVER	NULL
+def	information_schema	PROCESSLIST	QUERY_ID	16	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(4)					NEVER	NULL
+def	information_schema	PROCESSLIST	STAGE	10	NULL	NO	tinyint	NULL	NULL	3	0	NULL	NULL	NULL	tinyint(2)					NEVER	NULL
 def	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	PROCESSLIST	TID	18	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(4)					NEVER	NULL
-def	information_schema	PROCESSLIST	TIME	6	0	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(7)					NEVER	NULL
-def	information_schema	PROCESSLIST	TIME_MS	9	0.000	NO	decimal	NULL	NULL	22	3	NULL	NULL	NULL	decimal(22,3)					NEVER	NULL
-def	information_schema	PROCESSLIST	USER	2	''	NO	varchar	128	384	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(128)					NEVER	NULL
-def	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
-def	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	REFERENTIAL_CONSTRAINTS	DELETE_RULE	9	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	REFERENTIAL_CONSTRAINTS	MATCH_OPTION	7	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	11	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	REFERENTIAL_CONSTRAINTS	TABLE_NAME	10	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	4	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
+def	information_schema	PROCESSLIST	TID	18	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(4)					NEVER	NULL
+def	information_schema	PROCESSLIST	TIME	6	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(7)					NEVER	NULL
+def	information_schema	PROCESSLIST	TIME_MS	9	NULL	NO	decimal	NULL	NULL	22	3	NULL	NULL	NULL	decimal(22,3)					NEVER	NULL
+def	information_schema	PROCESSLIST	USER	2	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(128)					NEVER	NULL
+def	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
+def	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	REFERENTIAL_CONSTRAINTS	DELETE_RULE	9	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	REFERENTIAL_CONSTRAINTS	MATCH_OPTION	7	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	11	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	REFERENTIAL_CONSTRAINTS	TABLE_NAME	10	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	4	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
 def	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	6	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	5	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	REFERENTIAL_CONSTRAINTS	UPDATE_RULE	8	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	5	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	REFERENTIAL_CONSTRAINTS	UPDATE_RULE	8	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
 def	information_schema	ROUTINES	CHARACTER_MAXIMUM_LENGTH	7	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(21)					NEVER	NULL
 def	information_schema	ROUTINES	CHARACTER_OCTET_LENGTH	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(21)					NEVER	NULL
-def	information_schema	ROUTINES	CHARACTER_SET_CLIENT	29	''	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)					NEVER	NULL
+def	information_schema	ROUTINES	CHARACTER_SET_CLIENT	29	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)					NEVER	NULL
 def	information_schema	ROUTINES	CHARACTER_SET_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	ROUTINES	COLLATION_CONNECTION	30	''	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)					NEVER	NULL
+def	information_schema	ROUTINES	COLLATION_CONNECTION	30	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)					NEVER	NULL
 def	information_schema	ROUTINES	COLLATION_NAME	13	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	ROUTINES	CREATED	24	'0000-00-00 00:00:00'	NO	datetime	NULL	NULL	NULL	NULL	0	NULL	NULL	datetime					NEVER	NULL
-def	information_schema	ROUTINES	DATABASE_COLLATION	31	''	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)					NEVER	NULL
-def	information_schema	ROUTINES	DATA_TYPE	6	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	ROUTINES	CREATED	24	NULL	NO	datetime	NULL	NULL	NULL	NULL	0	NULL	NULL	datetime					NEVER	NULL
+def	information_schema	ROUTINES	DATABASE_COLLATION	31	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)					NEVER	NULL
+def	information_schema	ROUTINES	DATA_TYPE	6	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
 def	information_schema	ROUTINES	DATETIME_PRECISION	11	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
-def	information_schema	ROUTINES	DEFINER	28	''	NO	varchar	384	1152	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(384)					NEVER	NULL
+def	information_schema	ROUTINES	DEFINER	28	NULL	NO	varchar	384	1152	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(384)					NEVER	NULL
 def	information_schema	ROUTINES	DTD_IDENTIFIER	14	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext					NEVER	NULL
 def	information_schema	ROUTINES	EXTERNAL_LANGUAGE	18	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
 def	information_schema	ROUTINES	EXTERNAL_NAME	17	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	ROUTINES	IS_DETERMINISTIC	20	''	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)					NEVER	NULL
-def	information_schema	ROUTINES	LAST_ALTERED	25	'0000-00-00 00:00:00'	NO	datetime	NULL	NULL	NULL	NULL	0	NULL	NULL	datetime					NEVER	NULL
+def	information_schema	ROUTINES	IS_DETERMINISTIC	20	NULL	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)					NEVER	NULL
+def	information_schema	ROUTINES	LAST_ALTERED	25	NULL	NO	datetime	NULL	NULL	NULL	NULL	0	NULL	NULL	datetime					NEVER	NULL
 def	information_schema	ROUTINES	NUMERIC_PRECISION	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(21)					NEVER	NULL
 def	information_schema	ROUTINES	NUMERIC_SCALE	10	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(21)					NEVER	NULL
-def	information_schema	ROUTINES	PARAMETER_STYLE	19	''	NO	varchar	8	24	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(8)					NEVER	NULL
-def	information_schema	ROUTINES	ROUTINE_BODY	15	''	NO	varchar	8	24	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(8)					NEVER	NULL
-def	information_schema	ROUTINES	ROUTINE_CATALOG	2	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
-def	information_schema	ROUTINES	ROUTINE_COMMENT	27	''	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext					NEVER	NULL
+def	information_schema	ROUTINES	PARAMETER_STYLE	19	NULL	NO	varchar	8	24	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(8)					NEVER	NULL
+def	information_schema	ROUTINES	ROUTINE_BODY	15	NULL	NO	varchar	8	24	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(8)					NEVER	NULL
+def	information_schema	ROUTINES	ROUTINE_CATALOG	2	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
+def	information_schema	ROUTINES	ROUTINE_COMMENT	27	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext					NEVER	NULL
 def	information_schema	ROUTINES	ROUTINE_DEFINITION	16	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext					NEVER	NULL
-def	information_schema	ROUTINES	ROUTINE_NAME	4	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	ROUTINES	ROUTINE_SCHEMA	3	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	ROUTINES	ROUTINE_TYPE	5	''	NO	varchar	13	39	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(13)					NEVER	NULL
-def	information_schema	ROUTINES	SECURITY_TYPE	23	''	NO	varchar	7	21	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(7)					NEVER	NULL
-def	information_schema	ROUTINES	SPECIFIC_NAME	1	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	ROUTINES	SQL_DATA_ACCESS	21	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	ROUTINES	SQL_MODE	26	''	NO	varchar	8192	24576	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(8192)					NEVER	NULL
+def	information_schema	ROUTINES	ROUTINE_NAME	4	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	ROUTINES	ROUTINE_SCHEMA	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	ROUTINES	ROUTINE_TYPE	5	NULL	NO	varchar	13	39	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(13)					NEVER	NULL
+def	information_schema	ROUTINES	SECURITY_TYPE	23	NULL	NO	varchar	7	21	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(7)					NEVER	NULL
+def	information_schema	ROUTINES	SPECIFIC_NAME	1	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	ROUTINES	SQL_DATA_ACCESS	21	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	ROUTINES	SQL_MODE	26	NULL	NO	varchar	8192	24576	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(8192)					NEVER	NULL
 def	information_schema	ROUTINES	SQL_PATH	22	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	SCHEMATA	CATALOG_NAME	1	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
-def	information_schema	SCHEMATA	DEFAULT_CHARACTER_SET_NAME	3	''	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)					NEVER	NULL
-def	information_schema	SCHEMATA	DEFAULT_COLLATION_NAME	4	''	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)					NEVER	NULL
-def	information_schema	SCHEMATA	SCHEMA_COMMENT	6	''	NO	varchar	1024	3072	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(1024)					NEVER	NULL
-def	information_schema	SCHEMATA	SCHEMA_NAME	2	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	SCHEMATA	CATALOG_NAME	1	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
+def	information_schema	SCHEMATA	DEFAULT_CHARACTER_SET_NAME	3	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)					NEVER	NULL
+def	information_schema	SCHEMATA	DEFAULT_COLLATION_NAME	4	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)					NEVER	NULL
+def	information_schema	SCHEMATA	SCHEMA_COMMENT	6	NULL	NO	varchar	1024	3072	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(1024)					NEVER	NULL
+def	information_schema	SCHEMATA	SCHEMA_NAME	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
 def	information_schema	SCHEMATA	SQL_PATH	5	NULL	YES	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
-def	information_schema	SCHEMA_PRIVILEGES	GRANTEE	1	''	NO	varchar	385	1155	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(385)					NEVER	NULL
-def	information_schema	SCHEMA_PRIVILEGES	IS_GRANTABLE	5	''	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)					NEVER	NULL
-def	information_schema	SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	4	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG	2	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
-def	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	3	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	SESSION_STATUS	VARIABLE_NAME	1	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	SESSION_STATUS	VARIABLE_VALUE	2	''	NO	varchar	2048	6144	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(2048)					NEVER	NULL
-def	information_schema	SESSION_VARIABLES	VARIABLE_NAME	1	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	2	''	NO	varchar	2048	6144	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(2048)					NEVER	NULL
-def	information_schema	SPATIAL_REF_SYS	AUTH_NAME	2	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
-def	information_schema	SPATIAL_REF_SYS	AUTH_SRID	3	0	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(5)					NEVER	NULL
-def	information_schema	SPATIAL_REF_SYS	SRID	1	0	NO	smallint	NULL	NULL	5	0	NULL	NULL	NULL	smallint(5)					NEVER	NULL
-def	information_schema	SPATIAL_REF_SYS	SRTEXT	4	''	NO	varchar	2048	6144	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(2048)					NEVER	NULL
+def	information_schema	SCHEMA_PRIVILEGES	GRANTEE	1	NULL	NO	varchar	385	1155	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(385)					NEVER	NULL
+def	information_schema	SCHEMA_PRIVILEGES	IS_GRANTABLE	5	NULL	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)					NEVER	NULL
+def	information_schema	SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	4	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG	2	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
+def	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	SESSION_STATUS	VARIABLE_NAME	1	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	SESSION_STATUS	VARIABLE_VALUE	2	NULL	NO	varchar	2048	6144	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(2048)					NEVER	NULL
+def	information_schema	SESSION_VARIABLES	VARIABLE_NAME	1	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	2	NULL	NO	varchar	2048	6144	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(2048)					NEVER	NULL
+def	information_schema	SPATIAL_REF_SYS	AUTH_NAME	2	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
+def	information_schema	SPATIAL_REF_SYS	AUTH_SRID	3	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(5)					NEVER	NULL
+def	information_schema	SPATIAL_REF_SYS	SRID	1	NULL	NO	smallint	NULL	NULL	5	0	NULL	NULL	NULL	smallint(5)					NEVER	NULL
+def	information_schema	SPATIAL_REF_SYS	SRTEXT	4	NULL	NO	varchar	2048	6144	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(2048)					NEVER	NULL
 def	information_schema	SQL_FUNCTIONS	FUNCTION	1	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
 def	information_schema	STATISTICS	CARDINALITY	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
 def	information_schema	STATISTICS	COLLATION	9	NULL	YES	varchar	1	3	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(1)					NEVER	NULL
-def	information_schema	STATISTICS	COLUMN_NAME	8	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	STATISTICS	COLUMN_NAME	8	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
 def	information_schema	STATISTICS	COMMENT	15	NULL	YES	varchar	16	48	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(16)					NEVER	NULL
-def	information_schema	STATISTICS	IGNORED	17	''	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)					NEVER	NULL
-def	information_schema	STATISTICS	INDEX_COMMENT	16	''	NO	varchar	1024	3072	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(1024)					NEVER	NULL
-def	information_schema	STATISTICS	INDEX_NAME	6	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	STATISTICS	INDEX_SCHEMA	5	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	STATISTICS	INDEX_TYPE	14	''	NO	varchar	16	48	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(16)					NEVER	NULL
-def	information_schema	STATISTICS	NON_UNIQUE	4	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(1)					NEVER	NULL
-def	information_schema	STATISTICS	NULLABLE	13	''	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)					NEVER	NULL
+def	information_schema	STATISTICS	IGNORED	17	NULL	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)					NEVER	NULL
+def	information_schema	STATISTICS	INDEX_COMMENT	16	NULL	NO	varchar	1024	3072	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(1024)					NEVER	NULL
+def	information_schema	STATISTICS	INDEX_NAME	6	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	STATISTICS	INDEX_SCHEMA	5	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	STATISTICS	INDEX_TYPE	14	NULL	NO	varchar	16	48	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(16)					NEVER	NULL
+def	information_schema	STATISTICS	NON_UNIQUE	4	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(1)					NEVER	NULL
+def	information_schema	STATISTICS	NULLABLE	13	NULL	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)					NEVER	NULL
 def	information_schema	STATISTICS	PACKED	12	NULL	YES	varchar	10	30	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(10)					NEVER	NULL
-def	information_schema	STATISTICS	SEQ_IN_INDEX	7	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(2)					NEVER	NULL
+def	information_schema	STATISTICS	SEQ_IN_INDEX	7	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(2)					NEVER	NULL
 def	information_schema	STATISTICS	SUB_PART	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(3)					NEVER	NULL
-def	information_schema	STATISTICS	TABLE_CATALOG	1	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
-def	information_schema	STATISTICS	TABLE_NAME	3	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	STATISTICS	TABLE_SCHEMA	2	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	STATISTICS	TABLE_CATALOG	1	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
+def	information_schema	STATISTICS	TABLE_NAME	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	STATISTICS	TABLE_SCHEMA	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
 def	information_schema	SYSTEM_VARIABLES	COMMAND_LINE_ARGUMENT	14	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
 def	information_schema	SYSTEM_VARIABLES	DEFAULT_VALUE	5	NULL	YES	varchar	2048	6144	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(2048)					NEVER	NULL
 def	information_schema	SYSTEM_VARIABLES	ENUM_VALUE_LIST	12	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext					NEVER	NULL
 def	information_schema	SYSTEM_VARIABLES	GLOBAL_VALUE	3	NULL	YES	varchar	2048	6144	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(2048)					NEVER	NULL
-def	information_schema	SYSTEM_VARIABLES	GLOBAL_VALUE_ORIGIN	4	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	SYSTEM_VARIABLES	GLOBAL_VALUE_ORIGIN	4	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
 def	information_schema	SYSTEM_VARIABLES	GLOBAL_VALUE_PATH	15	NULL	YES	varchar	2048	6144	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(2048)					NEVER	NULL
 def	information_schema	SYSTEM_VARIABLES	NUMERIC_BLOCK_SIZE	11	NULL	YES	varchar	21	63	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(21)					NEVER	NULL
 def	information_schema	SYSTEM_VARIABLES	NUMERIC_MAX_VALUE	10	NULL	YES	varchar	21	63	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(21)					NEVER	NULL
 def	information_schema	SYSTEM_VARIABLES	NUMERIC_MIN_VALUE	9	NULL	YES	varchar	21	63	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(21)					NEVER	NULL
-def	information_schema	SYSTEM_VARIABLES	READ_ONLY	13	''	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)					NEVER	NULL
+def	information_schema	SYSTEM_VARIABLES	READ_ONLY	13	NULL	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)					NEVER	NULL
 def	information_schema	SYSTEM_VARIABLES	SESSION_VALUE	2	NULL	YES	varchar	2048	6144	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(2048)					NEVER	NULL
-def	information_schema	SYSTEM_VARIABLES	VARIABLE_COMMENT	8	''	NO	varchar	2048	6144	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(2048)					NEVER	NULL
-def	information_schema	SYSTEM_VARIABLES	VARIABLE_NAME	1	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	SYSTEM_VARIABLES	VARIABLE_SCOPE	6	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	SYSTEM_VARIABLES	VARIABLE_TYPE	7	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	SYSTEM_VARIABLES	VARIABLE_COMMENT	8	NULL	NO	varchar	2048	6144	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(2048)					NEVER	NULL
+def	information_schema	SYSTEM_VARIABLES	VARIABLE_NAME	1	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	SYSTEM_VARIABLES	VARIABLE_SCOPE	6	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	SYSTEM_VARIABLES	VARIABLE_TYPE	7	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
 def	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
 def	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
 def	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
@@ -390,104 +390,104 @@ def	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	20	0	NUL
 def	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
 def	information_schema	TABLES	MAX_INDEX_LENGTH	22	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
 def	information_schema	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(10)					NEVER	NULL
-def	information_schema	TABLES	TABLE_CATALOG	1	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
+def	information_schema	TABLES	TABLE_CATALOG	1	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
 def	information_schema	TABLES	TABLE_COLLATION	18	NULL	YES	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)					NEVER	NULL
-def	information_schema	TABLES	TABLE_COMMENT	21	''	NO	varchar	2048	6144	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(2048)					NEVER	NULL
-def	information_schema	TABLES	TABLE_NAME	3	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	TABLES	TABLE_COMMENT	21	NULL	NO	varchar	2048	6144	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(2048)					NEVER	NULL
+def	information_schema	TABLES	TABLE_NAME	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
 def	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
-def	information_schema	TABLES	TABLE_SCHEMA	2	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	TABLES	TABLE_TYPE	4	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	TABLES	TABLE_SCHEMA	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	TABLES	TABLE_TYPE	4	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
 def	information_schema	TABLES	TEMPORARY	23	NULL	YES	varchar	1	3	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(1)					NEVER	NULL
 def	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	0	NULL	NULL	datetime					NEVER	NULL
 def	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
 def	information_schema	TABLESPACES	AUTOEXTEND_SIZE	6	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
-def	information_schema	TABLESPACES	ENGINE	2	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	TABLESPACES	ENGINE	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
 def	information_schema	TABLESPACES	EXTENT_SIZE	5	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
 def	information_schema	TABLESPACES	LOGFILE_GROUP_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
 def	information_schema	TABLESPACES	MAXIMUM_SIZE	7	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
 def	information_schema	TABLESPACES	NODEGROUP_ID	8	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
 def	information_schema	TABLESPACES	TABLESPACE_COMMENT	9	NULL	YES	varchar	2048	6144	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(2048)					NEVER	NULL
-def	information_schema	TABLESPACES	TABLESPACE_NAME	1	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	TABLESPACES	TABLESPACE_NAME	1	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
 def	information_schema	TABLESPACES	TABLESPACE_TYPE	3	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	1	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
-def	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_NAME	3	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_SCHEMA	2	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_TYPE	6	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	TABLE_CONSTRAINTS	TABLE_NAME	5	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	TABLE_CONSTRAINTS	TABLE_SCHEMA	4	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	TABLE_PRIVILEGES	GRANTEE	1	''	NO	varchar	385	1155	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(385)					NEVER	NULL
-def	information_schema	TABLE_PRIVILEGES	IS_GRANTABLE	6	''	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)					NEVER	NULL
-def	information_schema	TABLE_PRIVILEGES	PRIVILEGE_TYPE	5	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	TABLE_PRIVILEGES	TABLE_CATALOG	2	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
-def	information_schema	TABLE_PRIVILEGES	TABLE_NAME	4	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	TABLE_PRIVILEGES	TABLE_SCHEMA	3	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	TABLE_STATISTICS	ROWS_CHANGED	4	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
-def	information_schema	TABLE_STATISTICS	ROWS_CHANGED_X_INDEXES	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
-def	information_schema	TABLE_STATISTICS	ROWS_READ	3	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
-def	information_schema	TABLE_STATISTICS	TABLE_NAME	2	''	NO	varchar	192	576	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(192)					NEVER	NULL
-def	information_schema	TABLE_STATISTICS	TABLE_SCHEMA	1	''	NO	varchar	192	576	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(192)					NEVER	NULL
+def	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
+def	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_NAME	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_SCHEMA	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_TYPE	6	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	TABLE_CONSTRAINTS	TABLE_NAME	5	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	TABLE_CONSTRAINTS	TABLE_SCHEMA	4	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	TABLE_PRIVILEGES	GRANTEE	1	NULL	NO	varchar	385	1155	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(385)					NEVER	NULL
+def	information_schema	TABLE_PRIVILEGES	IS_GRANTABLE	6	NULL	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)					NEVER	NULL
+def	information_schema	TABLE_PRIVILEGES	PRIVILEGE_TYPE	5	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	TABLE_PRIVILEGES	TABLE_CATALOG	2	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
+def	information_schema	TABLE_PRIVILEGES	TABLE_NAME	4	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	TABLE_PRIVILEGES	TABLE_SCHEMA	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	TABLE_STATISTICS	ROWS_CHANGED	4	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
+def	information_schema	TABLE_STATISTICS	ROWS_CHANGED_X_INDEXES	5	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
+def	information_schema	TABLE_STATISTICS	ROWS_READ	3	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
+def	information_schema	TABLE_STATISTICS	TABLE_NAME	2	NULL	NO	varchar	192	576	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(192)					NEVER	NULL
+def	information_schema	TABLE_STATISTICS	TABLE_SCHEMA	1	NULL	NO	varchar	192	576	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(192)					NEVER	NULL
 def	information_schema	TRIGGERS	ACTION_CONDITION	9	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext					NEVER	NULL
-def	information_schema	TRIGGERS	ACTION_ORDER	8	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(4)					NEVER	NULL
-def	information_schema	TRIGGERS	ACTION_ORIENTATION	11	''	NO	varchar	9	27	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(9)					NEVER	NULL
-def	information_schema	TRIGGERS	ACTION_REFERENCE_NEW_ROW	16	''	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)					NEVER	NULL
+def	information_schema	TRIGGERS	ACTION_ORDER	8	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(4)					NEVER	NULL
+def	information_schema	TRIGGERS	ACTION_ORIENTATION	11	NULL	NO	varchar	9	27	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(9)					NEVER	NULL
+def	information_schema	TRIGGERS	ACTION_REFERENCE_NEW_ROW	16	NULL	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)					NEVER	NULL
 def	information_schema	TRIGGERS	ACTION_REFERENCE_NEW_TABLE	14	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	TRIGGERS	ACTION_REFERENCE_OLD_ROW	15	''	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)					NEVER	NULL
+def	information_schema	TRIGGERS	ACTION_REFERENCE_OLD_ROW	15	NULL	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)					NEVER	NULL
 def	information_schema	TRIGGERS	ACTION_REFERENCE_OLD_TABLE	13	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	TRIGGERS	ACTION_STATEMENT	10	''	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext					NEVER	NULL
-def	information_schema	TRIGGERS	ACTION_TIMING	12	''	NO	varchar	6	18	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(6)					NEVER	NULL
-def	information_schema	TRIGGERS	CHARACTER_SET_CLIENT	20	''	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)					NEVER	NULL
-def	information_schema	TRIGGERS	COLLATION_CONNECTION	21	''	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)					NEVER	NULL
+def	information_schema	TRIGGERS	ACTION_STATEMENT	10	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext					NEVER	NULL
+def	information_schema	TRIGGERS	ACTION_TIMING	12	NULL	NO	varchar	6	18	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(6)					NEVER	NULL
+def	information_schema	TRIGGERS	CHARACTER_SET_CLIENT	20	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)					NEVER	NULL
+def	information_schema	TRIGGERS	COLLATION_CONNECTION	21	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)					NEVER	NULL
 def	information_schema	TRIGGERS	CREATED	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	2	NULL	NULL	datetime(2)					NEVER	NULL
-def	information_schema	TRIGGERS	DATABASE_COLLATION	22	''	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)					NEVER	NULL
-def	information_schema	TRIGGERS	DEFINER	19	''	NO	varchar	384	1152	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(384)					NEVER	NULL
-def	information_schema	TRIGGERS	EVENT_MANIPULATION	4	''	NO	varchar	6	18	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(6)					NEVER	NULL
-def	information_schema	TRIGGERS	EVENT_OBJECT_CATALOG	5	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
-def	information_schema	TRIGGERS	EVENT_OBJECT_SCHEMA	6	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	TRIGGERS	EVENT_OBJECT_TABLE	7	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	TRIGGERS	SQL_MODE	18	''	NO	varchar	8192	24576	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(8192)					NEVER	NULL
-def	information_schema	TRIGGERS	TRIGGER_CATALOG	1	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
-def	information_schema	TRIGGERS	TRIGGER_NAME	3	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	TRIGGERS	TRIGGER_SCHEMA	2	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	USER_PRIVILEGES	GRANTEE	1	''	NO	varchar	385	1155	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(385)					NEVER	NULL
-def	information_schema	USER_PRIVILEGES	IS_GRANTABLE	4	''	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)					NEVER	NULL
-def	information_schema	USER_PRIVILEGES	PRIVILEGE_TYPE	3	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	USER_PRIVILEGES	TABLE_CATALOG	2	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
-def	information_schema	USER_STATISTICS	ACCESS_DENIED	22	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
-def	information_schema	USER_STATISTICS	BINLOG_BYTES_WRITTEN	9	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
-def	information_schema	USER_STATISTICS	BUSY_TIME	5	0	NO	double	NULL	NULL	21	NULL	NULL	NULL	NULL	double					NEVER	NULL
-def	information_schema	USER_STATISTICS	BYTES_RECEIVED	7	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
-def	information_schema	USER_STATISTICS	BYTES_SENT	8	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
-def	information_schema	USER_STATISTICS	COMMIT_TRANSACTIONS	18	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
-def	information_schema	USER_STATISTICS	CONCURRENT_CONNECTIONS	3	0	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)					NEVER	NULL
-def	information_schema	USER_STATISTICS	CONNECTED_TIME	4	0	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)					NEVER	NULL
-def	information_schema	USER_STATISTICS	CPU_TIME	6	0	NO	double	NULL	NULL	21	NULL	NULL	NULL	NULL	double					NEVER	NULL
-def	information_schema	USER_STATISTICS	DENIED_CONNECTIONS	20	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
-def	information_schema	USER_STATISTICS	EMPTY_QUERIES	23	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
-def	information_schema	USER_STATISTICS	LOST_CONNECTIONS	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
-def	information_schema	USER_STATISTICS	MAX_STATEMENT_TIME_EXCEEDED	25	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
-def	information_schema	USER_STATISTICS	OTHER_COMMANDS	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
-def	information_schema	USER_STATISTICS	ROLLBACK_TRANSACTIONS	19	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
-def	information_schema	USER_STATISTICS	ROWS_DELETED	12	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
-def	information_schema	USER_STATISTICS	ROWS_INSERTED	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
-def	information_schema	USER_STATISTICS	ROWS_READ	10	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
-def	information_schema	USER_STATISTICS	ROWS_SENT	11	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
-def	information_schema	USER_STATISTICS	ROWS_UPDATED	14	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
-def	information_schema	USER_STATISTICS	SELECT_COMMANDS	15	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
-def	information_schema	USER_STATISTICS	TOTAL_CONNECTIONS	2	0	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)					NEVER	NULL
-def	information_schema	USER_STATISTICS	TOTAL_SSL_CONNECTIONS	24	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
-def	information_schema	USER_STATISTICS	UPDATE_COMMANDS	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
-def	information_schema	USER_STATISTICS	USER	1	''	NO	varchar	128	384	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(128)					NEVER	NULL
-def	information_schema	VIEWS	ALGORITHM	11	''	NO	varchar	10	30	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(10)					NEVER	NULL
-def	information_schema	VIEWS	CHARACTER_SET_CLIENT	9	''	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)					NEVER	NULL
-def	information_schema	VIEWS	CHECK_OPTION	5	''	NO	varchar	8	24	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(8)					NEVER	NULL
-def	information_schema	VIEWS	COLLATION_CONNECTION	10	''	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)					NEVER	NULL
-def	information_schema	VIEWS	DEFINER	7	''	NO	varchar	384	1152	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(384)					NEVER	NULL
-def	information_schema	VIEWS	IS_UPDATABLE	6	''	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)					NEVER	NULL
-def	information_schema	VIEWS	SECURITY_TYPE	8	''	NO	varchar	7	21	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(7)					NEVER	NULL
-def	information_schema	VIEWS	TABLE_CATALOG	1	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
-def	information_schema	VIEWS	TABLE_NAME	3	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	VIEWS	TABLE_SCHEMA	2	''	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
-def	information_schema	VIEWS	VIEW_DEFINITION	4	''	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext					NEVER	NULL
+def	information_schema	TRIGGERS	DATABASE_COLLATION	22	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)					NEVER	NULL
+def	information_schema	TRIGGERS	DEFINER	19	NULL	NO	varchar	384	1152	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(384)					NEVER	NULL
+def	information_schema	TRIGGERS	EVENT_MANIPULATION	4	NULL	NO	varchar	6	18	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(6)					NEVER	NULL
+def	information_schema	TRIGGERS	EVENT_OBJECT_CATALOG	5	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
+def	information_schema	TRIGGERS	EVENT_OBJECT_SCHEMA	6	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	TRIGGERS	EVENT_OBJECT_TABLE	7	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	TRIGGERS	SQL_MODE	18	NULL	NO	varchar	8192	24576	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(8192)					NEVER	NULL
+def	information_schema	TRIGGERS	TRIGGER_CATALOG	1	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
+def	information_schema	TRIGGERS	TRIGGER_NAME	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	TRIGGERS	TRIGGER_SCHEMA	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	USER_PRIVILEGES	GRANTEE	1	NULL	NO	varchar	385	1155	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(385)					NEVER	NULL
+def	information_schema	USER_PRIVILEGES	IS_GRANTABLE	4	NULL	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)					NEVER	NULL
+def	information_schema	USER_PRIVILEGES	PRIVILEGE_TYPE	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	USER_PRIVILEGES	TABLE_CATALOG	2	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
+def	information_schema	USER_STATISTICS	ACCESS_DENIED	22	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
+def	information_schema	USER_STATISTICS	BINLOG_BYTES_WRITTEN	9	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
+def	information_schema	USER_STATISTICS	BUSY_TIME	5	NULL	NO	double	NULL	NULL	21	NULL	NULL	NULL	NULL	double					NEVER	NULL
+def	information_schema	USER_STATISTICS	BYTES_RECEIVED	7	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
+def	information_schema	USER_STATISTICS	BYTES_SENT	8	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
+def	information_schema	USER_STATISTICS	COMMIT_TRANSACTIONS	18	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
+def	information_schema	USER_STATISTICS	CONCURRENT_CONNECTIONS	3	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)					NEVER	NULL
+def	information_schema	USER_STATISTICS	CONNECTED_TIME	4	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)					NEVER	NULL
+def	information_schema	USER_STATISTICS	CPU_TIME	6	NULL	NO	double	NULL	NULL	21	NULL	NULL	NULL	NULL	double					NEVER	NULL
+def	information_schema	USER_STATISTICS	DENIED_CONNECTIONS	20	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
+def	information_schema	USER_STATISTICS	EMPTY_QUERIES	23	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
+def	information_schema	USER_STATISTICS	LOST_CONNECTIONS	21	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
+def	information_schema	USER_STATISTICS	MAX_STATEMENT_TIME_EXCEEDED	25	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
+def	information_schema	USER_STATISTICS	OTHER_COMMANDS	17	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
+def	information_schema	USER_STATISTICS	ROLLBACK_TRANSACTIONS	19	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
+def	information_schema	USER_STATISTICS	ROWS_DELETED	12	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
+def	information_schema	USER_STATISTICS	ROWS_INSERTED	13	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
+def	information_schema	USER_STATISTICS	ROWS_READ	10	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
+def	information_schema	USER_STATISTICS	ROWS_SENT	11	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
+def	information_schema	USER_STATISTICS	ROWS_UPDATED	14	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
+def	information_schema	USER_STATISTICS	SELECT_COMMANDS	15	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
+def	information_schema	USER_STATISTICS	TOTAL_CONNECTIONS	2	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)					NEVER	NULL
+def	information_schema	USER_STATISTICS	TOTAL_SSL_CONNECTIONS	24	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
+def	information_schema	USER_STATISTICS	UPDATE_COMMANDS	16	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
+def	information_schema	USER_STATISTICS	USER	1	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(128)					NEVER	NULL
+def	information_schema	VIEWS	ALGORITHM	11	NULL	NO	varchar	10	30	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(10)					NEVER	NULL
+def	information_schema	VIEWS	CHARACTER_SET_CLIENT	9	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)					NEVER	NULL
+def	information_schema	VIEWS	CHECK_OPTION	5	NULL	NO	varchar	8	24	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(8)					NEVER	NULL
+def	information_schema	VIEWS	COLLATION_CONNECTION	10	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(32)					NEVER	NULL
+def	information_schema	VIEWS	DEFINER	7	NULL	NO	varchar	384	1152	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(384)					NEVER	NULL
+def	information_schema	VIEWS	IS_UPDATABLE	6	NULL	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)					NEVER	NULL
+def	information_schema	VIEWS	SECURITY_TYPE	8	NULL	NO	varchar	7	21	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(7)					NEVER	NULL
+def	information_schema	VIEWS	TABLE_CATALOG	1	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)					NEVER	NULL
+def	information_schema	VIEWS	TABLE_NAME	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	VIEWS	TABLE_SCHEMA	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)					NEVER	NULL
+def	information_schema	VIEWS	VIEW_DEFINITION	4	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	longtext					NEVER	NULL
 ##########################################################################
 # Show the quotient of CHARACTER_OCTET_LENGTH and CHARACTER_MAXIMUM_LENGTH
 ##########################################################################
diff --git a/mysql-test/suite/funcs_1/r/is_engines.result b/mysql-test/suite/funcs_1/r/is_engines.result
index 96db819c429..09f163a3491 100644
--- a/mysql-test/suite/funcs_1/r/is_engines.result
+++ b/mysql-test/suite/funcs_1/r/is_engines.result
@@ -28,27 +28,27 @@ DROP FUNCTION test.f1;
 #########################################################################
 DESCRIBE          information_schema.ENGINES;
 Field	Type	Null	Key	Default	Extra
-ENGINE	varchar(64)	NO			
-SUPPORT	varchar(8)	NO			
-COMMENT	varchar(160)	NO			
+ENGINE	varchar(64)	NO		NULL	
+SUPPORT	varchar(8)	NO		NULL	
+COMMENT	varchar(160)	NO		NULL	
 TRANSACTIONS	varchar(3)	YES		NULL	
 XA	varchar(3)	YES		NULL	
 SAVEPOINTS	varchar(3)	YES		NULL	
 SHOW CREATE TABLE information_schema.ENGINES;
 Table	Create Table
 ENGINES	CREATE TEMPORARY TABLE `ENGINES` (
-  `ENGINE` varchar(64) NOT NULL DEFAULT '',
-  `SUPPORT` varchar(8) NOT NULL DEFAULT '',
-  `COMMENT` varchar(160) NOT NULL DEFAULT '',
-  `TRANSACTIONS` varchar(3) DEFAULT NULL,
-  `XA` varchar(3) DEFAULT NULL,
-  `SAVEPOINTS` varchar(3) DEFAULT NULL
+  `ENGINE` varchar(64) NOT NULL,
+  `SUPPORT` varchar(8) NOT NULL,
+  `COMMENT` varchar(160) NOT NULL,
+  `TRANSACTIONS` varchar(3),
+  `XA` varchar(3),
+  `SAVEPOINTS` varchar(3)
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
 SHOW COLUMNS FROM information_schema.ENGINES;
 Field	Type	Null	Key	Default	Extra
-ENGINE	varchar(64)	NO			
-SUPPORT	varchar(8)	NO			
-COMMENT	varchar(160)	NO			
+ENGINE	varchar(64)	NO		NULL	
+SUPPORT	varchar(8)	NO		NULL	
+COMMENT	varchar(160)	NO		NULL	
 TRANSACTIONS	varchar(3)	YES		NULL	
 XA	varchar(3)	YES		NULL	
 SAVEPOINTS	varchar(3)	YES		NULL	
diff --git a/mysql-test/suite/funcs_1/r/is_events.result b/mysql-test/suite/funcs_1/r/is_events.result
index 57b1943b6c2..adaa0dc6679 100644
--- a/mysql-test/suite/funcs_1/r/is_events.result
+++ b/mysql-test/suite/funcs_1/r/is_events.result
@@ -28,84 +28,84 @@ DROP FUNCTION test.f1;
 #########################################################################
 DESCRIBE          information_schema.EVENTS;
 Field	Type	Null	Key	Default	Extra
-EVENT_CATALOG	varchar(64)	NO			
-EVENT_SCHEMA	varchar(64)	NO			
-EVENT_NAME	varchar(64)	NO			
-DEFINER	varchar(384)	NO			
-TIME_ZONE	varchar(64)	NO			
-EVENT_BODY	varchar(8)	NO			
-EVENT_DEFINITION	longtext	NO			
-EVENT_TYPE	varchar(9)	NO			
+EVENT_CATALOG	varchar(64)	NO		NULL	
+EVENT_SCHEMA	varchar(64)	NO		NULL	
+EVENT_NAME	varchar(64)	NO		NULL	
+DEFINER	varchar(384)	NO		NULL	
+TIME_ZONE	varchar(64)	NO		NULL	
+EVENT_BODY	varchar(8)	NO		NULL	
+EVENT_DEFINITION	longtext	NO		NULL	
+EVENT_TYPE	varchar(9)	NO		NULL	
 EXECUTE_AT	datetime	YES		NULL	
 INTERVAL_VALUE	varchar(256)	YES		NULL	
 INTERVAL_FIELD	varchar(18)	YES		NULL	
-SQL_MODE	varchar(8192)	NO			
+SQL_MODE	varchar(8192)	NO		NULL	
 STARTS	datetime	YES		NULL	
 ENDS	datetime	YES		NULL	
-STATUS	varchar(18)	NO			
-ON_COMPLETION	varchar(12)	NO			
-CREATED	datetime	NO		0000-00-00 00:00:00	
-LAST_ALTERED	datetime	NO		0000-00-00 00:00:00	
+STATUS	varchar(18)	NO		NULL	
+ON_COMPLETION	varchar(12)	NO		NULL	
+CREATED	datetime	NO		NULL	
+LAST_ALTERED	datetime	NO		NULL	
 LAST_EXECUTED	datetime	YES		NULL	
-EVENT_COMMENT	varchar(64)	NO			
-ORIGINATOR	bigint(10)	NO		0	
-CHARACTER_SET_CLIENT	varchar(32)	NO			
-COLLATION_CONNECTION	varchar(32)	NO			
-DATABASE_COLLATION	varchar(32)	NO			
+EVENT_COMMENT	varchar(64)	NO		NULL	
+ORIGINATOR	bigint(10)	NO		NULL	
+CHARACTER_SET_CLIENT	varchar(32)	NO		NULL	
+COLLATION_CONNECTION	varchar(32)	NO		NULL	
+DATABASE_COLLATION	varchar(32)	NO		NULL	
 SHOW CREATE TABLE information_schema.EVENTS;
 Table	Create Table
 EVENTS	CREATE TEMPORARY TABLE `EVENTS` (
-  `EVENT_CATALOG` varchar(64) NOT NULL DEFAULT '',
-  `EVENT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `EVENT_NAME` varchar(64) NOT NULL DEFAULT '',
-  `DEFINER` varchar(384) NOT NULL DEFAULT '',
-  `TIME_ZONE` varchar(64) NOT NULL DEFAULT '',
-  `EVENT_BODY` varchar(8) NOT NULL DEFAULT '',
-  `EVENT_DEFINITION` longtext NOT NULL DEFAULT '',
-  `EVENT_TYPE` varchar(9) NOT NULL DEFAULT '',
-  `EXECUTE_AT` datetime DEFAULT NULL,
-  `INTERVAL_VALUE` varchar(256) DEFAULT NULL,
-  `INTERVAL_FIELD` varchar(18) DEFAULT NULL,
-  `SQL_MODE` varchar(8192) NOT NULL DEFAULT '',
-  `STARTS` datetime DEFAULT NULL,
-  `ENDS` datetime DEFAULT NULL,
-  `STATUS` varchar(18) NOT NULL DEFAULT '',
-  `ON_COMPLETION` varchar(12) NOT NULL DEFAULT '',
-  `CREATED` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `LAST_ALTERED` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `LAST_EXECUTED` datetime DEFAULT NULL,
-  `EVENT_COMMENT` varchar(64) NOT NULL DEFAULT '',
-  `ORIGINATOR` bigint(10) NOT NULL DEFAULT 0,
-  `CHARACTER_SET_CLIENT` varchar(32) NOT NULL DEFAULT '',
-  `COLLATION_CONNECTION` varchar(32) NOT NULL DEFAULT '',
-  `DATABASE_COLLATION` varchar(32) NOT NULL DEFAULT ''
+  `EVENT_CATALOG` varchar(64) NOT NULL,
+  `EVENT_SCHEMA` varchar(64) NOT NULL,
+  `EVENT_NAME` varchar(64) NOT NULL,
+  `DEFINER` varchar(384) NOT NULL,
+  `TIME_ZONE` varchar(64) NOT NULL,
+  `EVENT_BODY` varchar(8) NOT NULL,
+  `EVENT_DEFINITION` longtext NOT NULL,
+  `EVENT_TYPE` varchar(9) NOT NULL,
+  `EXECUTE_AT` datetime,
+  `INTERVAL_VALUE` varchar(256),
+  `INTERVAL_FIELD` varchar(18),
+  `SQL_MODE` varchar(8192) NOT NULL,
+  `STARTS` datetime,
+  `ENDS` datetime,
+  `STATUS` varchar(18) NOT NULL,
+  `ON_COMPLETION` varchar(12) NOT NULL,
+  `CREATED` datetime NOT NULL,
+  `LAST_ALTERED` datetime NOT NULL,
+  `LAST_EXECUTED` datetime,
+  `EVENT_COMMENT` varchar(64) NOT NULL,
+  `ORIGINATOR` bigint(10) NOT NULL,
+  `CHARACTER_SET_CLIENT` varchar(32) NOT NULL,
+  `COLLATION_CONNECTION` varchar(32) NOT NULL,
+  `DATABASE_COLLATION` varchar(32) NOT NULL
 )  DEFAULT CHARSET=utf8mb3
 SHOW COLUMNS FROM information_schema.EVENTS;
 Field	Type	Null	Key	Default	Extra
-EVENT_CATALOG	varchar(64)	NO			
-EVENT_SCHEMA	varchar(64)	NO			
-EVENT_NAME	varchar(64)	NO			
-DEFINER	varchar(384)	NO			
-TIME_ZONE	varchar(64)	NO			
-EVENT_BODY	varchar(8)	NO			
-EVENT_DEFINITION	longtext	NO			
-EVENT_TYPE	varchar(9)	NO			
+EVENT_CATALOG	varchar(64)	NO		NULL	
+EVENT_SCHEMA	varchar(64)	NO		NULL	
+EVENT_NAME	varchar(64)	NO		NULL	
+DEFINER	varchar(384)	NO		NULL	
+TIME_ZONE	varchar(64)	NO		NULL	
+EVENT_BODY	varchar(8)	NO		NULL	
+EVENT_DEFINITION	longtext	NO		NULL	
+EVENT_TYPE	varchar(9)	NO		NULL	
 EXECUTE_AT	datetime	YES		NULL	
 INTERVAL_VALUE	varchar(256)	YES		NULL	
 INTERVAL_FIELD	varchar(18)	YES		NULL	
-SQL_MODE	varchar(8192)	NO			
+SQL_MODE	varchar(8192)	NO		NULL	
 STARTS	datetime	YES		NULL	
 ENDS	datetime	YES		NULL	
-STATUS	varchar(18)	NO			
-ON_COMPLETION	varchar(12)	NO			
-CREATED	datetime	NO		0000-00-00 00:00:00	
-LAST_ALTERED	datetime	NO		0000-00-00 00:00:00	
+STATUS	varchar(18)	NO		NULL	
+ON_COMPLETION	varchar(12)	NO		NULL	
+CREATED	datetime	NO		NULL	
+LAST_ALTERED	datetime	NO		NULL	
 LAST_EXECUTED	datetime	YES		NULL	
-EVENT_COMMENT	varchar(64)	NO			
-ORIGINATOR	bigint(10)	NO		0	
-CHARACTER_SET_CLIENT	varchar(32)	NO			
-COLLATION_CONNECTION	varchar(32)	NO			
-DATABASE_COLLATION	varchar(32)	NO			
+EVENT_COMMENT	varchar(64)	NO		NULL	
+ORIGINATOR	bigint(10)	NO		NULL	
+CHARACTER_SET_CLIENT	varchar(32)	NO		NULL	
+COLLATION_CONNECTION	varchar(32)	NO		NULL	
+DATABASE_COLLATION	varchar(32)	NO		NULL	
 SELECT event_catalog, event_name, event_body, event_type, event_type,
 status, on_completion
 FROM information_schema.events
diff --git a/mysql-test/suite/funcs_1/r/is_key_column_usage.result b/mysql-test/suite/funcs_1/r/is_key_column_usage.result
index 3add9ee9c63..7edebe8a8cb 100644
--- a/mysql-test/suite/funcs_1/r/is_key_column_usage.result
+++ b/mysql-test/suite/funcs_1/r/is_key_column_usage.result
@@ -28,14 +28,14 @@ DROP FUNCTION test.f1;
 #########################################################################
 DESCRIBE          information_schema.KEY_COLUMN_USAGE;
 Field	Type	Null	Key	Default	Extra
-CONSTRAINT_CATALOG	varchar(512)	NO			
-CONSTRAINT_SCHEMA	varchar(64)	NO			
-CONSTRAINT_NAME	varchar(64)	NO			
-TABLE_CATALOG	varchar(512)	NO			
-TABLE_SCHEMA	varchar(64)	NO			
-TABLE_NAME	varchar(64)	NO			
-COLUMN_NAME	varchar(64)	NO			
-ORDINAL_POSITION	bigint(10)	NO		0	
+CONSTRAINT_CATALOG	varchar(512)	NO		NULL	
+CONSTRAINT_SCHEMA	varchar(64)	NO		NULL	
+CONSTRAINT_NAME	varchar(64)	NO		NULL	
+TABLE_CATALOG	varchar(512)	NO		NULL	
+TABLE_SCHEMA	varchar(64)	NO		NULL	
+TABLE_NAME	varchar(64)	NO		NULL	
+COLUMN_NAME	varchar(64)	NO		NULL	
+ORDINAL_POSITION	bigint(10)	NO		NULL	
 POSITION_IN_UNIQUE_CONSTRAINT	bigint(10)	YES		NULL	
 REFERENCED_TABLE_SCHEMA	varchar(64)	YES		NULL	
 REFERENCED_TABLE_NAME	varchar(64)	YES		NULL	
@@ -43,29 +43,29 @@ REFERENCED_COLUMN_NAME	varchar(64)	YES		NULL
 SHOW CREATE TABLE information_schema.KEY_COLUMN_USAGE;
 Table	Create Table
 KEY_COLUMN_USAGE	CREATE TEMPORARY TABLE `KEY_COLUMN_USAGE` (
-  `CONSTRAINT_CATALOG` varchar(512) NOT NULL DEFAULT '',
-  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `CONSTRAINT_NAME` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_CATALOG` varchar(512) NOT NULL DEFAULT '',
-  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `COLUMN_NAME` varchar(64) NOT NULL DEFAULT '',
-  `ORDINAL_POSITION` bigint(10) NOT NULL DEFAULT 0,
-  `POSITION_IN_UNIQUE_CONSTRAINT` bigint(10) DEFAULT NULL,
-  `REFERENCED_TABLE_SCHEMA` varchar(64) DEFAULT NULL,
-  `REFERENCED_TABLE_NAME` varchar(64) DEFAULT NULL,
-  `REFERENCED_COLUMN_NAME` varchar(64) DEFAULT NULL
+  `CONSTRAINT_CATALOG` varchar(512) NOT NULL,
+  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL,
+  `CONSTRAINT_NAME` varchar(64) NOT NULL,
+  `TABLE_CATALOG` varchar(512) NOT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL,
+  `TABLE_NAME` varchar(64) NOT NULL,
+  `COLUMN_NAME` varchar(64) NOT NULL,
+  `ORDINAL_POSITION` bigint(10) NOT NULL,
+  `POSITION_IN_UNIQUE_CONSTRAINT` bigint(10),
+  `REFERENCED_TABLE_SCHEMA` varchar(64),
+  `REFERENCED_TABLE_NAME` varchar(64),
+  `REFERENCED_COLUMN_NAME` varchar(64)
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
 SHOW COLUMNS FROM information_schema.KEY_COLUMN_USAGE;
 Field	Type	Null	Key	Default	Extra
-CONSTRAINT_CATALOG	varchar(512)	NO			
-CONSTRAINT_SCHEMA	varchar(64)	NO			
-CONSTRAINT_NAME	varchar(64)	NO			
-TABLE_CATALOG	varchar(512)	NO			
-TABLE_SCHEMA	varchar(64)	NO			
-TABLE_NAME	varchar(64)	NO			
-COLUMN_NAME	varchar(64)	NO			
-ORDINAL_POSITION	bigint(10)	NO		0	
+CONSTRAINT_CATALOG	varchar(512)	NO		NULL	
+CONSTRAINT_SCHEMA	varchar(64)	NO		NULL	
+CONSTRAINT_NAME	varchar(64)	NO		NULL	
+TABLE_CATALOG	varchar(512)	NO		NULL	
+TABLE_SCHEMA	varchar(64)	NO		NULL	
+TABLE_NAME	varchar(64)	NO		NULL	
+COLUMN_NAME	varchar(64)	NO		NULL	
+ORDINAL_POSITION	bigint(10)	NO		NULL	
 POSITION_IN_UNIQUE_CONSTRAINT	bigint(10)	YES		NULL	
 REFERENCED_TABLE_SCHEMA	varchar(64)	YES		NULL	
 REFERENCED_TABLE_NAME	varchar(64)	YES		NULL	
diff --git a/mysql-test/suite/funcs_1/r/is_key_column_usage_embedded.result b/mysql-test/suite/funcs_1/r/is_key_column_usage_embedded.result
index e52eac4c45b..59b1212407f 100644
--- a/mysql-test/suite/funcs_1/r/is_key_column_usage_embedded.result
+++ b/mysql-test/suite/funcs_1/r/is_key_column_usage_embedded.result
@@ -28,14 +28,14 @@ DROP FUNCTION test.f1;
 #########################################################################
 DESCRIBE          information_schema.KEY_COLUMN_USAGE;
 Field	Type	Null	Key	Default	Extra
-CONSTRAINT_CATALOG	varchar(512)	NO			
-CONSTRAINT_SCHEMA	varchar(64)	NO			
-CONSTRAINT_NAME	varchar(64)	NO			
-TABLE_CATALOG	varchar(512)	NO			
-TABLE_SCHEMA	varchar(64)	NO			
-TABLE_NAME	varchar(64)	NO			
-COLUMN_NAME	varchar(64)	NO			
-ORDINAL_POSITION	bigint(10)	NO		0	
+CONSTRAINT_CATALOG	varchar(512)	NO		NULL	
+CONSTRAINT_SCHEMA	varchar(64)	NO		NULL	
+CONSTRAINT_NAME	varchar(64)	NO		NULL	
+TABLE_CATALOG	varchar(512)	NO		NULL	
+TABLE_SCHEMA	varchar(64)	NO		NULL	
+TABLE_NAME	varchar(64)	NO		NULL	
+COLUMN_NAME	varchar(64)	NO		NULL	
+ORDINAL_POSITION	bigint(10)	NO		NULL	
 POSITION_IN_UNIQUE_CONSTRAINT	bigint(10)	YES		NULL	
 REFERENCED_TABLE_SCHEMA	varchar(64)	YES		NULL	
 REFERENCED_TABLE_NAME	varchar(64)	YES		NULL	
@@ -43,29 +43,29 @@ REFERENCED_COLUMN_NAME	varchar(64)	YES		NULL
 SHOW CREATE TABLE information_schema.KEY_COLUMN_USAGE;
 Table	Create Table
 KEY_COLUMN_USAGE	CREATE TEMPORARY TABLE `KEY_COLUMN_USAGE` (
-  `CONSTRAINT_CATALOG` varchar(512) NOT NULL DEFAULT '',
-  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `CONSTRAINT_NAME` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_CATALOG` varchar(512) NOT NULL DEFAULT '',
-  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `COLUMN_NAME` varchar(64) NOT NULL DEFAULT '',
-  `ORDINAL_POSITION` bigint(10) NOT NULL DEFAULT 0,
-  `POSITION_IN_UNIQUE_CONSTRAINT` bigint(10) DEFAULT NULL,
-  `REFERENCED_TABLE_SCHEMA` varchar(64) DEFAULT NULL,
-  `REFERENCED_TABLE_NAME` varchar(64) DEFAULT NULL,
-  `REFERENCED_COLUMN_NAME` varchar(64) DEFAULT NULL
+  `CONSTRAINT_CATALOG` varchar(512) NOT NULL,
+  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL,
+  `CONSTRAINT_NAME` varchar(64) NOT NULL,
+  `TABLE_CATALOG` varchar(512) NOT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL,
+  `TABLE_NAME` varchar(64) NOT NULL,
+  `COLUMN_NAME` varchar(64) NOT NULL,
+  `ORDINAL_POSITION` bigint(10) NOT NULL,
+  `POSITION_IN_UNIQUE_CONSTRAINT` bigint(10),
+  `REFERENCED_TABLE_SCHEMA` varchar(64),
+  `REFERENCED_TABLE_NAME` varchar(64),
+  `REFERENCED_COLUMN_NAME` varchar(64)
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
 SHOW COLUMNS FROM information_schema.KEY_COLUMN_USAGE;
 Field	Type	Null	Key	Default	Extra
-CONSTRAINT_CATALOG	varchar(512)	NO			
-CONSTRAINT_SCHEMA	varchar(64)	NO			
-CONSTRAINT_NAME	varchar(64)	NO			
-TABLE_CATALOG	varchar(512)	NO			
-TABLE_SCHEMA	varchar(64)	NO			
-TABLE_NAME	varchar(64)	NO			
-COLUMN_NAME	varchar(64)	NO			
-ORDINAL_POSITION	bigint(10)	NO		0	
+CONSTRAINT_CATALOG	varchar(512)	NO		NULL	
+CONSTRAINT_SCHEMA	varchar(64)	NO		NULL	
+CONSTRAINT_NAME	varchar(64)	NO		NULL	
+TABLE_CATALOG	varchar(512)	NO		NULL	
+TABLE_SCHEMA	varchar(64)	NO		NULL	
+TABLE_NAME	varchar(64)	NO		NULL	
+COLUMN_NAME	varchar(64)	NO		NULL	
+ORDINAL_POSITION	bigint(10)	NO		NULL	
 POSITION_IN_UNIQUE_CONSTRAINT	bigint(10)	YES		NULL	
 REFERENCED_TABLE_SCHEMA	varchar(64)	YES		NULL	
 REFERENCED_TABLE_NAME	varchar(64)	YES		NULL	
diff --git a/mysql-test/suite/funcs_1/r/is_routines.result b/mysql-test/suite/funcs_1/r/is_routines.result
index dab8c783b31..ba43686ac7e 100644
--- a/mysql-test/suite/funcs_1/r/is_routines.result
+++ b/mysql-test/suite/funcs_1/r/is_routines.result
@@ -29,12 +29,12 @@ DROP FUNCTION test.f1;
 #########################################################################
 DESCRIBE          information_schema.ROUTINES;
 Field	Type	Null	Key	Default	Extra
-SPECIFIC_NAME	varchar(64)	NO			
-ROUTINE_CATALOG	varchar(512)	NO			
-ROUTINE_SCHEMA	varchar(64)	NO			
-ROUTINE_NAME	varchar(64)	NO			
-ROUTINE_TYPE	varchar(13)	NO			
-DATA_TYPE	varchar(64)	NO			
+SPECIFIC_NAME	varchar(64)	NO		NULL	
+ROUTINE_CATALOG	varchar(512)	NO		NULL	
+ROUTINE_SCHEMA	varchar(64)	NO		NULL	
+ROUTINE_NAME	varchar(64)	NO		NULL	
+ROUTINE_TYPE	varchar(13)	NO		NULL	
+DATA_TYPE	varchar(64)	NO		NULL	
 CHARACTER_MAXIMUM_LENGTH	int(21)	YES		NULL	
 CHARACTER_OCTET_LENGTH	int(21)	YES		NULL	
 NUMERIC_PRECISION	int(21)	YES		NULL	
@@ -43,66 +43,66 @@ DATETIME_PRECISION	bigint(21) unsigned	YES		NULL
 CHARACTER_SET_NAME	varchar(64)	YES		NULL	
 COLLATION_NAME	varchar(64)	YES		NULL	
 DTD_IDENTIFIER	longtext	YES		NULL	
-ROUTINE_BODY	varchar(8)	NO			
+ROUTINE_BODY	varchar(8)	NO		NULL	
 ROUTINE_DEFINITION	longtext	YES		NULL	
 EXTERNAL_NAME	varchar(64)	YES		NULL	
 EXTERNAL_LANGUAGE	varchar(64)	YES		NULL	
-PARAMETER_STYLE	varchar(8)	NO			
-IS_DETERMINISTIC	varchar(3)	NO			
-SQL_DATA_ACCESS	varchar(64)	NO			
+PARAMETER_STYLE	varchar(8)	NO		NULL	
+IS_DETERMINISTIC	varchar(3)	NO		NULL	
+SQL_DATA_ACCESS	varchar(64)	NO		NULL	
 SQL_PATH	varchar(64)	YES		NULL	
-SECURITY_TYPE	varchar(7)	NO			
-CREATED	datetime	NO		0000-00-00 00:00:00	
-LAST_ALTERED	datetime	NO		0000-00-00 00:00:00	
-SQL_MODE	varchar(8192)	NO			
-ROUTINE_COMMENT	longtext	NO			
-DEFINER	varchar(384)	NO			
-CHARACTER_SET_CLIENT	varchar(32)	NO			
-COLLATION_CONNECTION	varchar(32)	NO			
-DATABASE_COLLATION	varchar(32)	NO			
+SECURITY_TYPE	varchar(7)	NO		NULL	
+CREATED	datetime	NO		NULL	
+LAST_ALTERED	datetime	NO		NULL	
+SQL_MODE	varchar(8192)	NO		NULL	
+ROUTINE_COMMENT	longtext	NO		NULL	
+DEFINER	varchar(384)	NO		NULL	
+CHARACTER_SET_CLIENT	varchar(32)	NO		NULL	
+COLLATION_CONNECTION	varchar(32)	NO		NULL	
+DATABASE_COLLATION	varchar(32)	NO		NULL	
 SHOW CREATE TABLE information_schema.ROUTINES;
 Table	Create Table
 ROUTINES	CREATE TEMPORARY TABLE `ROUTINES` (
-  `SPECIFIC_NAME` varchar(64) NOT NULL DEFAULT '',
-  `ROUTINE_CATALOG` varchar(512) NOT NULL DEFAULT '',
-  `ROUTINE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `ROUTINE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `ROUTINE_TYPE` varchar(13) NOT NULL DEFAULT '',
-  `DATA_TYPE` varchar(64) NOT NULL DEFAULT '',
-  `CHARACTER_MAXIMUM_LENGTH` int(21) DEFAULT NULL,
-  `CHARACTER_OCTET_LENGTH` int(21) DEFAULT NULL,
-  `NUMERIC_PRECISION` int(21) DEFAULT NULL,
-  `NUMERIC_SCALE` int(21) DEFAULT NULL,
-  `DATETIME_PRECISION` bigint(21) unsigned DEFAULT NULL,
-  `CHARACTER_SET_NAME` varchar(64) DEFAULT NULL,
-  `COLLATION_NAME` varchar(64) DEFAULT NULL,
-  `DTD_IDENTIFIER` longtext DEFAULT NULL,
-  `ROUTINE_BODY` varchar(8) NOT NULL DEFAULT '',
-  `ROUTINE_DEFINITION` longtext DEFAULT NULL,
-  `EXTERNAL_NAME` varchar(64) DEFAULT NULL,
-  `EXTERNAL_LANGUAGE` varchar(64) DEFAULT NULL,
-  `PARAMETER_STYLE` varchar(8) NOT NULL DEFAULT '',
-  `IS_DETERMINISTIC` varchar(3) NOT NULL DEFAULT '',
-  `SQL_DATA_ACCESS` varchar(64) NOT NULL DEFAULT '',
-  `SQL_PATH` varchar(64) DEFAULT NULL,
-  `SECURITY_TYPE` varchar(7) NOT NULL DEFAULT '',
-  `CREATED` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `LAST_ALTERED` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `SQL_MODE` varchar(8192) NOT NULL DEFAULT '',
-  `ROUTINE_COMMENT` longtext NOT NULL DEFAULT '',
-  `DEFINER` varchar(384) NOT NULL DEFAULT '',
-  `CHARACTER_SET_CLIENT` varchar(32) NOT NULL DEFAULT '',
-  `COLLATION_CONNECTION` varchar(32) NOT NULL DEFAULT '',
-  `DATABASE_COLLATION` varchar(32) NOT NULL DEFAULT ''
+  `SPECIFIC_NAME` varchar(64) NOT NULL,
+  `ROUTINE_CATALOG` varchar(512) NOT NULL,
+  `ROUTINE_SCHEMA` varchar(64) NOT NULL,
+  `ROUTINE_NAME` varchar(64) NOT NULL,
+  `ROUTINE_TYPE` varchar(13) NOT NULL,
+  `DATA_TYPE` varchar(64) NOT NULL,
+  `CHARACTER_MAXIMUM_LENGTH` int(21),
+  `CHARACTER_OCTET_LENGTH` int(21),
+  `NUMERIC_PRECISION` int(21),
+  `NUMERIC_SCALE` int(21),
+  `DATETIME_PRECISION` bigint(21) unsigned,
+  `CHARACTER_SET_NAME` varchar(64),
+  `COLLATION_NAME` varchar(64),
+  `DTD_IDENTIFIER` longtext,
+  `ROUTINE_BODY` varchar(8) NOT NULL,
+  `ROUTINE_DEFINITION` longtext,
+  `EXTERNAL_NAME` varchar(64),
+  `EXTERNAL_LANGUAGE` varchar(64),
+  `PARAMETER_STYLE` varchar(8) NOT NULL,
+  `IS_DETERMINISTIC` varchar(3) NOT NULL,
+  `SQL_DATA_ACCESS` varchar(64) NOT NULL,
+  `SQL_PATH` varchar(64),
+  `SECURITY_TYPE` varchar(7) NOT NULL,
+  `CREATED` datetime NOT NULL,
+  `LAST_ALTERED` datetime NOT NULL,
+  `SQL_MODE` varchar(8192) NOT NULL,
+  `ROUTINE_COMMENT` longtext NOT NULL,
+  `DEFINER` varchar(384) NOT NULL,
+  `CHARACTER_SET_CLIENT` varchar(32) NOT NULL,
+  `COLLATION_CONNECTION` varchar(32) NOT NULL,
+  `DATABASE_COLLATION` varchar(32) NOT NULL
 )  DEFAULT CHARSET=utf8mb3
 SHOW COLUMNS FROM information_schema.ROUTINES;
 Field	Type	Null	Key	Default	Extra
-SPECIFIC_NAME	varchar(64)	NO			
-ROUTINE_CATALOG	varchar(512)	NO			
-ROUTINE_SCHEMA	varchar(64)	NO			
-ROUTINE_NAME	varchar(64)	NO			
-ROUTINE_TYPE	varchar(13)	NO			
-DATA_TYPE	varchar(64)	NO			
+SPECIFIC_NAME	varchar(64)	NO		NULL	
+ROUTINE_CATALOG	varchar(512)	NO		NULL	
+ROUTINE_SCHEMA	varchar(64)	NO		NULL	
+ROUTINE_NAME	varchar(64)	NO		NULL	
+ROUTINE_TYPE	varchar(13)	NO		NULL	
+DATA_TYPE	varchar(64)	NO		NULL	
 CHARACTER_MAXIMUM_LENGTH	int(21)	YES		NULL	
 CHARACTER_OCTET_LENGTH	int(21)	YES		NULL	
 NUMERIC_PRECISION	int(21)	YES		NULL	
@@ -111,23 +111,23 @@ DATETIME_PRECISION	bigint(21) unsigned	YES		NULL
 CHARACTER_SET_NAME	varchar(64)	YES		NULL	
 COLLATION_NAME	varchar(64)	YES		NULL	
 DTD_IDENTIFIER	longtext	YES		NULL	
-ROUTINE_BODY	varchar(8)	NO			
+ROUTINE_BODY	varchar(8)	NO		NULL	
 ROUTINE_DEFINITION	longtext	YES		NULL	
 EXTERNAL_NAME	varchar(64)	YES		NULL	
 EXTERNAL_LANGUAGE	varchar(64)	YES		NULL	
-PARAMETER_STYLE	varchar(8)	NO			
-IS_DETERMINISTIC	varchar(3)	NO			
-SQL_DATA_ACCESS	varchar(64)	NO			
+PARAMETER_STYLE	varchar(8)	NO		NULL	
+IS_DETERMINISTIC	varchar(3)	NO		NULL	
+SQL_DATA_ACCESS	varchar(64)	NO		NULL	
 SQL_PATH	varchar(64)	YES		NULL	
-SECURITY_TYPE	varchar(7)	NO			
-CREATED	datetime	NO		0000-00-00 00:00:00	
-LAST_ALTERED	datetime	NO		0000-00-00 00:00:00	
-SQL_MODE	varchar(8192)	NO			
-ROUTINE_COMMENT	longtext	NO			
-DEFINER	varchar(384)	NO			
-CHARACTER_SET_CLIENT	varchar(32)	NO			
-COLLATION_CONNECTION	varchar(32)	NO			
-DATABASE_COLLATION	varchar(32)	NO			
+SECURITY_TYPE	varchar(7)	NO		NULL	
+CREATED	datetime	NO		NULL	
+LAST_ALTERED	datetime	NO		NULL	
+SQL_MODE	varchar(8192)	NO		NULL	
+ROUTINE_COMMENT	longtext	NO		NULL	
+DEFINER	varchar(384)	NO		NULL	
+CHARACTER_SET_CLIENT	varchar(32)	NO		NULL	
+COLLATION_CONNECTION	varchar(32)	NO		NULL	
+DATABASE_COLLATION	varchar(32)	NO		NULL	
 USE test;
 DROP PROCEDURE IF EXISTS sp_for_routines;
 DROP FUNCTION  IF EXISTS function_for_routines;
diff --git a/mysql-test/suite/funcs_1/r/is_routines_embedded.result b/mysql-test/suite/funcs_1/r/is_routines_embedded.result
index 95b10d13bd0..19e9494386e 100644
--- a/mysql-test/suite/funcs_1/r/is_routines_embedded.result
+++ b/mysql-test/suite/funcs_1/r/is_routines_embedded.result
@@ -29,12 +29,12 @@ DROP FUNCTION test.f1;
 #########################################################################
 DESCRIBE          information_schema.ROUTINES;
 Field	Type	Null	Key	Default	Extra
-SPECIFIC_NAME	varchar(64)	NO			
-ROUTINE_CATALOG	varchar(512)	NO			
-ROUTINE_SCHEMA	varchar(64)	NO			
-ROUTINE_NAME	varchar(64)	NO			
-ROUTINE_TYPE	varchar(13)	NO			
-DATA_TYPE	varchar(64)	NO			
+SPECIFIC_NAME	varchar(64)	NO		NULL	
+ROUTINE_CATALOG	varchar(512)	NO		NULL	
+ROUTINE_SCHEMA	varchar(64)	NO		NULL	
+ROUTINE_NAME	varchar(64)	NO		NULL	
+ROUTINE_TYPE	varchar(13)	NO		NULL	
+DATA_TYPE	varchar(64)	NO		NULL	
 CHARACTER_MAXIMUM_LENGTH	int(21)	YES		NULL	
 CHARACTER_OCTET_LENGTH	int(21)	YES		NULL	
 NUMERIC_PRECISION	int(21)	YES		NULL	
@@ -43,66 +43,66 @@ DATETIME_PRECISION	bigint(21) unsigned	YES		NULL
 CHARACTER_SET_NAME	varchar(64)	YES		NULL	
 COLLATION_NAME	varchar(64)	YES		NULL	
 DTD_IDENTIFIER	longtext	YES		NULL	
-ROUTINE_BODY	varchar(8)	NO			
+ROUTINE_BODY	varchar(8)	NO		NULL	
 ROUTINE_DEFINITION	longtext	YES		NULL	
 EXTERNAL_NAME	varchar(64)	YES		NULL	
 EXTERNAL_LANGUAGE	varchar(64)	YES		NULL	
-PARAMETER_STYLE	varchar(8)	NO			
-IS_DETERMINISTIC	varchar(3)	NO			
-SQL_DATA_ACCESS	varchar(64)	NO			
+PARAMETER_STYLE	varchar(8)	NO		NULL	
+IS_DETERMINISTIC	varchar(3)	NO		NULL	
+SQL_DATA_ACCESS	varchar(64)	NO		NULL	
 SQL_PATH	varchar(64)	YES		NULL	
-SECURITY_TYPE	varchar(7)	NO			
-CREATED	datetime	NO		0000-00-00 00:00:00	
-LAST_ALTERED	datetime	NO		0000-00-00 00:00:00	
-SQL_MODE	varchar(8192)	NO			
-ROUTINE_COMMENT	longtext	NO			
-DEFINER	varchar(384)	NO			
-CHARACTER_SET_CLIENT	varchar(32)	NO			
-COLLATION_CONNECTION	varchar(32)	NO			
-DATABASE_COLLATION	varchar(32)	NO			
+SECURITY_TYPE	varchar(7)	NO		NULL	
+CREATED	datetime	NO		NULL	
+LAST_ALTERED	datetime	NO		NULL	
+SQL_MODE	varchar(8192)	NO		NULL	
+ROUTINE_COMMENT	longtext	NO		NULL	
+DEFINER	varchar(384)	NO		NULL	
+CHARACTER_SET_CLIENT	varchar(32)	NO		NULL	
+COLLATION_CONNECTION	varchar(32)	NO		NULL	
+DATABASE_COLLATION	varchar(32)	NO		NULL	
 SHOW CREATE TABLE information_schema.ROUTINES;
 Table	Create Table
 ROUTINES	CREATE TEMPORARY TABLE `ROUTINES` (
-  `SPECIFIC_NAME` varchar(64) NOT NULL DEFAULT '',
-  `ROUTINE_CATALOG` varchar(512) NOT NULL DEFAULT '',
-  `ROUTINE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `ROUTINE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `ROUTINE_TYPE` varchar(13) NOT NULL DEFAULT '',
-  `DATA_TYPE` varchar(64) NOT NULL DEFAULT '',
-  `CHARACTER_MAXIMUM_LENGTH` int(21) DEFAULT NULL,
-  `CHARACTER_OCTET_LENGTH` int(21) DEFAULT NULL,
-  `NUMERIC_PRECISION` int(21) DEFAULT NULL,
-  `NUMERIC_SCALE` int(21) DEFAULT NULL,
-  `DATETIME_PRECISION` bigint(21) unsigned DEFAULT NULL,
-  `CHARACTER_SET_NAME` varchar(64) DEFAULT NULL,
-  `COLLATION_NAME` varchar(64) DEFAULT NULL,
-  `DTD_IDENTIFIER` longtext DEFAULT NULL,
-  `ROUTINE_BODY` varchar(8) NOT NULL DEFAULT '',
-  `ROUTINE_DEFINITION` longtext DEFAULT NULL,
-  `EXTERNAL_NAME` varchar(64) DEFAULT NULL,
-  `EXTERNAL_LANGUAGE` varchar(64) DEFAULT NULL,
-  `PARAMETER_STYLE` varchar(8) NOT NULL DEFAULT '',
-  `IS_DETERMINISTIC` varchar(3) NOT NULL DEFAULT '',
-  `SQL_DATA_ACCESS` varchar(64) NOT NULL DEFAULT '',
-  `SQL_PATH` varchar(64) DEFAULT NULL,
-  `SECURITY_TYPE` varchar(7) NOT NULL DEFAULT '',
-  `CREATED` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `LAST_ALTERED` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `SQL_MODE` varchar(8192) NOT NULL DEFAULT '',
-  `ROUTINE_COMMENT` longtext NOT NULL DEFAULT '',
-  `DEFINER` varchar(384) NOT NULL DEFAULT '',
-  `CHARACTER_SET_CLIENT` varchar(32) NOT NULL DEFAULT '',
-  `COLLATION_CONNECTION` varchar(32) NOT NULL DEFAULT '',
-  `DATABASE_COLLATION` varchar(32) NOT NULL DEFAULT ''
+  `SPECIFIC_NAME` varchar(64) NOT NULL,
+  `ROUTINE_CATALOG` varchar(512) NOT NULL,
+  `ROUTINE_SCHEMA` varchar(64) NOT NULL,
+  `ROUTINE_NAME` varchar(64) NOT NULL,
+  `ROUTINE_TYPE` varchar(13) NOT NULL,
+  `DATA_TYPE` varchar(64) NOT NULL,
+  `CHARACTER_MAXIMUM_LENGTH` int(21),
+  `CHARACTER_OCTET_LENGTH` int(21),
+  `NUMERIC_PRECISION` int(21),
+  `NUMERIC_SCALE` int(21),
+  `DATETIME_PRECISION` bigint(21) unsigned,
+  `CHARACTER_SET_NAME` varchar(64),
+  `COLLATION_NAME` varchar(64),
+  `DTD_IDENTIFIER` longtext,
+  `ROUTINE_BODY` varchar(8) NOT NULL,
+  `ROUTINE_DEFINITION` longtext,
+  `EXTERNAL_NAME` varchar(64),
+  `EXTERNAL_LANGUAGE` varchar(64),
+  `PARAMETER_STYLE` varchar(8) NOT NULL,
+  `IS_DETERMINISTIC` varchar(3) NOT NULL,
+  `SQL_DATA_ACCESS` varchar(64) NOT NULL,
+  `SQL_PATH` varchar(64),
+  `SECURITY_TYPE` varchar(7) NOT NULL,
+  `CREATED` datetime NOT NULL,
+  `LAST_ALTERED` datetime NOT NULL,
+  `SQL_MODE` varchar(8192) NOT NULL,
+  `ROUTINE_COMMENT` longtext NOT NULL,
+  `DEFINER` varchar(384) NOT NULL,
+  `CHARACTER_SET_CLIENT` varchar(32) NOT NULL,
+  `COLLATION_CONNECTION` varchar(32) NOT NULL,
+  `DATABASE_COLLATION` varchar(32) NOT NULL
 )  DEFAULT CHARSET=utf8mb3
 SHOW COLUMNS FROM information_schema.ROUTINES;
 Field	Type	Null	Key	Default	Extra
-SPECIFIC_NAME	varchar(64)	NO			
-ROUTINE_CATALOG	varchar(512)	NO			
-ROUTINE_SCHEMA	varchar(64)	NO			
-ROUTINE_NAME	varchar(64)	NO			
-ROUTINE_TYPE	varchar(13)	NO			
-DATA_TYPE	varchar(64)	NO			
+SPECIFIC_NAME	varchar(64)	NO		NULL	
+ROUTINE_CATALOG	varchar(512)	NO		NULL	
+ROUTINE_SCHEMA	varchar(64)	NO		NULL	
+ROUTINE_NAME	varchar(64)	NO		NULL	
+ROUTINE_TYPE	varchar(13)	NO		NULL	
+DATA_TYPE	varchar(64)	NO		NULL	
 CHARACTER_MAXIMUM_LENGTH	int(21)	YES		NULL	
 CHARACTER_OCTET_LENGTH	int(21)	YES		NULL	
 NUMERIC_PRECISION	int(21)	YES		NULL	
@@ -111,23 +111,23 @@ DATETIME_PRECISION	bigint(21) unsigned	YES		NULL
 CHARACTER_SET_NAME	varchar(64)	YES		NULL	
 COLLATION_NAME	varchar(64)	YES		NULL	
 DTD_IDENTIFIER	longtext	YES		NULL	
-ROUTINE_BODY	varchar(8)	NO			
+ROUTINE_BODY	varchar(8)	NO		NULL	
 ROUTINE_DEFINITION	longtext	YES		NULL	
 EXTERNAL_NAME	varchar(64)	YES		NULL	
 EXTERNAL_LANGUAGE	varchar(64)	YES		NULL	
-PARAMETER_STYLE	varchar(8)	NO			
-IS_DETERMINISTIC	varchar(3)	NO			
-SQL_DATA_ACCESS	varchar(64)	NO			
+PARAMETER_STYLE	varchar(8)	NO		NULL	
+IS_DETERMINISTIC	varchar(3)	NO		NULL	
+SQL_DATA_ACCESS	varchar(64)	NO		NULL	
 SQL_PATH	varchar(64)	YES		NULL	
-SECURITY_TYPE	varchar(7)	NO			
-CREATED	datetime	NO		0000-00-00 00:00:00	
-LAST_ALTERED	datetime	NO		0000-00-00 00:00:00	
-SQL_MODE	varchar(8192)	NO			
-ROUTINE_COMMENT	longtext	NO			
-DEFINER	varchar(384)	NO			
-CHARACTER_SET_CLIENT	varchar(32)	NO			
-COLLATION_CONNECTION	varchar(32)	NO			
-DATABASE_COLLATION	varchar(32)	NO			
+SECURITY_TYPE	varchar(7)	NO		NULL	
+CREATED	datetime	NO		NULL	
+LAST_ALTERED	datetime	NO		NULL	
+SQL_MODE	varchar(8192)	NO		NULL	
+ROUTINE_COMMENT	longtext	NO		NULL	
+DEFINER	varchar(384)	NO		NULL	
+CHARACTER_SET_CLIENT	varchar(32)	NO		NULL	
+COLLATION_CONNECTION	varchar(32)	NO		NULL	
+DATABASE_COLLATION	varchar(32)	NO		NULL	
 USE test;
 DROP PROCEDURE IF EXISTS sp_for_routines;
 DROP FUNCTION  IF EXISTS function_for_routines;
diff --git a/mysql-test/suite/funcs_1/r/is_schema_privileges.result b/mysql-test/suite/funcs_1/r/is_schema_privileges.result
index 0b4268cf92a..16f36ff7227 100644
--- a/mysql-test/suite/funcs_1/r/is_schema_privileges.result
+++ b/mysql-test/suite/funcs_1/r/is_schema_privileges.result
@@ -28,27 +28,27 @@ DROP FUNCTION test.f1;
 #########################################################################
 DESCRIBE          information_schema.SCHEMA_PRIVILEGES;
 Field	Type	Null	Key	Default	Extra
-GRANTEE	varchar(385)	NO			
-TABLE_CATALOG	varchar(512)	NO			
-TABLE_SCHEMA	varchar(64)	NO			
-PRIVILEGE_TYPE	varchar(64)	NO			
-IS_GRANTABLE	varchar(3)	NO			
+GRANTEE	varchar(385)	NO		NULL	
+TABLE_CATALOG	varchar(512)	NO		NULL	
+TABLE_SCHEMA	varchar(64)	NO		NULL	
+PRIVILEGE_TYPE	varchar(64)	NO		NULL	
+IS_GRANTABLE	varchar(3)	NO		NULL	
 SHOW CREATE TABLE information_schema.SCHEMA_PRIVILEGES;
 Table	Create Table
 SCHEMA_PRIVILEGES	CREATE TEMPORARY TABLE `SCHEMA_PRIVILEGES` (
-  `GRANTEE` varchar(385) NOT NULL DEFAULT '',
-  `TABLE_CATALOG` varchar(512) NOT NULL DEFAULT '',
-  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `PRIVILEGE_TYPE` varchar(64) NOT NULL DEFAULT '',
-  `IS_GRANTABLE` varchar(3) NOT NULL DEFAULT ''
+  `GRANTEE` varchar(385) NOT NULL,
+  `TABLE_CATALOG` varchar(512) NOT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL,
+  `PRIVILEGE_TYPE` varchar(64) NOT NULL,
+  `IS_GRANTABLE` varchar(3) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
 SHOW COLUMNS FROM information_schema.SCHEMA_PRIVILEGES;
 Field	Type	Null	Key	Default	Extra
-GRANTEE	varchar(385)	NO			
-TABLE_CATALOG	varchar(512)	NO			
-TABLE_SCHEMA	varchar(64)	NO			
-PRIVILEGE_TYPE	varchar(64)	NO			
-IS_GRANTABLE	varchar(3)	NO			
+GRANTEE	varchar(385)	NO		NULL	
+TABLE_CATALOG	varchar(512)	NO		NULL	
+TABLE_SCHEMA	varchar(64)	NO		NULL	
+PRIVILEGE_TYPE	varchar(64)	NO		NULL	
+IS_GRANTABLE	varchar(3)	NO		NULL	
 SELECT GRANTEE, TABLE_CATALOG, TABLE_SCHEMA, PRIVILEGE_TYPE
 FROM information_schema.schema_privileges WHERE table_catalog IS NOT NULL;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE
diff --git a/mysql-test/suite/funcs_1/r/is_schemata.result b/mysql-test/suite/funcs_1/r/is_schemata.result
index 3949ab16755..9c797149d4a 100644
--- a/mysql-test/suite/funcs_1/r/is_schemata.result
+++ b/mysql-test/suite/funcs_1/r/is_schemata.result
@@ -28,30 +28,30 @@ DROP FUNCTION test.f1;
 #########################################################################
 DESCRIBE          information_schema.SCHEMATA;
 Field	Type	Null	Key	Default	Extra
-CATALOG_NAME	varchar(512)	NO			
-SCHEMA_NAME	varchar(64)	NO			
-DEFAULT_CHARACTER_SET_NAME	varchar(32)	NO			
-DEFAULT_COLLATION_NAME	varchar(32)	NO			
+CATALOG_NAME	varchar(512)	NO		NULL	
+SCHEMA_NAME	varchar(64)	NO		NULL	
+DEFAULT_CHARACTER_SET_NAME	varchar(32)	NO		NULL	
+DEFAULT_COLLATION_NAME	varchar(32)	NO		NULL	
 SQL_PATH	varchar(512)	YES		NULL	
-SCHEMA_COMMENT	varchar(1024)	NO			
+SCHEMA_COMMENT	varchar(1024)	NO		NULL	
 SHOW CREATE TABLE information_schema.SCHEMATA;
 Table	Create Table
 SCHEMATA	CREATE TEMPORARY TABLE `SCHEMATA` (
-  `CATALOG_NAME` varchar(512) NOT NULL DEFAULT '',
-  `SCHEMA_NAME` varchar(64) NOT NULL DEFAULT '',
-  `DEFAULT_CHARACTER_SET_NAME` varchar(32) NOT NULL DEFAULT '',
-  `DEFAULT_COLLATION_NAME` varchar(32) NOT NULL DEFAULT '',
-  `SQL_PATH` varchar(512) DEFAULT NULL,
-  `SCHEMA_COMMENT` varchar(1024) NOT NULL DEFAULT ''
+  `CATALOG_NAME` varchar(512) NOT NULL,
+  `SCHEMA_NAME` varchar(64) NOT NULL,
+  `DEFAULT_CHARACTER_SET_NAME` varchar(32) NOT NULL,
+  `DEFAULT_COLLATION_NAME` varchar(32) NOT NULL,
+  `SQL_PATH` varchar(512),
+  `SCHEMA_COMMENT` varchar(1024) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
 SHOW COLUMNS FROM information_schema.SCHEMATA;
 Field	Type	Null	Key	Default	Extra
-CATALOG_NAME	varchar(512)	NO			
-SCHEMA_NAME	varchar(64)	NO			
-DEFAULT_CHARACTER_SET_NAME	varchar(32)	NO			
-DEFAULT_COLLATION_NAME	varchar(32)	NO			
+CATALOG_NAME	varchar(512)	NO		NULL	
+SCHEMA_NAME	varchar(64)	NO		NULL	
+DEFAULT_CHARACTER_SET_NAME	varchar(32)	NO		NULL	
+DEFAULT_COLLATION_NAME	varchar(32)	NO		NULL	
 SQL_PATH	varchar(512)	YES		NULL	
-SCHEMA_COMMENT	varchar(1024)	NO			
+SCHEMA_COMMENT	varchar(1024)	NO		NULL	
 SELECT catalog_name, schema_name, sql_path
 FROM information_schema.schemata
 WHERE catalog_name IS NOT NULL or sql_path IS NOT NULL
diff --git a/mysql-test/suite/funcs_1/r/is_schemata_embedded.result b/mysql-test/suite/funcs_1/r/is_schemata_embedded.result
index 5652e916cb1..18b84d7ebff 100644
--- a/mysql-test/suite/funcs_1/r/is_schemata_embedded.result
+++ b/mysql-test/suite/funcs_1/r/is_schemata_embedded.result
@@ -28,30 +28,30 @@ DROP FUNCTION test.f1;
 #########################################################################
 DESCRIBE          information_schema.SCHEMATA;
 Field	Type	Null	Key	Default	Extra
-CATALOG_NAME	varchar(512)	NO			
-SCHEMA_NAME	varchar(64)	NO			
-DEFAULT_CHARACTER_SET_NAME	varchar(32)	NO			
-DEFAULT_COLLATION_NAME	varchar(32)	NO			
+CATALOG_NAME	varchar(512)	NO		NULL	
+SCHEMA_NAME	varchar(64)	NO		NULL	
+DEFAULT_CHARACTER_SET_NAME	varchar(32)	NO		NULL	
+DEFAULT_COLLATION_NAME	varchar(32)	NO		NULL	
 SQL_PATH	varchar(512)	YES		NULL	
-SCHEMA_COMMENT	varchar(1024)	NO			
+SCHEMA_COMMENT	varchar(1024)	NO		NULL	
 SHOW CREATE TABLE information_schema.SCHEMATA;
 Table	Create Table
 SCHEMATA	CREATE TEMPORARY TABLE `SCHEMATA` (
-  `CATALOG_NAME` varchar(512) NOT NULL DEFAULT '',
-  `SCHEMA_NAME` varchar(64) NOT NULL DEFAULT '',
-  `DEFAULT_CHARACTER_SET_NAME` varchar(32) NOT NULL DEFAULT '',
-  `DEFAULT_COLLATION_NAME` varchar(32) NOT NULL DEFAULT '',
-  `SQL_PATH` varchar(512) DEFAULT NULL,
-  `SCHEMA_COMMENT` varchar(1024) NOT NULL DEFAULT ''
+  `CATALOG_NAME` varchar(512) NOT NULL,
+  `SCHEMA_NAME` varchar(64) NOT NULL,
+  `DEFAULT_CHARACTER_SET_NAME` varchar(32) NOT NULL,
+  `DEFAULT_COLLATION_NAME` varchar(32) NOT NULL,
+  `SQL_PATH` varchar(512),
+  `SCHEMA_COMMENT` varchar(1024) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
 SHOW COLUMNS FROM information_schema.SCHEMATA;
 Field	Type	Null	Key	Default	Extra
-CATALOG_NAME	varchar(512)	NO			
-SCHEMA_NAME	varchar(64)	NO			
-DEFAULT_CHARACTER_SET_NAME	varchar(32)	NO			
-DEFAULT_COLLATION_NAME	varchar(32)	NO			
+CATALOG_NAME	varchar(512)	NO		NULL	
+SCHEMA_NAME	varchar(64)	NO		NULL	
+DEFAULT_CHARACTER_SET_NAME	varchar(32)	NO		NULL	
+DEFAULT_COLLATION_NAME	varchar(32)	NO		NULL	
 SQL_PATH	varchar(512)	YES		NULL	
-SCHEMA_COMMENT	varchar(1024)	NO			
+SCHEMA_COMMENT	varchar(1024)	NO		NULL	
 SELECT catalog_name, schema_name, sql_path
 FROM information_schema.schemata
 WHERE catalog_name IS NOT NULL or sql_path IS NOT NULL
diff --git a/mysql-test/suite/funcs_1/r/is_statistics.result b/mysql-test/suite/funcs_1/r/is_statistics.result
index 229183c036b..64c679dce3d 100644
--- a/mysql-test/suite/funcs_1/r/is_statistics.result
+++ b/mysql-test/suite/funcs_1/r/is_statistics.result
@@ -28,63 +28,63 @@ DROP FUNCTION test.f1;
 #########################################################################
 DESCRIBE          information_schema.STATISTICS;
 Field	Type	Null	Key	Default	Extra
-TABLE_CATALOG	varchar(512)	NO			
-TABLE_SCHEMA	varchar(64)	NO			
-TABLE_NAME	varchar(64)	NO			
-NON_UNIQUE	bigint(1)	NO		0	
-INDEX_SCHEMA	varchar(64)	NO			
-INDEX_NAME	varchar(64)	NO			
-SEQ_IN_INDEX	bigint(2)	NO		0	
-COLUMN_NAME	varchar(64)	NO			
+TABLE_CATALOG	varchar(512)	NO		NULL	
+TABLE_SCHEMA	varchar(64)	NO		NULL	
+TABLE_NAME	varchar(64)	NO		NULL	
+NON_UNIQUE	bigint(1)	NO		NULL	
+INDEX_SCHEMA	varchar(64)	NO		NULL	
+INDEX_NAME	varchar(64)	NO		NULL	
+SEQ_IN_INDEX	bigint(2)	NO		NULL	
+COLUMN_NAME	varchar(64)	NO		NULL	
 COLLATION	varchar(1)	YES		NULL	
 CARDINALITY	bigint(21)	YES		NULL	
 SUB_PART	bigint(3)	YES		NULL	
 PACKED	varchar(10)	YES		NULL	
-NULLABLE	varchar(3)	NO			
-INDEX_TYPE	varchar(16)	NO			
+NULLABLE	varchar(3)	NO		NULL	
+INDEX_TYPE	varchar(16)	NO		NULL	
 COMMENT	varchar(16)	YES		NULL	
-INDEX_COMMENT	varchar(1024)	NO			
-IGNORED	varchar(3)	NO			
+INDEX_COMMENT	varchar(1024)	NO		NULL	
+IGNORED	varchar(3)	NO		NULL	
 SHOW CREATE TABLE information_schema.STATISTICS;
 Table	Create Table
 STATISTICS	CREATE TEMPORARY TABLE `STATISTICS` (
-  `TABLE_CATALOG` varchar(512) NOT NULL DEFAULT '',
-  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `NON_UNIQUE` bigint(1) NOT NULL DEFAULT 0,
-  `INDEX_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `INDEX_NAME` varchar(64) NOT NULL DEFAULT '',
-  `SEQ_IN_INDEX` bigint(2) NOT NULL DEFAULT 0,
-  `COLUMN_NAME` varchar(64) NOT NULL DEFAULT '',
-  `COLLATION` varchar(1) DEFAULT NULL,
-  `CARDINALITY` bigint(21) DEFAULT NULL,
-  `SUB_PART` bigint(3) DEFAULT NULL,
-  `PACKED` varchar(10) DEFAULT NULL,
-  `NULLABLE` varchar(3) NOT NULL DEFAULT '',
-  `INDEX_TYPE` varchar(16) NOT NULL DEFAULT '',
-  `COMMENT` varchar(16) DEFAULT NULL,
-  `INDEX_COMMENT` varchar(1024) NOT NULL DEFAULT '',
-  `IGNORED` varchar(3) NOT NULL DEFAULT ''
+  `TABLE_CATALOG` varchar(512) NOT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL,
+  `TABLE_NAME` varchar(64) NOT NULL,
+  `NON_UNIQUE` bigint(1) NOT NULL,
+  `INDEX_SCHEMA` varchar(64) NOT NULL,
+  `INDEX_NAME` varchar(64) NOT NULL,
+  `SEQ_IN_INDEX` bigint(2) NOT NULL,
+  `COLUMN_NAME` varchar(64) NOT NULL,
+  `COLLATION` varchar(1),
+  `CARDINALITY` bigint(21),
+  `SUB_PART` bigint(3),
+  `PACKED` varchar(10),
+  `NULLABLE` varchar(3) NOT NULL,
+  `INDEX_TYPE` varchar(16) NOT NULL,
+  `COMMENT` varchar(16),
+  `INDEX_COMMENT` varchar(1024) NOT NULL,
+  `IGNORED` varchar(3) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
 SHOW COLUMNS FROM information_schema.STATISTICS;
 Field	Type	Null	Key	Default	Extra
-TABLE_CATALOG	varchar(512)	NO			
-TABLE_SCHEMA	varchar(64)	NO			
-TABLE_NAME	varchar(64)	NO			
-NON_UNIQUE	bigint(1)	NO		0	
-INDEX_SCHEMA	varchar(64)	NO			
-INDEX_NAME	varchar(64)	NO			
-SEQ_IN_INDEX	bigint(2)	NO		0	
-COLUMN_NAME	varchar(64)	NO			
+TABLE_CATALOG	varchar(512)	NO		NULL	
+TABLE_SCHEMA	varchar(64)	NO		NULL	
+TABLE_NAME	varchar(64)	NO		NULL	
+NON_UNIQUE	bigint(1)	NO		NULL	
+INDEX_SCHEMA	varchar(64)	NO		NULL	
+INDEX_NAME	varchar(64)	NO		NULL	
+SEQ_IN_INDEX	bigint(2)	NO		NULL	
+COLUMN_NAME	varchar(64)	NO		NULL	
 COLLATION	varchar(1)	YES		NULL	
 CARDINALITY	bigint(21)	YES		NULL	
 SUB_PART	bigint(3)	YES		NULL	
 PACKED	varchar(10)	YES		NULL	
-NULLABLE	varchar(3)	NO			
-INDEX_TYPE	varchar(16)	NO			
+NULLABLE	varchar(3)	NO		NULL	
+INDEX_TYPE	varchar(16)	NO		NULL	
 COMMENT	varchar(16)	YES		NULL	
-INDEX_COMMENT	varchar(1024)	NO			
-IGNORED	varchar(3)	NO			
+INDEX_COMMENT	varchar(1024)	NO		NULL	
+IGNORED	varchar(3)	NO		NULL	
 SELECT table_catalog, table_schema, table_name, index_schema, index_name
 FROM information_schema.statistics WHERE table_catalog IS NOT NULL
 ORDER BY table_schema, table_name, index_schema, index_name;
diff --git a/mysql-test/suite/funcs_1/r/is_table_constraints.result b/mysql-test/suite/funcs_1/r/is_table_constraints.result
index de44c2d5052..22b7148123d 100644
--- a/mysql-test/suite/funcs_1/r/is_table_constraints.result
+++ b/mysql-test/suite/funcs_1/r/is_table_constraints.result
@@ -28,30 +28,30 @@ DROP FUNCTION test.f1;
 #########################################################################
 DESCRIBE          information_schema.TABLE_CONSTRAINTS;
 Field	Type	Null	Key	Default	Extra
-CONSTRAINT_CATALOG	varchar(512)	NO			
-CONSTRAINT_SCHEMA	varchar(64)	NO			
-CONSTRAINT_NAME	varchar(64)	NO			
-TABLE_SCHEMA	varchar(64)	NO			
-TABLE_NAME	varchar(64)	NO			
-CONSTRAINT_TYPE	varchar(64)	NO			
+CONSTRAINT_CATALOG	varchar(512)	NO		NULL	
+CONSTRAINT_SCHEMA	varchar(64)	NO		NULL	
+CONSTRAINT_NAME	varchar(64)	NO		NULL	
+TABLE_SCHEMA	varchar(64)	NO		NULL	
+TABLE_NAME	varchar(64)	NO		NULL	
+CONSTRAINT_TYPE	varchar(64)	NO		NULL	
 SHOW CREATE TABLE information_schema.TABLE_CONSTRAINTS;
 Table	Create Table
 TABLE_CONSTRAINTS	CREATE TEMPORARY TABLE `TABLE_CONSTRAINTS` (
-  `CONSTRAINT_CATALOG` varchar(512) NOT NULL DEFAULT '',
-  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `CONSTRAINT_NAME` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `CONSTRAINT_TYPE` varchar(64) NOT NULL DEFAULT ''
+  `CONSTRAINT_CATALOG` varchar(512) NOT NULL,
+  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL,
+  `CONSTRAINT_NAME` varchar(64) NOT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL,
+  `TABLE_NAME` varchar(64) NOT NULL,
+  `CONSTRAINT_TYPE` varchar(64) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
 SHOW COLUMNS FROM information_schema.TABLE_CONSTRAINTS;
 Field	Type	Null	Key	Default	Extra
-CONSTRAINT_CATALOG	varchar(512)	NO			
-CONSTRAINT_SCHEMA	varchar(64)	NO			
-CONSTRAINT_NAME	varchar(64)	NO			
-TABLE_SCHEMA	varchar(64)	NO			
-TABLE_NAME	varchar(64)	NO			
-CONSTRAINT_TYPE	varchar(64)	NO			
+CONSTRAINT_CATALOG	varchar(512)	NO		NULL	
+CONSTRAINT_SCHEMA	varchar(64)	NO		NULL	
+CONSTRAINT_NAME	varchar(64)	NO		NULL	
+TABLE_SCHEMA	varchar(64)	NO		NULL	
+TABLE_NAME	varchar(64)	NO		NULL	
+CONSTRAINT_TYPE	varchar(64)	NO		NULL	
 SELECT constraint_catalog, constraint_schema, constraint_name,
 table_schema, table_name
 FROM information_schema.table_constraints
diff --git a/mysql-test/suite/funcs_1/r/is_table_privileges.result b/mysql-test/suite/funcs_1/r/is_table_privileges.result
index f749a236b9a..c85d3cc3d96 100644
--- a/mysql-test/suite/funcs_1/r/is_table_privileges.result
+++ b/mysql-test/suite/funcs_1/r/is_table_privileges.result
@@ -28,30 +28,30 @@ DROP FUNCTION test.f1;
 #########################################################################
 DESCRIBE          information_schema.TABLE_PRIVILEGES;
 Field	Type	Null	Key	Default	Extra
-GRANTEE	varchar(385)	NO			
-TABLE_CATALOG	varchar(512)	NO			
-TABLE_SCHEMA	varchar(64)	NO			
-TABLE_NAME	varchar(64)	NO			
-PRIVILEGE_TYPE	varchar(64)	NO			
-IS_GRANTABLE	varchar(3)	NO			
+GRANTEE	varchar(385)	NO		NULL	
+TABLE_CATALOG	varchar(512)	NO		NULL	
+TABLE_SCHEMA	varchar(64)	NO		NULL	
+TABLE_NAME	varchar(64)	NO		NULL	
+PRIVILEGE_TYPE	varchar(64)	NO		NULL	
+IS_GRANTABLE	varchar(3)	NO		NULL	
 SHOW CREATE TABLE information_schema.TABLE_PRIVILEGES;
 Table	Create Table
 TABLE_PRIVILEGES	CREATE TEMPORARY TABLE `TABLE_PRIVILEGES` (
-  `GRANTEE` varchar(385) NOT NULL DEFAULT '',
-  `TABLE_CATALOG` varchar(512) NOT NULL DEFAULT '',
-  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `PRIVILEGE_TYPE` varchar(64) NOT NULL DEFAULT '',
-  `IS_GRANTABLE` varchar(3) NOT NULL DEFAULT ''
+  `GRANTEE` varchar(385) NOT NULL,
+  `TABLE_CATALOG` varchar(512) NOT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL,
+  `TABLE_NAME` varchar(64) NOT NULL,
+  `PRIVILEGE_TYPE` varchar(64) NOT NULL,
+  `IS_GRANTABLE` varchar(3) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
 SHOW COLUMNS FROM information_schema.TABLE_PRIVILEGES;
 Field	Type	Null	Key	Default	Extra
-GRANTEE	varchar(385)	NO			
-TABLE_CATALOG	varchar(512)	NO			
-TABLE_SCHEMA	varchar(64)	NO			
-TABLE_NAME	varchar(64)	NO			
-PRIVILEGE_TYPE	varchar(64)	NO			
-IS_GRANTABLE	varchar(3)	NO			
+GRANTEE	varchar(385)	NO		NULL	
+TABLE_CATALOG	varchar(512)	NO		NULL	
+TABLE_SCHEMA	varchar(64)	NO		NULL	
+TABLE_NAME	varchar(64)	NO		NULL	
+PRIVILEGE_TYPE	varchar(64)	NO		NULL	
+IS_GRANTABLE	varchar(3)	NO		NULL	
 SELECT table_catalog, table_schema, table_name, privilege_type
 FROM information_schema.table_privileges WHERE table_catalog IS NOT NULL;
 table_catalog	table_schema	table_name	privilege_type
diff --git a/mysql-test/suite/funcs_1/r/is_tables.result b/mysql-test/suite/funcs_1/r/is_tables.result
index 54c75efd74e..08e721cde1c 100644
--- a/mysql-test/suite/funcs_1/r/is_tables.result
+++ b/mysql-test/suite/funcs_1/r/is_tables.result
@@ -28,10 +28,10 @@ DROP FUNCTION test.f1;
 #########################################################################
 DESCRIBE          information_schema.TABLES;
 Field	Type	Null	Key	Default	Extra
-TABLE_CATALOG	varchar(512)	NO			
-TABLE_SCHEMA	varchar(64)	NO			
-TABLE_NAME	varchar(64)	NO			
-TABLE_TYPE	varchar(64)	NO			
+TABLE_CATALOG	varchar(512)	NO		NULL	
+TABLE_SCHEMA	varchar(64)	NO		NULL	
+TABLE_NAME	varchar(64)	NO		NULL	
+TABLE_TYPE	varchar(64)	NO		NULL	
 ENGINE	varchar(64)	YES		NULL	
 VERSION	bigint(21) unsigned	YES		NULL	
 ROW_FORMAT	varchar(10)	YES		NULL	
@@ -48,42 +48,42 @@ CHECK_TIME	datetime	YES		NULL
 TABLE_COLLATION	varchar(32)	YES		NULL	
 CHECKSUM	bigint(21) unsigned	YES		NULL	
 CREATE_OPTIONS	varchar(2048)	YES		NULL	
-TABLE_COMMENT	varchar(2048)	NO			
+TABLE_COMMENT	varchar(2048)	NO		NULL	
 MAX_INDEX_LENGTH	bigint(21) unsigned	YES		NULL	
 TEMPORARY	varchar(1)	YES		NULL	
 SHOW CREATE TABLE information_schema.TABLES;
 Table	Create Table
 TABLES	CREATE TEMPORARY TABLE `TABLES` (
-  `TABLE_CATALOG` varchar(512) NOT NULL DEFAULT '',
-  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_TYPE` varchar(64) NOT NULL DEFAULT '',
-  `ENGINE` varchar(64) DEFAULT NULL,
-  `VERSION` bigint(21) unsigned DEFAULT NULL,
-  `ROW_FORMAT` varchar(10) DEFAULT NULL,
-  `TABLE_ROWS` bigint(21) unsigned DEFAULT NULL,
-  `AVG_ROW_LENGTH` bigint(21) unsigned DEFAULT NULL,
-  `DATA_LENGTH` bigint(21) unsigned DEFAULT NULL,
-  `MAX_DATA_LENGTH` bigint(21) unsigned DEFAULT NULL,
-  `INDEX_LENGTH` bigint(21) unsigned DEFAULT NULL,
-  `DATA_FREE` bigint(21) unsigned DEFAULT NULL,
-  `AUTO_INCREMENT` bigint(21) unsigned DEFAULT NULL,
-  `CREATE_TIME` datetime DEFAULT NULL,
-  `UPDATE_TIME` datetime DEFAULT NULL,
-  `CHECK_TIME` datetime DEFAULT NULL,
-  `TABLE_COLLATION` varchar(32) DEFAULT NULL,
-  `CHECKSUM` bigint(21) unsigned DEFAULT NULL,
-  `CREATE_OPTIONS` varchar(2048) DEFAULT NULL,
-  `TABLE_COMMENT` varchar(2048) NOT NULL DEFAULT '',
-  `MAX_INDEX_LENGTH` bigint(21) unsigned DEFAULT NULL,
-  `TEMPORARY` varchar(1) DEFAULT NULL
+  `TABLE_CATALOG` varchar(512) NOT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL,
+  `TABLE_NAME` varchar(64) NOT NULL,
+  `TABLE_TYPE` varchar(64) NOT NULL,
+  `ENGINE` varchar(64),
+  `VERSION` bigint(21) unsigned,
+  `ROW_FORMAT` varchar(10),
+  `TABLE_ROWS` bigint(21) unsigned,
+  `AVG_ROW_LENGTH` bigint(21) unsigned,
+  `DATA_LENGTH` bigint(21) unsigned,
+  `MAX_DATA_LENGTH` bigint(21) unsigned,
+  `INDEX_LENGTH` bigint(21) unsigned,
+  `DATA_FREE` bigint(21) unsigned,
+  `AUTO_INCREMENT` bigint(21) unsigned,
+  `CREATE_TIME` datetime,
+  `UPDATE_TIME` datetime,
+  `CHECK_TIME` datetime,
+  `TABLE_COLLATION` varchar(32),
+  `CHECKSUM` bigint(21) unsigned,
+  `CREATE_OPTIONS` varchar(2048),
+  `TABLE_COMMENT` varchar(2048) NOT NULL,
+  `MAX_INDEX_LENGTH` bigint(21) unsigned,
+  `TEMPORARY` varchar(1)
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
 SHOW COLUMNS FROM information_schema.TABLES;
 Field	Type	Null	Key	Default	Extra
-TABLE_CATALOG	varchar(512)	NO			
-TABLE_SCHEMA	varchar(64)	NO			
-TABLE_NAME	varchar(64)	NO			
-TABLE_TYPE	varchar(64)	NO			
+TABLE_CATALOG	varchar(512)	NO		NULL	
+TABLE_SCHEMA	varchar(64)	NO		NULL	
+TABLE_NAME	varchar(64)	NO		NULL	
+TABLE_TYPE	varchar(64)	NO		NULL	
 ENGINE	varchar(64)	YES		NULL	
 VERSION	bigint(21) unsigned	YES		NULL	
 ROW_FORMAT	varchar(10)	YES		NULL	
@@ -100,7 +100,7 @@ CHECK_TIME	datetime	YES		NULL
 TABLE_COLLATION	varchar(32)	YES		NULL	
 CHECKSUM	bigint(21) unsigned	YES		NULL	
 CREATE_OPTIONS	varchar(2048)	YES		NULL	
-TABLE_COMMENT	varchar(2048)	NO			
+TABLE_COMMENT	varchar(2048)	NO		NULL	
 MAX_INDEX_LENGTH	bigint(21) unsigned	YES		NULL	
 TEMPORARY	varchar(1)	YES		NULL	
 SELECT table_catalog, table_schema, table_name
diff --git a/mysql-test/suite/funcs_1/r/is_tables_embedded.result b/mysql-test/suite/funcs_1/r/is_tables_embedded.result
index 1d8e276ba73..5e9259bf557 100644
--- a/mysql-test/suite/funcs_1/r/is_tables_embedded.result
+++ b/mysql-test/suite/funcs_1/r/is_tables_embedded.result
@@ -28,10 +28,10 @@ DROP FUNCTION test.f1;
 #########################################################################
 DESCRIBE          information_schema.TABLES;
 Field	Type	Null	Key	Default	Extra
-TABLE_CATALOG	varchar(512)	NO			
-TABLE_SCHEMA	varchar(64)	NO			
-TABLE_NAME	varchar(64)	NO			
-TABLE_TYPE	varchar(64)	NO			
+TABLE_CATALOG	varchar(512)	NO		NULL	
+TABLE_SCHEMA	varchar(64)	NO		NULL	
+TABLE_NAME	varchar(64)	NO		NULL	
+TABLE_TYPE	varchar(64)	NO		NULL	
 ENGINE	varchar(64)	YES		NULL	
 VERSION	bigint(21) unsigned	YES		NULL	
 ROW_FORMAT	varchar(10)	YES		NULL	
@@ -48,42 +48,42 @@ CHECK_TIME	datetime	YES		NULL
 TABLE_COLLATION	varchar(32)	YES		NULL	
 CHECKSUM	bigint(21) unsigned	YES		NULL	
 CREATE_OPTIONS	varchar(2048)	YES		NULL	
-TABLE_COMMENT	varchar(2048)	NO			
+TABLE_COMMENT	varchar(2048)	NO		NULL	
 MAX_INDEX_LENGTH	bigint(21) unsigned	YES		NULL	
 TEMPORARY	varchar(1)	YES		NULL	
 SHOW CREATE TABLE information_schema.TABLES;
 Table	Create Table
 TABLES	CREATE TEMPORARY TABLE `TABLES` (
-  `TABLE_CATALOG` varchar(512) NOT NULL DEFAULT '',
-  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_TYPE` varchar(64) NOT NULL DEFAULT '',
-  `ENGINE` varchar(64) DEFAULT NULL,
-  `VERSION` bigint(21) unsigned DEFAULT NULL,
-  `ROW_FORMAT` varchar(10) DEFAULT NULL,
-  `TABLE_ROWS` bigint(21) unsigned DEFAULT NULL,
-  `AVG_ROW_LENGTH` bigint(21) unsigned DEFAULT NULL,
-  `DATA_LENGTH` bigint(21) unsigned DEFAULT NULL,
-  `MAX_DATA_LENGTH` bigint(21) unsigned DEFAULT NULL,
-  `INDEX_LENGTH` bigint(21) unsigned DEFAULT NULL,
-  `DATA_FREE` bigint(21) unsigned DEFAULT NULL,
-  `AUTO_INCREMENT` bigint(21) unsigned DEFAULT NULL,
-  `CREATE_TIME` datetime DEFAULT NULL,
-  `UPDATE_TIME` datetime DEFAULT NULL,
-  `CHECK_TIME` datetime DEFAULT NULL,
-  `TABLE_COLLATION` varchar(32) DEFAULT NULL,
-  `CHECKSUM` bigint(21) unsigned DEFAULT NULL,
-  `CREATE_OPTIONS` varchar(2048) DEFAULT NULL,
-  `TABLE_COMMENT` varchar(2048) NOT NULL DEFAULT '',
-  `MAX_INDEX_LENGTH` bigint(21) unsigned DEFAULT NULL,
-  `TEMPORARY` varchar(1) DEFAULT NULL
+  `TABLE_CATALOG` varchar(512) NOT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL,
+  `TABLE_NAME` varchar(64) NOT NULL,
+  `TABLE_TYPE` varchar(64) NOT NULL,
+  `ENGINE` varchar(64),
+  `VERSION` bigint(21) unsigned,
+  `ROW_FORMAT` varchar(10),
+  `TABLE_ROWS` bigint(21) unsigned,
+  `AVG_ROW_LENGTH` bigint(21) unsigned,
+  `DATA_LENGTH` bigint(21) unsigned,
+  `MAX_DATA_LENGTH` bigint(21) unsigned,
+  `INDEX_LENGTH` bigint(21) unsigned,
+  `DATA_FREE` bigint(21) unsigned,
+  `AUTO_INCREMENT` bigint(21) unsigned,
+  `CREATE_TIME` datetime,
+  `UPDATE_TIME` datetime,
+  `CHECK_TIME` datetime,
+  `TABLE_COLLATION` varchar(32),
+  `CHECKSUM` bigint(21) unsigned,
+  `CREATE_OPTIONS` varchar(2048),
+  `TABLE_COMMENT` varchar(2048) NOT NULL,
+  `MAX_INDEX_LENGTH` bigint(21) unsigned,
+  `TEMPORARY` varchar(1)
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
 SHOW COLUMNS FROM information_schema.TABLES;
 Field	Type	Null	Key	Default	Extra
-TABLE_CATALOG	varchar(512)	NO			
-TABLE_SCHEMA	varchar(64)	NO			
-TABLE_NAME	varchar(64)	NO			
-TABLE_TYPE	varchar(64)	NO			
+TABLE_CATALOG	varchar(512)	NO		NULL	
+TABLE_SCHEMA	varchar(64)	NO		NULL	
+TABLE_NAME	varchar(64)	NO		NULL	
+TABLE_TYPE	varchar(64)	NO		NULL	
 ENGINE	varchar(64)	YES		NULL	
 VERSION	bigint(21) unsigned	YES		NULL	
 ROW_FORMAT	varchar(10)	YES		NULL	
@@ -100,7 +100,7 @@ CHECK_TIME	datetime	YES		NULL
 TABLE_COLLATION	varchar(32)	YES		NULL	
 CHECKSUM	bigint(21) unsigned	YES		NULL	
 CREATE_OPTIONS	varchar(2048)	YES		NULL	
-TABLE_COMMENT	varchar(2048)	NO			
+TABLE_COMMENT	varchar(2048)	NO		NULL	
 MAX_INDEX_LENGTH	bigint(21) unsigned	YES		NULL	
 TEMPORARY	varchar(1)	YES		NULL	
 SELECT table_catalog, table_schema, table_name
diff --git a/mysql-test/suite/funcs_1/r/is_triggers.result b/mysql-test/suite/funcs_1/r/is_triggers.result
index c6485e58f44..030d469db54 100644
--- a/mysql-test/suite/funcs_1/r/is_triggers.result
+++ b/mysql-test/suite/funcs_1/r/is_triggers.result
@@ -30,78 +30,78 @@ DROP FUNCTION test.f1;
 #########################################################################
 DESCRIBE          information_schema.TRIGGERS;
 Field	Type	Null	Key	Default	Extra
-TRIGGER_CATALOG	varchar(512)	NO			
-TRIGGER_SCHEMA	varchar(64)	NO			
-TRIGGER_NAME	varchar(64)	NO			
-EVENT_MANIPULATION	varchar(6)	NO			
-EVENT_OBJECT_CATALOG	varchar(512)	NO			
-EVENT_OBJECT_SCHEMA	varchar(64)	NO			
-EVENT_OBJECT_TABLE	varchar(64)	NO			
-ACTION_ORDER	bigint(4)	NO		0	
+TRIGGER_CATALOG	varchar(512)	NO		NULL	
+TRIGGER_SCHEMA	varchar(64)	NO		NULL	
+TRIGGER_NAME	varchar(64)	NO		NULL	
+EVENT_MANIPULATION	varchar(6)	NO		NULL	
+EVENT_OBJECT_CATALOG	varchar(512)	NO		NULL	
+EVENT_OBJECT_SCHEMA	varchar(64)	NO		NULL	
+EVENT_OBJECT_TABLE	varchar(64)	NO		NULL	
+ACTION_ORDER	bigint(4)	NO		NULL	
 ACTION_CONDITION	longtext	YES		NULL	
-ACTION_STATEMENT	longtext	NO			
-ACTION_ORIENTATION	varchar(9)	NO			
-ACTION_TIMING	varchar(6)	NO			
+ACTION_STATEMENT	longtext	NO		NULL	
+ACTION_ORIENTATION	varchar(9)	NO		NULL	
+ACTION_TIMING	varchar(6)	NO		NULL	
 ACTION_REFERENCE_OLD_TABLE	varchar(64)	YES		NULL	
 ACTION_REFERENCE_NEW_TABLE	varchar(64)	YES		NULL	
-ACTION_REFERENCE_OLD_ROW	varchar(3)	NO			
-ACTION_REFERENCE_NEW_ROW	varchar(3)	NO			
+ACTION_REFERENCE_OLD_ROW	varchar(3)	NO		NULL	
+ACTION_REFERENCE_NEW_ROW	varchar(3)	NO		NULL	
 CREATED	datetime(2)	YES		NULL	
-SQL_MODE	varchar(8192)	NO			
-DEFINER	varchar(384)	NO			
-CHARACTER_SET_CLIENT	varchar(32)	NO			
-COLLATION_CONNECTION	varchar(32)	NO			
-DATABASE_COLLATION	varchar(32)	NO			
+SQL_MODE	varchar(8192)	NO		NULL	
+DEFINER	varchar(384)	NO		NULL	
+CHARACTER_SET_CLIENT	varchar(32)	NO		NULL	
+COLLATION_CONNECTION	varchar(32)	NO		NULL	
+DATABASE_COLLATION	varchar(32)	NO		NULL	
 SHOW CREATE TABLE information_schema.TRIGGERS;
 Table	Create Table
 TRIGGERS	CREATE TEMPORARY TABLE `TRIGGERS` (
-  `TRIGGER_CATALOG` varchar(512) NOT NULL DEFAULT '',
-  `TRIGGER_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `TRIGGER_NAME` varchar(64) NOT NULL DEFAULT '',
-  `EVENT_MANIPULATION` varchar(6) NOT NULL DEFAULT '',
-  `EVENT_OBJECT_CATALOG` varchar(512) NOT NULL DEFAULT '',
-  `EVENT_OBJECT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `EVENT_OBJECT_TABLE` varchar(64) NOT NULL DEFAULT '',
-  `ACTION_ORDER` bigint(4) NOT NULL DEFAULT 0,
-  `ACTION_CONDITION` longtext DEFAULT NULL,
-  `ACTION_STATEMENT` longtext NOT NULL DEFAULT '',
-  `ACTION_ORIENTATION` varchar(9) NOT NULL DEFAULT '',
-  `ACTION_TIMING` varchar(6) NOT NULL DEFAULT '',
-  `ACTION_REFERENCE_OLD_TABLE` varchar(64) DEFAULT NULL,
-  `ACTION_REFERENCE_NEW_TABLE` varchar(64) DEFAULT NULL,
-  `ACTION_REFERENCE_OLD_ROW` varchar(3) NOT NULL DEFAULT '',
-  `ACTION_REFERENCE_NEW_ROW` varchar(3) NOT NULL DEFAULT '',
-  `CREATED` datetime(2) DEFAULT NULL,
-  `SQL_MODE` varchar(8192) NOT NULL DEFAULT '',
-  `DEFINER` varchar(384) NOT NULL DEFAULT '',
-  `CHARACTER_SET_CLIENT` varchar(32) NOT NULL DEFAULT '',
-  `COLLATION_CONNECTION` varchar(32) NOT NULL DEFAULT '',
-  `DATABASE_COLLATION` varchar(32) NOT NULL DEFAULT ''
+  `TRIGGER_CATALOG` varchar(512) NOT NULL,
+  `TRIGGER_SCHEMA` varchar(64) NOT NULL,
+  `TRIGGER_NAME` varchar(64) NOT NULL,
+  `EVENT_MANIPULATION` varchar(6) NOT NULL,
+  `EVENT_OBJECT_CATALOG` varchar(512) NOT NULL,
+  `EVENT_OBJECT_SCHEMA` varchar(64) NOT NULL,
+  `EVENT_OBJECT_TABLE` varchar(64) NOT NULL,
+  `ACTION_ORDER` bigint(4) NOT NULL,
+  `ACTION_CONDITION` longtext,
+  `ACTION_STATEMENT` longtext NOT NULL,
+  `ACTION_ORIENTATION` varchar(9) NOT NULL,
+  `ACTION_TIMING` varchar(6) NOT NULL,
+  `ACTION_REFERENCE_OLD_TABLE` varchar(64),
+  `ACTION_REFERENCE_NEW_TABLE` varchar(64),
+  `ACTION_REFERENCE_OLD_ROW` varchar(3) NOT NULL,
+  `ACTION_REFERENCE_NEW_ROW` varchar(3) NOT NULL,
+  `CREATED` datetime(2),
+  `SQL_MODE` varchar(8192) NOT NULL,
+  `DEFINER` varchar(384) NOT NULL,
+  `CHARACTER_SET_CLIENT` varchar(32) NOT NULL,
+  `COLLATION_CONNECTION` varchar(32) NOT NULL,
+  `DATABASE_COLLATION` varchar(32) NOT NULL
 )  DEFAULT CHARSET=utf8mb3
 SHOW COLUMNS FROM information_schema.TRIGGERS;
 Field	Type	Null	Key	Default	Extra
-TRIGGER_CATALOG	varchar(512)	NO			
-TRIGGER_SCHEMA	varchar(64)	NO			
-TRIGGER_NAME	varchar(64)	NO			
-EVENT_MANIPULATION	varchar(6)	NO			
-EVENT_OBJECT_CATALOG	varchar(512)	NO			
-EVENT_OBJECT_SCHEMA	varchar(64)	NO			
-EVENT_OBJECT_TABLE	varchar(64)	NO			
-ACTION_ORDER	bigint(4)	NO		0	
+TRIGGER_CATALOG	varchar(512)	NO		NULL	
+TRIGGER_SCHEMA	varchar(64)	NO		NULL	
+TRIGGER_NAME	varchar(64)	NO		NULL	
+EVENT_MANIPULATION	varchar(6)	NO		NULL	
+EVENT_OBJECT_CATALOG	varchar(512)	NO		NULL	
+EVENT_OBJECT_SCHEMA	varchar(64)	NO		NULL	
+EVENT_OBJECT_TABLE	varchar(64)	NO		NULL	
+ACTION_ORDER	bigint(4)	NO		NULL	
 ACTION_CONDITION	longtext	YES		NULL	
-ACTION_STATEMENT	longtext	NO			
-ACTION_ORIENTATION	varchar(9)	NO			
-ACTION_TIMING	varchar(6)	NO			
+ACTION_STATEMENT	longtext	NO		NULL	
+ACTION_ORIENTATION	varchar(9)	NO		NULL	
+ACTION_TIMING	varchar(6)	NO		NULL	
 ACTION_REFERENCE_OLD_TABLE	varchar(64)	YES		NULL	
 ACTION_REFERENCE_NEW_TABLE	varchar(64)	YES		NULL	
-ACTION_REFERENCE_OLD_ROW	varchar(3)	NO			
-ACTION_REFERENCE_NEW_ROW	varchar(3)	NO			
+ACTION_REFERENCE_OLD_ROW	varchar(3)	NO		NULL	
+ACTION_REFERENCE_NEW_ROW	varchar(3)	NO		NULL	
 CREATED	datetime(2)	YES		NULL	
-SQL_MODE	varchar(8192)	NO			
-DEFINER	varchar(384)	NO			
-CHARACTER_SET_CLIENT	varchar(32)	NO			
-COLLATION_CONNECTION	varchar(32)	NO			
-DATABASE_COLLATION	varchar(32)	NO			
+SQL_MODE	varchar(8192)	NO		NULL	
+DEFINER	varchar(384)	NO		NULL	
+CHARACTER_SET_CLIENT	varchar(32)	NO		NULL	
+COLLATION_CONNECTION	varchar(32)	NO		NULL	
+DATABASE_COLLATION	varchar(32)	NO		NULL	
 SELECT * FROM information_schema.triggers
 WHERE trigger_catalog IS NOT NULL OR event_object_catalog IS NOT NULL
 OR action_condition IS NOT NULL OR action_reference_old_table IS NOT NULL
diff --git a/mysql-test/suite/funcs_1/r/is_triggers_embedded.result b/mysql-test/suite/funcs_1/r/is_triggers_embedded.result
index 5a681db49b6..6c02073c954 100644
--- a/mysql-test/suite/funcs_1/r/is_triggers_embedded.result
+++ b/mysql-test/suite/funcs_1/r/is_triggers_embedded.result
@@ -30,78 +30,78 @@ DROP FUNCTION test.f1;
 #########################################################################
 DESCRIBE          information_schema.TRIGGERS;
 Field	Type	Null	Key	Default	Extra
-TRIGGER_CATALOG	varchar(512)	NO			
-TRIGGER_SCHEMA	varchar(64)	NO			
-TRIGGER_NAME	varchar(64)	NO			
-EVENT_MANIPULATION	varchar(6)	NO			
-EVENT_OBJECT_CATALOG	varchar(512)	NO			
-EVENT_OBJECT_SCHEMA	varchar(64)	NO			
-EVENT_OBJECT_TABLE	varchar(64)	NO			
-ACTION_ORDER	bigint(4)	NO		0	
+TRIGGER_CATALOG	varchar(512)	NO		NULL	
+TRIGGER_SCHEMA	varchar(64)	NO		NULL	
+TRIGGER_NAME	varchar(64)	NO		NULL	
+EVENT_MANIPULATION	varchar(6)	NO		NULL	
+EVENT_OBJECT_CATALOG	varchar(512)	NO		NULL	
+EVENT_OBJECT_SCHEMA	varchar(64)	NO		NULL	
+EVENT_OBJECT_TABLE	varchar(64)	NO		NULL	
+ACTION_ORDER	bigint(4)	NO		NULL	
 ACTION_CONDITION	longtext	YES		NULL	
-ACTION_STATEMENT	longtext	NO			
-ACTION_ORIENTATION	varchar(9)	NO			
-ACTION_TIMING	varchar(6)	NO			
+ACTION_STATEMENT	longtext	NO		NULL	
+ACTION_ORIENTATION	varchar(9)	NO		NULL	
+ACTION_TIMING	varchar(6)	NO		NULL	
 ACTION_REFERENCE_OLD_TABLE	varchar(64)	YES		NULL	
 ACTION_REFERENCE_NEW_TABLE	varchar(64)	YES		NULL	
-ACTION_REFERENCE_OLD_ROW	varchar(3)	NO			
-ACTION_REFERENCE_NEW_ROW	varchar(3)	NO			
+ACTION_REFERENCE_OLD_ROW	varchar(3)	NO		NULL	
+ACTION_REFERENCE_NEW_ROW	varchar(3)	NO		NULL	
 CREATED	datetime(2)	YES		NULL	
-SQL_MODE	varchar(8192)	NO			
-DEFINER	varchar(384)	NO			
-CHARACTER_SET_CLIENT	varchar(32)	NO			
-COLLATION_CONNECTION	varchar(32)	NO			
-DATABASE_COLLATION	varchar(32)	NO			
+SQL_MODE	varchar(8192)	NO		NULL	
+DEFINER	varchar(384)	NO		NULL	
+CHARACTER_SET_CLIENT	varchar(32)	NO		NULL	
+COLLATION_CONNECTION	varchar(32)	NO		NULL	
+DATABASE_COLLATION	varchar(32)	NO		NULL	
 SHOW CREATE TABLE information_schema.TRIGGERS;
 Table	Create Table
 TRIGGERS	CREATE TEMPORARY TABLE `TRIGGERS` (
-  `TRIGGER_CATALOG` varchar(512) NOT NULL DEFAULT '',
-  `TRIGGER_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `TRIGGER_NAME` varchar(64) NOT NULL DEFAULT '',
-  `EVENT_MANIPULATION` varchar(6) NOT NULL DEFAULT '',
-  `EVENT_OBJECT_CATALOG` varchar(512) NOT NULL DEFAULT '',
-  `EVENT_OBJECT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `EVENT_OBJECT_TABLE` varchar(64) NOT NULL DEFAULT '',
-  `ACTION_ORDER` bigint(4) NOT NULL DEFAULT 0,
-  `ACTION_CONDITION` longtext DEFAULT NULL,
-  `ACTION_STATEMENT` longtext NOT NULL DEFAULT '',
-  `ACTION_ORIENTATION` varchar(9) NOT NULL DEFAULT '',
-  `ACTION_TIMING` varchar(6) NOT NULL DEFAULT '',
-  `ACTION_REFERENCE_OLD_TABLE` varchar(64) DEFAULT NULL,
-  `ACTION_REFERENCE_NEW_TABLE` varchar(64) DEFAULT NULL,
-  `ACTION_REFERENCE_OLD_ROW` varchar(3) NOT NULL DEFAULT '',
-  `ACTION_REFERENCE_NEW_ROW` varchar(3) NOT NULL DEFAULT '',
-  `CREATED` datetime(2) DEFAULT NULL,
-  `SQL_MODE` varchar(8192) NOT NULL DEFAULT '',
-  `DEFINER` varchar(384) NOT NULL DEFAULT '',
-  `CHARACTER_SET_CLIENT` varchar(32) NOT NULL DEFAULT '',
-  `COLLATION_CONNECTION` varchar(32) NOT NULL DEFAULT '',
-  `DATABASE_COLLATION` varchar(32) NOT NULL DEFAULT ''
+  `TRIGGER_CATALOG` varchar(512) NOT NULL,
+  `TRIGGER_SCHEMA` varchar(64) NOT NULL,
+  `TRIGGER_NAME` varchar(64) NOT NULL,
+  `EVENT_MANIPULATION` varchar(6) NOT NULL,
+  `EVENT_OBJECT_CATALOG` varchar(512) NOT NULL,
+  `EVENT_OBJECT_SCHEMA` varchar(64) NOT NULL,
+  `EVENT_OBJECT_TABLE` varchar(64) NOT NULL,
+  `ACTION_ORDER` bigint(4) NOT NULL,
+  `ACTION_CONDITION` longtext,
+  `ACTION_STATEMENT` longtext NOT NULL,
+  `ACTION_ORIENTATION` varchar(9) NOT NULL,
+  `ACTION_TIMING` varchar(6) NOT NULL,
+  `ACTION_REFERENCE_OLD_TABLE` varchar(64),
+  `ACTION_REFERENCE_NEW_TABLE` varchar(64),
+  `ACTION_REFERENCE_OLD_ROW` varchar(3) NOT NULL,
+  `ACTION_REFERENCE_NEW_ROW` varchar(3) NOT NULL,
+  `CREATED` datetime(2),
+  `SQL_MODE` varchar(8192) NOT NULL,
+  `DEFINER` varchar(384) NOT NULL,
+  `CHARACTER_SET_CLIENT` varchar(32) NOT NULL,
+  `COLLATION_CONNECTION` varchar(32) NOT NULL,
+  `DATABASE_COLLATION` varchar(32) NOT NULL
 )  DEFAULT CHARSET=utf8mb3
 SHOW COLUMNS FROM information_schema.TRIGGERS;
 Field	Type	Null	Key	Default	Extra
-TRIGGER_CATALOG	varchar(512)	NO			
-TRIGGER_SCHEMA	varchar(64)	NO			
-TRIGGER_NAME	varchar(64)	NO			
-EVENT_MANIPULATION	varchar(6)	NO			
-EVENT_OBJECT_CATALOG	varchar(512)	NO			
-EVENT_OBJECT_SCHEMA	varchar(64)	NO			
-EVENT_OBJECT_TABLE	varchar(64)	NO			
-ACTION_ORDER	bigint(4)	NO		0	
+TRIGGER_CATALOG	varchar(512)	NO		NULL	
+TRIGGER_SCHEMA	varchar(64)	NO		NULL	
+TRIGGER_NAME	varchar(64)	NO		NULL	
+EVENT_MANIPULATION	varchar(6)	NO		NULL	
+EVENT_OBJECT_CATALOG	varchar(512)	NO		NULL	
+EVENT_OBJECT_SCHEMA	varchar(64)	NO		NULL	
+EVENT_OBJECT_TABLE	varchar(64)	NO		NULL	
+ACTION_ORDER	bigint(4)	NO		NULL	
 ACTION_CONDITION	longtext	YES		NULL	
-ACTION_STATEMENT	longtext	NO			
-ACTION_ORIENTATION	varchar(9)	NO			
-ACTION_TIMING	varchar(6)	NO			
+ACTION_STATEMENT	longtext	NO		NULL	
+ACTION_ORIENTATION	varchar(9)	NO		NULL	
+ACTION_TIMING	varchar(6)	NO		NULL	
 ACTION_REFERENCE_OLD_TABLE	varchar(64)	YES		NULL	
 ACTION_REFERENCE_NEW_TABLE	varchar(64)	YES		NULL	
-ACTION_REFERENCE_OLD_ROW	varchar(3)	NO			
-ACTION_REFERENCE_NEW_ROW	varchar(3)	NO			
+ACTION_REFERENCE_OLD_ROW	varchar(3)	NO		NULL	
+ACTION_REFERENCE_NEW_ROW	varchar(3)	NO		NULL	
 CREATED	datetime(2)	YES		NULL	
-SQL_MODE	varchar(8192)	NO			
-DEFINER	varchar(384)	NO			
-CHARACTER_SET_CLIENT	varchar(32)	NO			
-COLLATION_CONNECTION	varchar(32)	NO			
-DATABASE_COLLATION	varchar(32)	NO			
+SQL_MODE	varchar(8192)	NO		NULL	
+DEFINER	varchar(384)	NO		NULL	
+CHARACTER_SET_CLIENT	varchar(32)	NO		NULL	
+COLLATION_CONNECTION	varchar(32)	NO		NULL	
+DATABASE_COLLATION	varchar(32)	NO		NULL	
 SELECT * FROM information_schema.triggers
 WHERE trigger_catalog IS NOT NULL OR event_object_catalog IS NOT NULL
 OR action_condition IS NOT NULL OR action_reference_old_table IS NOT NULL
diff --git a/mysql-test/suite/funcs_1/r/is_user_privileges.result b/mysql-test/suite/funcs_1/r/is_user_privileges.result
index 4363b2851e7..2105642e1c4 100644
--- a/mysql-test/suite/funcs_1/r/is_user_privileges.result
+++ b/mysql-test/suite/funcs_1/r/is_user_privileges.result
@@ -28,24 +28,24 @@ DROP FUNCTION test.f1;
 #########################################################################
 DESCRIBE          information_schema.USER_PRIVILEGES;
 Field	Type	Null	Key	Default	Extra
-GRANTEE	varchar(385)	NO			
-TABLE_CATALOG	varchar(512)	NO			
-PRIVILEGE_TYPE	varchar(64)	NO			
-IS_GRANTABLE	varchar(3)	NO			
+GRANTEE	varchar(385)	NO		NULL	
+TABLE_CATALOG	varchar(512)	NO		NULL	
+PRIVILEGE_TYPE	varchar(64)	NO		NULL	
+IS_GRANTABLE	varchar(3)	NO		NULL	
 SHOW CREATE TABLE information_schema.USER_PRIVILEGES;
 Table	Create Table
 USER_PRIVILEGES	CREATE TEMPORARY TABLE `USER_PRIVILEGES` (
-  `GRANTEE` varchar(385) NOT NULL DEFAULT '',
-  `TABLE_CATALOG` varchar(512) NOT NULL DEFAULT '',
-  `PRIVILEGE_TYPE` varchar(64) NOT NULL DEFAULT '',
-  `IS_GRANTABLE` varchar(3) NOT NULL DEFAULT ''
+  `GRANTEE` varchar(385) NOT NULL,
+  `TABLE_CATALOG` varchar(512) NOT NULL,
+  `PRIVILEGE_TYPE` varchar(64) NOT NULL,
+  `IS_GRANTABLE` varchar(3) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
 SHOW COLUMNS FROM information_schema.USER_PRIVILEGES;
 Field	Type	Null	Key	Default	Extra
-GRANTEE	varchar(385)	NO			
-TABLE_CATALOG	varchar(512)	NO			
-PRIVILEGE_TYPE	varchar(64)	NO			
-IS_GRANTABLE	varchar(3)	NO			
+GRANTEE	varchar(385)	NO		NULL	
+TABLE_CATALOG	varchar(512)	NO		NULL	
+PRIVILEGE_TYPE	varchar(64)	NO		NULL	
+IS_GRANTABLE	varchar(3)	NO		NULL	
 SELECT grantee, table_catalog, privilege_type
 FROM information_schema.user_privileges
 WHERE table_catalog IS NULL OR table_catalog <> 'def';
diff --git a/mysql-test/suite/funcs_1/r/is_views.result b/mysql-test/suite/funcs_1/r/is_views.result
index 2f0068a29f7..61c1f87023f 100644
--- a/mysql-test/suite/funcs_1/r/is_views.result
+++ b/mysql-test/suite/funcs_1/r/is_views.result
@@ -28,45 +28,45 @@ DROP FUNCTION test.f1;
 #########################################################################
 DESCRIBE          information_schema.VIEWS;
 Field	Type	Null	Key	Default	Extra
-TABLE_CATALOG	varchar(512)	NO			
-TABLE_SCHEMA	varchar(64)	NO			
-TABLE_NAME	varchar(64)	NO			
-VIEW_DEFINITION	longtext	NO			
-CHECK_OPTION	varchar(8)	NO			
-IS_UPDATABLE	varchar(3)	NO			
-DEFINER	varchar(384)	NO			
-SECURITY_TYPE	varchar(7)	NO			
-CHARACTER_SET_CLIENT	varchar(32)	NO			
-COLLATION_CONNECTION	varchar(32)	NO			
-ALGORITHM	varchar(10)	NO			
+TABLE_CATALOG	varchar(512)	NO		NULL	
+TABLE_SCHEMA	varchar(64)	NO		NULL	
+TABLE_NAME	varchar(64)	NO		NULL	
+VIEW_DEFINITION	longtext	NO		NULL	
+CHECK_OPTION	varchar(8)	NO		NULL	
+IS_UPDATABLE	varchar(3)	NO		NULL	
+DEFINER	varchar(384)	NO		NULL	
+SECURITY_TYPE	varchar(7)	NO		NULL	
+CHARACTER_SET_CLIENT	varchar(32)	NO		NULL	
+COLLATION_CONNECTION	varchar(32)	NO		NULL	
+ALGORITHM	varchar(10)	NO		NULL	
 SHOW CREATE TABLE information_schema.VIEWS;
 Table	Create Table
 VIEWS	CREATE TEMPORARY TABLE `VIEWS` (
-  `TABLE_CATALOG` varchar(512) NOT NULL DEFAULT '',
-  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `VIEW_DEFINITION` longtext NOT NULL DEFAULT '',
-  `CHECK_OPTION` varchar(8) NOT NULL DEFAULT '',
-  `IS_UPDATABLE` varchar(3) NOT NULL DEFAULT '',
-  `DEFINER` varchar(384) NOT NULL DEFAULT '',
-  `SECURITY_TYPE` varchar(7) NOT NULL DEFAULT '',
-  `CHARACTER_SET_CLIENT` varchar(32) NOT NULL DEFAULT '',
-  `COLLATION_CONNECTION` varchar(32) NOT NULL DEFAULT '',
-  `ALGORITHM` varchar(10) NOT NULL DEFAULT ''
+  `TABLE_CATALOG` varchar(512) NOT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL,
+  `TABLE_NAME` varchar(64) NOT NULL,
+  `VIEW_DEFINITION` longtext NOT NULL,
+  `CHECK_OPTION` varchar(8) NOT NULL,
+  `IS_UPDATABLE` varchar(3) NOT NULL,
+  `DEFINER` varchar(384) NOT NULL,
+  `SECURITY_TYPE` varchar(7) NOT NULL,
+  `CHARACTER_SET_CLIENT` varchar(32) NOT NULL,
+  `COLLATION_CONNECTION` varchar(32) NOT NULL,
+  `ALGORITHM` varchar(10) NOT NULL
 )  DEFAULT CHARSET=utf8mb3
 SHOW COLUMNS FROM information_schema.VIEWS;
 Field	Type	Null	Key	Default	Extra
-TABLE_CATALOG	varchar(512)	NO			
-TABLE_SCHEMA	varchar(64)	NO			
-TABLE_NAME	varchar(64)	NO			
-VIEW_DEFINITION	longtext	NO			
-CHECK_OPTION	varchar(8)	NO			
-IS_UPDATABLE	varchar(3)	NO			
-DEFINER	varchar(384)	NO			
-SECURITY_TYPE	varchar(7)	NO			
-CHARACTER_SET_CLIENT	varchar(32)	NO			
-COLLATION_CONNECTION	varchar(32)	NO			
-ALGORITHM	varchar(10)	NO			
+TABLE_CATALOG	varchar(512)	NO		NULL	
+TABLE_SCHEMA	varchar(64)	NO		NULL	
+TABLE_NAME	varchar(64)	NO		NULL	
+VIEW_DEFINITION	longtext	NO		NULL	
+CHECK_OPTION	varchar(8)	NO		NULL	
+IS_UPDATABLE	varchar(3)	NO		NULL	
+DEFINER	varchar(384)	NO		NULL	
+SECURITY_TYPE	varchar(7)	NO		NULL	
+CHARACTER_SET_CLIENT	varchar(32)	NO		NULL	
+COLLATION_CONNECTION	varchar(32)	NO		NULL	
+ALGORITHM	varchar(10)	NO		NULL	
 SELECT table_catalog, table_schema, table_name
 FROM information_schema.views WHERE table_catalog <> 'def';
 table_catalog	table_schema	table_name
diff --git a/mysql-test/suite/funcs_1/r/is_views_embedded.result b/mysql-test/suite/funcs_1/r/is_views_embedded.result
index 31950041635..d2fafe995de 100644
--- a/mysql-test/suite/funcs_1/r/is_views_embedded.result
+++ b/mysql-test/suite/funcs_1/r/is_views_embedded.result
@@ -28,45 +28,45 @@ DROP FUNCTION test.f1;
 #########################################################################
 DESCRIBE          information_schema.VIEWS;
 Field	Type	Null	Key	Default	Extra
-TABLE_CATALOG	varchar(512)	NO			
-TABLE_SCHEMA	varchar(64)	NO			
-TABLE_NAME	varchar(64)	NO			
-VIEW_DEFINITION	longtext	NO			
-CHECK_OPTION	varchar(8)	NO			
-IS_UPDATABLE	varchar(3)	NO			
-DEFINER	varchar(384)	NO			
-SECURITY_TYPE	varchar(7)	NO			
-CHARACTER_SET_CLIENT	varchar(32)	NO			
-COLLATION_CONNECTION	varchar(32)	NO			
-ALGORITHM	varchar(10)	NO			
+TABLE_CATALOG	varchar(512)	NO		NULL	
+TABLE_SCHEMA	varchar(64)	NO		NULL	
+TABLE_NAME	varchar(64)	NO		NULL	
+VIEW_DEFINITION	longtext	NO		NULL	
+CHECK_OPTION	varchar(8)	NO		NULL	
+IS_UPDATABLE	varchar(3)	NO		NULL	
+DEFINER	varchar(384)	NO		NULL	
+SECURITY_TYPE	varchar(7)	NO		NULL	
+CHARACTER_SET_CLIENT	varchar(32)	NO		NULL	
+COLLATION_CONNECTION	varchar(32)	NO		NULL	
+ALGORITHM	varchar(10)	NO		NULL	
 SHOW CREATE TABLE information_schema.VIEWS;
 Table	Create Table
 VIEWS	CREATE TEMPORARY TABLE `VIEWS` (
-  `TABLE_CATALOG` varchar(512) NOT NULL DEFAULT '',
-  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `VIEW_DEFINITION` longtext NOT NULL DEFAULT '',
-  `CHECK_OPTION` varchar(8) NOT NULL DEFAULT '',
-  `IS_UPDATABLE` varchar(3) NOT NULL DEFAULT '',
-  `DEFINER` varchar(384) NOT NULL DEFAULT '',
-  `SECURITY_TYPE` varchar(7) NOT NULL DEFAULT '',
-  `CHARACTER_SET_CLIENT` varchar(32) NOT NULL DEFAULT '',
-  `COLLATION_CONNECTION` varchar(32) NOT NULL DEFAULT '',
-  `ALGORITHM` varchar(10) NOT NULL DEFAULT ''
+  `TABLE_CATALOG` varchar(512) NOT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL,
+  `TABLE_NAME` varchar(64) NOT NULL,
+  `VIEW_DEFINITION` longtext NOT NULL,
+  `CHECK_OPTION` varchar(8) NOT NULL,
+  `IS_UPDATABLE` varchar(3) NOT NULL,
+  `DEFINER` varchar(384) NOT NULL,
+  `SECURITY_TYPE` varchar(7) NOT NULL,
+  `CHARACTER_SET_CLIENT` varchar(32) NOT NULL,
+  `COLLATION_CONNECTION` varchar(32) NOT NULL,
+  `ALGORITHM` varchar(10) NOT NULL
 )  DEFAULT CHARSET=utf8mb3
 SHOW COLUMNS FROM information_schema.VIEWS;
 Field	Type	Null	Key	Default	Extra
-TABLE_CATALOG	varchar(512)	NO			
-TABLE_SCHEMA	varchar(64)	NO			
-TABLE_NAME	varchar(64)	NO			
-VIEW_DEFINITION	longtext	NO			
-CHECK_OPTION	varchar(8)	NO			
-IS_UPDATABLE	varchar(3)	NO			
-DEFINER	varchar(384)	NO			
-SECURITY_TYPE	varchar(7)	NO			
-CHARACTER_SET_CLIENT	varchar(32)	NO			
-COLLATION_CONNECTION	varchar(32)	NO			
-ALGORITHM	varchar(10)	NO			
+TABLE_CATALOG	varchar(512)	NO		NULL	
+TABLE_SCHEMA	varchar(64)	NO		NULL	
+TABLE_NAME	varchar(64)	NO		NULL	
+VIEW_DEFINITION	longtext	NO		NULL	
+CHECK_OPTION	varchar(8)	NO		NULL	
+IS_UPDATABLE	varchar(3)	NO		NULL	
+DEFINER	varchar(384)	NO		NULL	
+SECURITY_TYPE	varchar(7)	NO		NULL	
+CHARACTER_SET_CLIENT	varchar(32)	NO		NULL	
+COLLATION_CONNECTION	varchar(32)	NO		NULL	
+ALGORITHM	varchar(10)	NO		NULL	
 SELECT table_catalog, table_schema, table_name
 FROM information_schema.views WHERE table_catalog <> 'def';
 table_catalog	table_schema	table_name
diff --git a/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result b/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
index c70389ad65e..43ce4046fba 100644
--- a/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
+++ b/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
@@ -24,24 +24,24 @@ connection default;
 SHOW CREATE TABLE processlist;
 Table	Create Table
 PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
-  `ID` bigint(4) NOT NULL DEFAULT 0,
-  `USER` varchar(128) NOT NULL DEFAULT '',
-  `HOST` varchar(64) NOT NULL DEFAULT '',
-  `DB` varchar(64) DEFAULT NULL,
-  `COMMAND` varchar(16) NOT NULL DEFAULT '',
-  `TIME` int(7) NOT NULL DEFAULT 0,
-  `STATE` varchar(64) DEFAULT NULL,
-  `INFO` longtext DEFAULT NULL,
-  `TIME_MS` decimal(22,3) NOT NULL DEFAULT 0.000,
-  `STAGE` tinyint(2) NOT NULL DEFAULT 0,
-  `MAX_STAGE` tinyint(2) NOT NULL DEFAULT 0,
-  `PROGRESS` decimal(7,3) NOT NULL DEFAULT 0.000,
-  `MEMORY_USED` bigint(7) NOT NULL DEFAULT 0,
-  `MAX_MEMORY_USED` bigint(7) NOT NULL DEFAULT 0,
-  `EXAMINED_ROWS` int(7) NOT NULL DEFAULT 0,
-  `QUERY_ID` bigint(4) NOT NULL DEFAULT 0,
-  `INFO_BINARY` blob DEFAULT NULL,
-  `TID` bigint(4) NOT NULL DEFAULT 0
+  `ID` bigint(4) NOT NULL,
+  `USER` varchar(128) NOT NULL,
+  `HOST` varchar(64) NOT NULL,
+  `DB` varchar(64),
+  `COMMAND` varchar(16) NOT NULL,
+  `TIME` int(7) NOT NULL,
+  `STATE` varchar(64),
+  `INFO` longtext,
+  `TIME_MS` decimal(22,3) NOT NULL,
+  `STAGE` tinyint(2) NOT NULL,
+  `MAX_STAGE` tinyint(2) NOT NULL,
+  `PROGRESS` decimal(7,3) NOT NULL,
+  `MEMORY_USED` bigint(7) NOT NULL,
+  `MAX_MEMORY_USED` bigint(7) NOT NULL,
+  `EXAMINED_ROWS` int(7) NOT NULL,
+  `QUERY_ID` bigint(4) NOT NULL,
+  `INFO_BINARY` blob,
+  `TID` bigint(4) NOT NULL
 )  DEFAULT CHARSET=utf8mb3
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info	Progress
@@ -104,24 +104,24 @@ SHOW/SELECT shows only the processes (1) of the user.
 SHOW CREATE TABLE processlist;
 Table	Create Table
 PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
-  `ID` bigint(4) NOT NULL DEFAULT 0,
-  `USER` varchar(128) NOT NULL DEFAULT '',
-  `HOST` varchar(64) NOT NULL DEFAULT '',
-  `DB` varchar(64) DEFAULT NULL,
-  `COMMAND` varchar(16) NOT NULL DEFAULT '',
-  `TIME` int(7) NOT NULL DEFAULT 0,
-  `STATE` varchar(64) DEFAULT NULL,
-  `INFO` longtext DEFAULT NULL,
-  `TIME_MS` decimal(22,3) NOT NULL DEFAULT 0.000,
-  `STAGE` tinyint(2) NOT NULL DEFAULT 0,
-  `MAX_STAGE` tinyint(2) NOT NULL DEFAULT 0,
-  `PROGRESS` decimal(7,3) NOT NULL DEFAULT 0.000,
-  `MEMORY_USED` bigint(7) NOT NULL DEFAULT 0,
-  `MAX_MEMORY_USED` bigint(7) NOT NULL DEFAULT 0,
-  `EXAMINED_ROWS` int(7) NOT NULL DEFAULT 0,
-  `QUERY_ID` bigint(4) NOT NULL DEFAULT 0,
-  `INFO_BINARY` blob DEFAULT NULL,
-  `TID` bigint(4) NOT NULL DEFAULT 0
+  `ID` bigint(4) NOT NULL,
+  `USER` varchar(128) NOT NULL,
+  `HOST` varchar(64) NOT NULL,
+  `DB` varchar(64),
+  `COMMAND` varchar(16) NOT NULL,
+  `TIME` int(7) NOT NULL,
+  `STATE` varchar(64),
+  `INFO` longtext,
+  `TIME_MS` decimal(22,3) NOT NULL,
+  `STAGE` tinyint(2) NOT NULL,
+  `MAX_STAGE` tinyint(2) NOT NULL,
+  `PROGRESS` decimal(7,3) NOT NULL,
+  `MEMORY_USED` bigint(7) NOT NULL,
+  `MAX_MEMORY_USED` bigint(7) NOT NULL,
+  `EXAMINED_ROWS` int(7) NOT NULL,
+  `QUERY_ID` bigint(4) NOT NULL,
+  `INFO_BINARY` blob,
+  `TID` bigint(4) NOT NULL
 )  DEFAULT CHARSET=utf8mb3
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info	Progress
diff --git a/mysql-test/suite/funcs_1/r/processlist_priv_ps.result b/mysql-test/suite/funcs_1/r/processlist_priv_ps.result
index b3077fa4a7e..a2ef23ebfe9 100644
--- a/mysql-test/suite/funcs_1/r/processlist_priv_ps.result
+++ b/mysql-test/suite/funcs_1/r/processlist_priv_ps.result
@@ -24,24 +24,24 @@ connection default;
 SHOW CREATE TABLE processlist;
 Table	Create Table
 PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
-  `ID` bigint(4) NOT NULL DEFAULT 0,
-  `USER` varchar(128) NOT NULL DEFAULT '',
-  `HOST` varchar(64) NOT NULL DEFAULT '',
-  `DB` varchar(64) DEFAULT NULL,
-  `COMMAND` varchar(16) NOT NULL DEFAULT '',
-  `TIME` int(7) NOT NULL DEFAULT 0,
-  `STATE` varchar(64) DEFAULT NULL,
-  `INFO` longtext DEFAULT NULL,
-  `TIME_MS` decimal(22,3) NOT NULL DEFAULT 0.000,
-  `STAGE` tinyint(2) NOT NULL DEFAULT 0,
-  `MAX_STAGE` tinyint(2) NOT NULL DEFAULT 0,
-  `PROGRESS` decimal(7,3) NOT NULL DEFAULT 0.000,
-  `MEMORY_USED` bigint(7) NOT NULL DEFAULT 0,
-  `MAX_MEMORY_USED` bigint(7) NOT NULL DEFAULT 0,
-  `EXAMINED_ROWS` int(7) NOT NULL DEFAULT 0,
-  `QUERY_ID` bigint(4) NOT NULL DEFAULT 0,
-  `INFO_BINARY` blob DEFAULT NULL,
-  `TID` bigint(4) NOT NULL DEFAULT 0
+  `ID` bigint(4) NOT NULL,
+  `USER` varchar(128) NOT NULL,
+  `HOST` varchar(64) NOT NULL,
+  `DB` varchar(64),
+  `COMMAND` varchar(16) NOT NULL,
+  `TIME` int(7) NOT NULL,
+  `STATE` varchar(64),
+  `INFO` longtext,
+  `TIME_MS` decimal(22,3) NOT NULL,
+  `STAGE` tinyint(2) NOT NULL,
+  `MAX_STAGE` tinyint(2) NOT NULL,
+  `PROGRESS` decimal(7,3) NOT NULL,
+  `MEMORY_USED` bigint(7) NOT NULL,
+  `MAX_MEMORY_USED` bigint(7) NOT NULL,
+  `EXAMINED_ROWS` int(7) NOT NULL,
+  `QUERY_ID` bigint(4) NOT NULL,
+  `INFO_BINARY` blob,
+  `TID` bigint(4) NOT NULL
 )  DEFAULT CHARSET=utf8mb3
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info	Progress
@@ -104,24 +104,24 @@ SHOW/SELECT shows only the processes (1) of the user.
 SHOW CREATE TABLE processlist;
 Table	Create Table
 PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
-  `ID` bigint(4) NOT NULL DEFAULT 0,
-  `USER` varchar(128) NOT NULL DEFAULT '',
-  `HOST` varchar(64) NOT NULL DEFAULT '',
-  `DB` varchar(64) DEFAULT NULL,
-  `COMMAND` varchar(16) NOT NULL DEFAULT '',
-  `TIME` int(7) NOT NULL DEFAULT 0,
-  `STATE` varchar(64) DEFAULT NULL,
-  `INFO` longtext DEFAULT NULL,
-  `TIME_MS` decimal(22,3) NOT NULL DEFAULT 0.000,
-  `STAGE` tinyint(2) NOT NULL DEFAULT 0,
-  `MAX_STAGE` tinyint(2) NOT NULL DEFAULT 0,
-  `PROGRESS` decimal(7,3) NOT NULL DEFAULT 0.000,
-  `MEMORY_USED` bigint(7) NOT NULL DEFAULT 0,
-  `MAX_MEMORY_USED` bigint(7) NOT NULL DEFAULT 0,
-  `EXAMINED_ROWS` int(7) NOT NULL DEFAULT 0,
-  `QUERY_ID` bigint(4) NOT NULL DEFAULT 0,
-  `INFO_BINARY` blob DEFAULT NULL,
-  `TID` bigint(4) NOT NULL DEFAULT 0
+  `ID` bigint(4) NOT NULL,
+  `USER` varchar(128) NOT NULL,
+  `HOST` varchar(64) NOT NULL,
+  `DB` varchar(64),
+  `COMMAND` varchar(16) NOT NULL,
+  `TIME` int(7) NOT NULL,
+  `STATE` varchar(64),
+  `INFO` longtext,
+  `TIME_MS` decimal(22,3) NOT NULL,
+  `STAGE` tinyint(2) NOT NULL,
+  `MAX_STAGE` tinyint(2) NOT NULL,
+  `PROGRESS` decimal(7,3) NOT NULL,
+  `MEMORY_USED` bigint(7) NOT NULL,
+  `MAX_MEMORY_USED` bigint(7) NOT NULL,
+  `EXAMINED_ROWS` int(7) NOT NULL,
+  `QUERY_ID` bigint(4) NOT NULL,
+  `INFO_BINARY` blob,
+  `TID` bigint(4) NOT NULL
 )  DEFAULT CHARSET=utf8mb3
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info	Progress
diff --git a/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result b/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
index 34dbd6b92ee..b0305a80b46 100644
--- a/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
+++ b/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
@@ -12,24 +12,24 @@ USE test;
 SHOW CREATE TABLE INFORMATION_SCHEMA.PROCESSLIST;
 Table	Create Table
 PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
-  `ID` bigint(4) NOT NULL DEFAULT 0,
-  `USER` varchar(128) NOT NULL DEFAULT '',
-  `HOST` varchar(64) NOT NULL DEFAULT '',
-  `DB` varchar(64) DEFAULT NULL,
-  `COMMAND` varchar(16) NOT NULL DEFAULT '',
-  `TIME` int(7) NOT NULL DEFAULT 0,
-  `STATE` varchar(64) DEFAULT NULL,
-  `INFO` longtext DEFAULT NULL,
-  `TIME_MS` decimal(22,3) NOT NULL DEFAULT 0.000,
-  `STAGE` tinyint(2) NOT NULL DEFAULT 0,
-  `MAX_STAGE` tinyint(2) NOT NULL DEFAULT 0,
-  `PROGRESS` decimal(7,3) NOT NULL DEFAULT 0.000,
-  `MEMORY_USED` bigint(7) NOT NULL DEFAULT 0,
-  `MAX_MEMORY_USED` bigint(7) NOT NULL DEFAULT 0,
-  `EXAMINED_ROWS` int(7) NOT NULL DEFAULT 0,
-  `QUERY_ID` bigint(4) NOT NULL DEFAULT 0,
-  `INFO_BINARY` blob DEFAULT NULL,
-  `TID` bigint(4) NOT NULL DEFAULT 0
+  `ID` bigint(4) NOT NULL,
+  `USER` varchar(128) NOT NULL,
+  `HOST` varchar(64) NOT NULL,
+  `DB` varchar(64),
+  `COMMAND` varchar(16) NOT NULL,
+  `TIME` int(7) NOT NULL,
+  `STATE` varchar(64),
+  `INFO` longtext,
+  `TIME_MS` decimal(22,3) NOT NULL,
+  `STAGE` tinyint(2) NOT NULL,
+  `MAX_STAGE` tinyint(2) NOT NULL,
+  `PROGRESS` decimal(7,3) NOT NULL,
+  `MEMORY_USED` bigint(7) NOT NULL,
+  `MAX_MEMORY_USED` bigint(7) NOT NULL,
+  `EXAMINED_ROWS` int(7) NOT NULL,
+  `QUERY_ID` bigint(4) NOT NULL,
+  `INFO_BINARY` blob,
+  `TID` bigint(4) NOT NULL
 )  DEFAULT CHARSET=utf8mb3
 # Ensure that the information about the own connection is correct.
 #--------------------------------------------------------------------------
diff --git a/mysql-test/suite/funcs_1/r/processlist_val_ps.result b/mysql-test/suite/funcs_1/r/processlist_val_ps.result
index ba927bb60ee..7b840bd3996 100644
--- a/mysql-test/suite/funcs_1/r/processlist_val_ps.result
+++ b/mysql-test/suite/funcs_1/r/processlist_val_ps.result
@@ -12,24 +12,24 @@ USE test;
 SHOW CREATE TABLE INFORMATION_SCHEMA.PROCESSLIST;
 Table	Create Table
 PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
-  `ID` bigint(4) NOT NULL DEFAULT 0,
-  `USER` varchar(128) NOT NULL DEFAULT '',
-  `HOST` varchar(64) NOT NULL DEFAULT '',
-  `DB` varchar(64) DEFAULT NULL,
-  `COMMAND` varchar(16) NOT NULL DEFAULT '',
-  `TIME` int(7) NOT NULL DEFAULT 0,
-  `STATE` varchar(64) DEFAULT NULL,
-  `INFO` longtext DEFAULT NULL,
-  `TIME_MS` decimal(22,3) NOT NULL DEFAULT 0.000,
-  `STAGE` tinyint(2) NOT NULL DEFAULT 0,
-  `MAX_STAGE` tinyint(2) NOT NULL DEFAULT 0,
-  `PROGRESS` decimal(7,3) NOT NULL DEFAULT 0.000,
-  `MEMORY_USED` bigint(7) NOT NULL DEFAULT 0,
-  `MAX_MEMORY_USED` bigint(7) NOT NULL DEFAULT 0,
-  `EXAMINED_ROWS` int(7) NOT NULL DEFAULT 0,
-  `QUERY_ID` bigint(4) NOT NULL DEFAULT 0,
-  `INFO_BINARY` blob DEFAULT NULL,
-  `TID` bigint(4) NOT NULL DEFAULT 0
+  `ID` bigint(4) NOT NULL,
+  `USER` varchar(128) NOT NULL,
+  `HOST` varchar(64) NOT NULL,
+  `DB` varchar(64),
+  `COMMAND` varchar(16) NOT NULL,
+  `TIME` int(7) NOT NULL,
+  `STATE` varchar(64),
+  `INFO` longtext,
+  `TIME_MS` decimal(22,3) NOT NULL,
+  `STAGE` tinyint(2) NOT NULL,
+  `MAX_STAGE` tinyint(2) NOT NULL,
+  `PROGRESS` decimal(7,3) NOT NULL,
+  `MEMORY_USED` bigint(7) NOT NULL,
+  `MAX_MEMORY_USED` bigint(7) NOT NULL,
+  `EXAMINED_ROWS` int(7) NOT NULL,
+  `QUERY_ID` bigint(4) NOT NULL,
+  `INFO_BINARY` blob,
+  `TID` bigint(4) NOT NULL
 )  DEFAULT CHARSET=utf8mb3
 # Ensure that the information about the own connection is correct.
 #--------------------------------------------------------------------------
diff --git a/mysql-test/suite/funcs_1/t/is_columns_is_embedded.test b/mysql-test/suite/funcs_1/t/is_columns_is_embedded.test
index 9db247fd6fd..bb9cc2a6ffb 100644
--- a/mysql-test/suite/funcs_1/t/is_columns_is_embedded.test
+++ b/mysql-test/suite/funcs_1/t/is_columns_is_embedded.test
@@ -14,7 +14,7 @@
 #
 
 --source include/have_innodb.inc
---source include/is_embedded.inc
+--source include/is_embedded_no_privileges.inc
 
 let $my_where = WHERE table_schema = 'information_schema'
 AND table_name <> 'profiling' AND table_name not like 'innodb_%';
diff --git a/mysql-test/suite/funcs_1/t/is_columns_myisam_embedded.test b/mysql-test/suite/funcs_1/t/is_columns_myisam_embedded.test
index 9e31190c008..3679cdebbe2 100644
--- a/mysql-test/suite/funcs_1/t/is_columns_myisam_embedded.test
+++ b/mysql-test/suite/funcs_1/t/is_columns_myisam_embedded.test
@@ -10,10 +10,8 @@
 # 2008-06-06 mleich Create this this variant for the embedded server.
 #
 
-if (`SELECT VERSION() NOT LIKE '%embedded%'`)
-{
-   --skip Test requires: embedded server
-}
+--source include/is_embedded_no_privileges.inc
+
 let $engine_type= MyISAM;
 --enable_prepare_warnings
 SET @@session.sql_mode = 'NO_ENGINE_SUBSTITUTION';
diff --git a/mysql-test/suite/funcs_1/t/is_columns_mysql_embedded.test b/mysql-test/suite/funcs_1/t/is_columns_mysql_embedded.test
index d1ed45425ec..9ef1b6d869a 100644
--- a/mysql-test/suite/funcs_1/t/is_columns_mysql_embedded.test
+++ b/mysql-test/suite/funcs_1/t/is_columns_mysql_embedded.test
@@ -10,10 +10,7 @@
 # 2008-06-06 mleich Create this variant for the embedded server
 #
 
-if (`SELECT VERSION() NOT LIKE '%embedded%'`)
-{
-   --skip Test requires: embedded server
-}
+--source include/is_embedded_no_privileges.inc
 
 let $my_where = WHERE table_schema = 'mysql';
 --source suite/funcs_1/datadict/columns.inc
diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def
index c00bc326bca..1e38075de0d 100644
--- a/mysql-test/suite/galera/disabled.def
+++ b/mysql-test/suite/galera/disabled.def
@@ -12,7 +12,6 @@
 
 GCF-1081 : MDEV-18283 Galera test failure on galera.GCF-1081
 GCF-939 : MDEV-21520 galera.GCF-939
-MDEV-20225 : MDEV-20886 galera.MDEV-20225
 MW-328A : MDEV-22666 galera.MW-328A MTR failed: "Semaphore wait has lasted > 600 seconds" and do not release port 16002
 MW-328B : MDEV-22666 galera.MW-328A MTR failed: "Semaphore wait has lasted > 600 seconds" and do not release port 16002
 MW-328D : MDEV-27550 ER_LOCK_DEADLOCK is gone after MDEV-27025
@@ -41,7 +40,6 @@ galera_var_node_address : MDEV-20485 Galera test failure
 galera_var_notify_cmd : MDEV-21905 Galera test galera_var_notify_cmd causes hang
 galera_var_retry_autocommit: MDEV-18181 Galera test failure on galera.galera_var_retry_autocommit
 galera_wsrep_provider_unset_set: wsrep_provider is read-only for security reasons
-mysql-wsrep#198 : MDEV-24446: galera.mysql-wsrep#198 MTR failed: query 'reap' failed: 2000: Unknown MySQL error
 partition : MDEV-19958 Galera test failure on galera.partition
 pxc-421: wsrep_provider is read-only for security reasons
 query_cache: MDEV-15805 Test failure on galera.query_cache
diff --git a/mysql-test/suite/galera/r/MDEV-10715.result b/mysql-test/suite/galera/r/MDEV-10715.result
index 5ab60f08097..12b9c2367c4 100644
--- a/mysql-test/suite/galera/r/MDEV-10715.result
+++ b/mysql-test/suite/galera/r/MDEV-10715.result
@@ -26,3 +26,5 @@ wsrep_last_written_gtid()
 1-1-0
 connection node_1;
 drop table t1;
+connection node_2;
+CALL mtr.add_suppression("Ignoring server id for non bootstrap node");
diff --git a/mysql-test/suite/galera/r/MDEV-20225.result b/mysql-test/suite/galera/r/MDEV-20225.result
index 9f20daed9de..245051309d1 100644
--- a/mysql-test/suite/galera/r/MDEV-20225.result
+++ b/mysql-test/suite/galera/r/MDEV-20225.result
@@ -11,11 +11,12 @@ DROP TRIGGER tr1;
 connection node_2;
 connection node_1;
 INSERT INTO t1 VALUES (NULL);
-connection node_2;
+connection node_2a;
 SET GLOBAL debug_dbug = 'RESET';
 SET DEBUG_SYNC = 'now SIGNAL signal.mdev_20225_continue';
 SET DEBUG_SYNC = 'RESET';
 SET GLOBAL wsrep_slave_threads = 1;
+connection node_2;
 SHOW TRIGGERS;
 Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera/r/MDEV-25494.result b/mysql-test/suite/galera/r/MDEV-25494.result
new file mode 100644
index 00000000000..e889fecc42e
--- /dev/null
+++ b/mysql-test/suite/galera/r/MDEV-25494.result
@@ -0,0 +1,14 @@
+connection node_2;
+connection node_1;
+SET SESSION binlog_format=STATEMENT;
+Warnings:
+Warning	1105	MariaDB Galera and flashback do not support binlog format: STATEMENT
+CREATE TEMPORARY TABLE t (i INT) UNION=(t);
+ALTER TABLE t ADD extrac CHAR(1);
+SHOW CREATE TABLE t;
+Table	Create Table
+t	CREATE TEMPORARY TABLE `t` (
+  `i` int(11) DEFAULT NULL,
+  `extrac` char(1) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+DROP TABLE t;
diff --git a/mysql-test/suite/galera/r/enforce_storage_engine2.result b/mysql-test/suite/galera/r/enforce_storage_engine2.result
index 8b174139eae..e0fb8d867dc 100644
--- a/mysql-test/suite/galera/r/enforce_storage_engine2.result
+++ b/mysql-test/suite/galera/r/enforce_storage_engine2.result
@@ -9,6 +9,7 @@ CREATE TABLE t1(i INT) ENGINE=INNODB;
 CREATE TABLE t2(i INT) ENGINE=MYISAM;
 Warnings:
 Note	1266	Using storage engine InnoDB for table 't2'
+Note	1266	Using storage engine InnoDB for table 't2'
 connection node_2;
 SHOW TABLES;
 Tables_in_test
diff --git a/mysql-test/suite/galera/r/galera-features#117.result b/mysql-test/suite/galera/r/galera-features#117.result
index 583f3c74a8b..a5233b9ae30 100644
--- a/mysql-test/suite/galera/r/galera-features#117.result
+++ b/mysql-test/suite/galera/r/galera-features#117.result
@@ -1,5 +1,7 @@
 connection node_2;
 connection node_1;
+connection node_1;
+connection node_2;
 connection node_2;
 SET SESSION wsrep_on=OFF;
 CREATE TABLE test.t1 (f2 INTEGER);
@@ -35,3 +37,4 @@ Killing server ...
 CALL mtr.add_suppression("Inconsistent by consensus.");
 CALL mtr.add_suppression("WSREP: Failed to execute TOI action");
 CALL mtr.add_suppression("WSREP: TO isolation end failed");
+connection node_1;
diff --git a/mysql-test/suite/galera/r/galera_create_table_like.result b/mysql-test/suite/galera/r/galera_create_table_like.result
index 82543331ad5..d1633077dcb 100644
--- a/mysql-test/suite/galera/r/galera_create_table_like.result
+++ b/mysql-test/suite/galera/r/galera_create_table_like.result
@@ -49,3 +49,8 @@ DROP TABLE schema2.real_table2;
 DROP TABLE schema2.real_table3;
 DROP SCHEMA schema1;
 DROP SCHEMA schema2;
+use test;
+CREATE TEMPORARY TABLE t (c INT) ENGINE=mrg_myisam UNION=(t,t2) insert_method=FIRST;
+CREATE TABLE t2 LIKE t;
+ERROR HY000: Table 't' is differently defined or of non-MyISAM type or doesn't exist
+DROP TABLE t;
diff --git a/mysql-test/suite/galera/r/galera_ddl_fk_conflict.result b/mysql-test/suite/galera/r/galera_ddl_fk_conflict.result
index 5f09345b79b..03e84f9facd 100644
--- a/mysql-test/suite/galera/r/galera_ddl_fk_conflict.result
+++ b/mysql-test/suite/galera/r/galera_ddl_fk_conflict.result
@@ -7,389 +7,6 @@ connect node_1b, 127.0.0.1, root, , test, $NODE_MYPORT_1;
 connection node_1b;
 SET SESSION wsrep_sync_wait=0;
 ######################################################################
-# Test for OPTIMIZE 
-######################################################################
-######################################################################
-#
-# Scenario #1: DML working on FK parent table BF aborted by DDL
-#              over child table
-#
-######################################################################
-connection node_1;
-SET SESSION wsrep_sync_wait=0;
-CREATE TABLE p1 (pk INTEGER PRIMARY KEY, f2 CHAR(30));
-INSERT INTO p1 VALUES (1, 'INITIAL VALUE');
-CREATE TABLE p2 (pk INTEGER PRIMARY KEY, f2 CHAR(30));
-INSERT INTO p2 VALUES (1, 'INITIAL VALUE');
-INSERT INTO p2 VALUES (2, 'INITIAL VALUE');
-CREATE TABLE c1 (pk INTEGER PRIMARY KEY, fk INTEGER, FOREIGN KEY (fk) REFERENCES p1(pk));
-INSERT INTO c1 VALUES (1,1);
-CREATE TABLE c2 (pk INTEGER PRIMARY KEY, fk1 INTEGER, fk2 INTEGER, FOREIGN KEY (fk1) REFERENCES p1(pk), FOREIGN KEY (fk2) REFERENCES p2(pk));
-INSERT INTO c2 VALUES (1,1,1), (2,1,2);
-connection node_1;
-SET AUTOCOMMIT=ON;
-START TRANSACTION;
-UPDATE p1 SET f2 = 'TO DEADLOCK' WHERE pk = 1;
-connection node_2;
-SET SESSION wsrep_sync_wait=0;
-OPTIMIZE TABLE c1 ;
-Table	Op	Msg_type	Msg_text
-test.c1	optimize	note	Table does not support optimize, doing recreate + analyze instead
-test.c1	optimize	status	OK
-connection node_1;
-COMMIT;
-ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
-SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE';
-EXPECT_1
-1
-SELECT COUNT(*) AS EXPECT_2 FROM p2 WHERE f2 = 'INITIAL VALUE';
-EXPECT_2
-2
-connection node_2;
-SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE';
-EXPECT_1
-1
-SELECT COUNT(*) AS EXPECT_2 FROM p2 WHERE f2 = 'INITIAL VALUE';
-EXPECT_2
-2
-######################################################################
-#
-# Scenario #2: DML working on FK parent table tries to replicate, but
-#              fails in certification for earlier DDL on child table
-#
-######################################################################
-connection node_1;
-BEGIN;
-SET GLOBAL wsrep_provider_options = 'dbug=d,apply_monitor_slave_enter_sync';
-connection node_2;
-OPTIMIZE TABLE c1 ;
-Table	Op	Msg_type	Msg_text
-test.c1	optimize	note	Table does not support optimize, doing recreate + analyze instead
-test.c1	optimize	status	OK
-connection node_1a;
-SET SESSION wsrep_on = 0;
-SET SESSION wsrep_on = 1;
-SET GLOBAL wsrep_provider_options = 'dbug=';
-connection node_1;
-UPDATE p1 SET f2 = 'TO DEADLOCK' WHERE pk = 1;
-COMMIT;
-connection node_1a;
-SET GLOBAL wsrep_provider_options = 'signal=apply_monitor_slave_enter_sync';
-connection node_1;
-ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
-SELECT 'I deadlocked';
-I deadlocked
-I deadlocked
-SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE';
-EXPECT_1
-1
-SELECT COUNT(*) AS EXPECT_2 FROM p2 WHERE f2 = 'INITIAL VALUE';
-EXPECT_2
-2
-connection node_2;
-SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE';
-EXPECT_1
-1
-SELECT COUNT(*) AS EXPECT_2 FROM p2 WHERE f2 = 'INITIAL VALUE';
-EXPECT_2
-2
-######################################################################
-#
-# Scenario #3: 2 DMLs working on two FK parent tables try to replicate, 
-#              but fails in certification for earlier DDL on child table
-#              which is child to both FK parents 
-#
-######################################################################
-connection node_1;
-BEGIN;
-connection node_1b;
-BEGIN;
-connection node_1a;
-SET GLOBAL wsrep_provider_options = 'dbug=d,apply_monitor_slave_enter_sync';
-connection node_2;
-OPTIMIZE TABLE c2 ;
-Table	Op	Msg_type	Msg_text
-test.c2	optimize	note	Table does not support optimize, doing recreate + analyze instead
-test.c2	optimize	status	OK
-connection node_1a;
-SET SESSION wsrep_on = 0;
-SET SESSION wsrep_on = 1;
-SET GLOBAL wsrep_provider_options = 'dbug=';
-connection node_1;
-UPDATE p1 SET f2 = 'TO DEADLOCK' WHERE pk = 1;
-COMMIT;
-connection node_1b;
-UPDATE p2 SET f2 = 'TO DEADLOCK' WHERE pk = 2;
-COMMIT;
-connection node_1a;
-SET GLOBAL wsrep_provider_options = 'signal=apply_monitor_slave_enter_sync';
-connection node_1;
-ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
-SELECT 'I deadlocked';
-I deadlocked
-I deadlocked
-connection node_1b;
-ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
-SELECT 'I deadlocked';
-I deadlocked
-I deadlocked
-SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE';
-EXPECT_1
-1
-SELECT COUNT(*) AS EXPECT_2 FROM p2 WHERE f2 = 'INITIAL VALUE';
-EXPECT_2
-2
-connection node_2;
-SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE';
-EXPECT_1
-1
-SELECT COUNT(*) AS EXPECT_2 FROM p2 WHERE f2 = 'INITIAL VALUE';
-EXPECT_2
-2
-DROP TABLE c1, c2;
-DROP TABLE p1, p2;
-######################################################################
-# Test for OPTIMIZE 
-######################################################################
-connection node_1;
-SET SESSION wsrep_sync_wait=0;
-CREATE TABLE p1 (pk INTEGER PRIMARY KEY, f2 CHAR(30));
-INSERT INTO p1 VALUES (1, 'INITIAL VALUE');
-CREATE TABLE c1 (pk INTEGER PRIMARY KEY, fk INTEGER, FOREIGN KEY (fk) REFERENCES p1(pk));
-INSERT INTO c1 VALUES (1,1);
-######################################################################
-#
-# Scenario #4: DML working on FK parent table tries to replicate, but
-#              fails in certification for earlier DDL on child table
-#              and another temporary table. TMP table should be skipped
-#              but FK child table should be replicated with proper keys
-#
-######################################################################
-connection node_1;
-BEGIN;
-SET GLOBAL wsrep_provider_options = 'dbug=d,apply_monitor_slave_enter_sync';
-connection node_2;
-CREATE TEMPORARY TABLE tmp (i int);
-OPTIMIZE TABLE c1, tmp ;
-Table	Op	Msg_type	Msg_text
-test.c1	optimize	note	Table does not support optimize, doing recreate + analyze instead
-test.c1	optimize	status	OK
-test.tmp	optimize	note	Table does not support optimize, doing recreate + analyze instead
-test.tmp	optimize	status	OK
-DROP TABLE tmp;
-connection node_1a;
-SET SESSION wsrep_on = 0;
-SET SESSION wsrep_on = 1;
-SET GLOBAL wsrep_provider_options = 'dbug=';
-connection node_1;
-UPDATE p1 SET f2 = 'TO DEADLOCK' WHERE pk = 1;
-COMMIT;
-connection node_1a;
-SET GLOBAL wsrep_provider_options = 'signal=apply_monitor_slave_enter_sync';
-connection node_1;
-ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
-SELECT 'I deadlocked';
-I deadlocked
-I deadlocked
-SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE';
-EXPECT_1
-1
-connection node_2;
-SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE';
-EXPECT_1
-1
-DROP TABLE c1;
-DROP TABLE p1;
-######################################################################
-# Test for REPAIR 
-######################################################################
-######################################################################
-#
-# Scenario #1: DML working on FK parent table BF aborted by DDL
-#              over child table
-#
-######################################################################
-connection node_1;
-SET SESSION wsrep_sync_wait=0;
-CREATE TABLE p1 (pk INTEGER PRIMARY KEY, f2 CHAR(30));
-INSERT INTO p1 VALUES (1, 'INITIAL VALUE');
-CREATE TABLE p2 (pk INTEGER PRIMARY KEY, f2 CHAR(30));
-INSERT INTO p2 VALUES (1, 'INITIAL VALUE');
-INSERT INTO p2 VALUES (2, 'INITIAL VALUE');
-CREATE TABLE c1 (pk INTEGER PRIMARY KEY, fk INTEGER, FOREIGN KEY (fk) REFERENCES p1(pk));
-INSERT INTO c1 VALUES (1,1);
-CREATE TABLE c2 (pk INTEGER PRIMARY KEY, fk1 INTEGER, fk2 INTEGER, FOREIGN KEY (fk1) REFERENCES p1(pk), FOREIGN KEY (fk2) REFERENCES p2(pk));
-INSERT INTO c2 VALUES (1,1,1), (2,1,2);
-connection node_1;
-SET AUTOCOMMIT=ON;
-START TRANSACTION;
-UPDATE p1 SET f2 = 'TO DEADLOCK' WHERE pk = 1;
-connection node_2;
-SET SESSION wsrep_sync_wait=0;
-REPAIR TABLE c1 ;
-Table	Op	Msg_type	Msg_text
-test.c1	repair	note	The storage engine for the table doesn't support repair
-connection node_1;
-COMMIT;
-ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
-SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE';
-EXPECT_1
-1
-SELECT COUNT(*) AS EXPECT_2 FROM p2 WHERE f2 = 'INITIAL VALUE';
-EXPECT_2
-2
-connection node_2;
-SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE';
-EXPECT_1
-1
-SELECT COUNT(*) AS EXPECT_2 FROM p2 WHERE f2 = 'INITIAL VALUE';
-EXPECT_2
-2
-######################################################################
-#
-# Scenario #2: DML working on FK parent table tries to replicate, but
-#              fails in certification for earlier DDL on child table
-#
-######################################################################
-connection node_1;
-BEGIN;
-SET GLOBAL wsrep_provider_options = 'dbug=d,apply_monitor_slave_enter_sync';
-connection node_2;
-REPAIR TABLE c1 ;
-Table	Op	Msg_type	Msg_text
-test.c1	repair	note	The storage engine for the table doesn't support repair
-connection node_1a;
-SET SESSION wsrep_on = 0;
-SET SESSION wsrep_on = 1;
-SET GLOBAL wsrep_provider_options = 'dbug=';
-connection node_1;
-UPDATE p1 SET f2 = 'TO DEADLOCK' WHERE pk = 1;
-COMMIT;
-connection node_1a;
-SET GLOBAL wsrep_provider_options = 'signal=apply_monitor_slave_enter_sync';
-connection node_1;
-ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
-SELECT 'I deadlocked';
-I deadlocked
-I deadlocked
-SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE';
-EXPECT_1
-1
-SELECT COUNT(*) AS EXPECT_2 FROM p2 WHERE f2 = 'INITIAL VALUE';
-EXPECT_2
-2
-connection node_2;
-SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE';
-EXPECT_1
-1
-SELECT COUNT(*) AS EXPECT_2 FROM p2 WHERE f2 = 'INITIAL VALUE';
-EXPECT_2
-2
-######################################################################
-#
-# Scenario #3: 2 DMLs working on two FK parent tables try to replicate, 
-#              but fails in certification for earlier DDL on child table
-#              which is child to both FK parents 
-#
-######################################################################
-connection node_1;
-BEGIN;
-connection node_1b;
-BEGIN;
-connection node_1a;
-SET GLOBAL wsrep_provider_options = 'dbug=d,apply_monitor_slave_enter_sync';
-connection node_2;
-REPAIR TABLE c2 ;
-Table	Op	Msg_type	Msg_text
-test.c2	repair	note	The storage engine for the table doesn't support repair
-connection node_1a;
-SET SESSION wsrep_on = 0;
-SET SESSION wsrep_on = 1;
-SET GLOBAL wsrep_provider_options = 'dbug=';
-connection node_1;
-UPDATE p1 SET f2 = 'TO DEADLOCK' WHERE pk = 1;
-COMMIT;
-connection node_1b;
-UPDATE p2 SET f2 = 'TO DEADLOCK' WHERE pk = 2;
-COMMIT;
-connection node_1a;
-SET GLOBAL wsrep_provider_options = 'signal=apply_monitor_slave_enter_sync';
-connection node_1;
-ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
-SELECT 'I deadlocked';
-I deadlocked
-I deadlocked
-connection node_1b;
-ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
-SELECT 'I deadlocked';
-I deadlocked
-I deadlocked
-SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE';
-EXPECT_1
-1
-SELECT COUNT(*) AS EXPECT_2 FROM p2 WHERE f2 = 'INITIAL VALUE';
-EXPECT_2
-2
-connection node_2;
-SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE';
-EXPECT_1
-1
-SELECT COUNT(*) AS EXPECT_2 FROM p2 WHERE f2 = 'INITIAL VALUE';
-EXPECT_2
-2
-DROP TABLE c1, c2;
-DROP TABLE p1, p2;
-######################################################################
-# Test for REPAIR 
-######################################################################
-connection node_1;
-SET SESSION wsrep_sync_wait=0;
-CREATE TABLE p1 (pk INTEGER PRIMARY KEY, f2 CHAR(30));
-INSERT INTO p1 VALUES (1, 'INITIAL VALUE');
-CREATE TABLE c1 (pk INTEGER PRIMARY KEY, fk INTEGER, FOREIGN KEY (fk) REFERENCES p1(pk));
-INSERT INTO c1 VALUES (1,1);
-######################################################################
-#
-# Scenario #4: DML working on FK parent table tries to replicate, but
-#              fails in certification for earlier DDL on child table
-#              and another temporary table. TMP table should be skipped
-#              but FK child table should be replicated with proper keys
-#
-######################################################################
-connection node_1;
-BEGIN;
-SET GLOBAL wsrep_provider_options = 'dbug=d,apply_monitor_slave_enter_sync';
-connection node_2;
-CREATE TEMPORARY TABLE tmp (i int);
-REPAIR TABLE c1, tmp ;
-Table	Op	Msg_type	Msg_text
-test.c1	repair	note	The storage engine for the table doesn't support repair
-test.tmp	repair	note	The storage engine for the table doesn't support repair
-DROP TABLE tmp;
-connection node_1a;
-SET SESSION wsrep_on = 0;
-SET SESSION wsrep_on = 1;
-SET GLOBAL wsrep_provider_options = 'dbug=';
-connection node_1;
-UPDATE p1 SET f2 = 'TO DEADLOCK' WHERE pk = 1;
-COMMIT;
-connection node_1a;
-SET GLOBAL wsrep_provider_options = 'signal=apply_monitor_slave_enter_sync';
-connection node_1;
-ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
-SELECT 'I deadlocked';
-I deadlocked
-I deadlocked
-SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE';
-EXPECT_1
-1
-connection node_2;
-SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE';
-EXPECT_1
-1
-DROP TABLE c1;
-DROP TABLE p1;
-######################################################################
 # Test for ALTER ENGINE=INNODB
 ######################################################################
 ######################################################################
diff --git a/mysql-test/suite/galera/r/galera_ddl_fk_no_conflict.result b/mysql-test/suite/galera/r/galera_ddl_fk_no_conflict.result
new file mode 100644
index 00000000000..43046922143
--- /dev/null
+++ b/mysql-test/suite/galera/r/galera_ddl_fk_no_conflict.result
@@ -0,0 +1,330 @@
+connection node_2;
+connection node_1;
+CREATE TABLE parent (pk INTEGER PRIMARY KEY);
+CREATE TABLE child (pk INTEGER PRIMARY KEY, parent_id INTEGER, FOREIGN KEY(parent_id) REFERENCES parent(pk) );
+INSERT INTO parent VALUES (1), (2), (3), (4);
+INSERT INTO child VALUES (1,1), (2,2), (3,3), (4,4);
+connection node_1;
+START TRANSACTION;
+SELECT * FROM parent FOR UPDATE;
+pk
+1
+2
+3
+4
+connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
+OPTIMIZE TABLE child;;
+Table	Op	Msg_type	Msg_text
+test.child	optimize	note	Table does not support optimize, doing recreate + analyze instead
+test.child	optimize	status	OK
+connection node_1;
+COMMIT;
+DROP TABLE child, parent;
+disconnect node_1a;
+CREATE TABLE parent (pk INTEGER PRIMARY KEY);
+CREATE TABLE child (pk INTEGER PRIMARY KEY, parent_id INTEGER, FOREIGN KEY(parent_id) REFERENCES parent(pk) ON UPDATE CASCADE);
+INSERT INTO parent VALUES (1), (2), (3), (4);
+INSERT INTO child VALUES (1,1), (2,2), (3,3), (4,4);
+connection node_1;
+START TRANSACTION;
+SELECT * FROM parent FOR UPDATE;
+pk
+1
+2
+3
+4
+connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
+OPTIMIZE TABLE child;;
+Table	Op	Msg_type	Msg_text
+test.child	optimize	note	Table does not support optimize, doing recreate + analyze instead
+test.child	optimize	status	OK
+connection node_1;
+COMMIT;
+DROP TABLE child, parent;
+disconnect node_1a;
+CREATE TABLE parent (pk INTEGER PRIMARY KEY);
+CREATE TABLE child (pk INTEGER PRIMARY KEY, parent_id INTEGER, FOREIGN KEY(parent_id) REFERENCES parent(pk) ON DELETE CASCADE);
+INSERT INTO parent VALUES (1), (2), (3), (4);
+INSERT INTO child VALUES (1,1), (2,2), (3,3), (4,4);
+connection node_1;
+START TRANSACTION;
+SELECT * FROM parent FOR UPDATE;
+pk
+1
+2
+3
+4
+connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
+OPTIMIZE TABLE child;;
+Table	Op	Msg_type	Msg_text
+test.child	optimize	note	Table does not support optimize, doing recreate + analyze instead
+test.child	optimize	status	OK
+connection node_1;
+COMMIT;
+DROP TABLE child, parent;
+disconnect node_1a;
+CREATE TABLE parent (pk INTEGER PRIMARY KEY);
+CREATE TABLE child (pk INTEGER PRIMARY KEY, parent_id INTEGER, FOREIGN KEY(parent_id) REFERENCES parent(pk) ON UPDATE CASCADE ON DELETE CASCADE);
+INSERT INTO parent VALUES (1), (2), (3), (4);
+INSERT INTO child VALUES (1,1), (2,2), (3,3), (4,4);
+connection node_1;
+START TRANSACTION;
+SELECT * FROM parent FOR UPDATE;
+pk
+1
+2
+3
+4
+connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
+OPTIMIZE TABLE child;;
+Table	Op	Msg_type	Msg_text
+test.child	optimize	note	Table does not support optimize, doing recreate + analyze instead
+test.child	optimize	status	OK
+connection node_1;
+COMMIT;
+DROP TABLE child, parent;
+disconnect node_1a;
+CREATE TABLE parent (pk INTEGER PRIMARY KEY);
+CREATE TABLE child (pk INTEGER PRIMARY KEY, parent_id INTEGER, FOREIGN KEY(parent_id) REFERENCES parent(pk) );
+INSERT INTO parent VALUES (1), (2), (3), (4);
+INSERT INTO child VALUES (1,1), (2,2), (3,3), (4,4);
+connection node_1;
+START TRANSACTION;
+SELECT * FROM parent FOR UPDATE;
+pk
+1
+2
+3
+4
+connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
+REPAIR TABLE child;;
+Table	Op	Msg_type	Msg_text
+test.child	repair	note	The storage engine for the table doesn't support repair
+connection node_1;
+COMMIT;
+DROP TABLE child, parent;
+disconnect node_1a;
+CREATE TABLE parent (pk INTEGER PRIMARY KEY);
+CREATE TABLE child (pk INTEGER PRIMARY KEY, parent_id INTEGER, FOREIGN KEY(parent_id) REFERENCES parent(pk) ON UPDATE CASCADE);
+INSERT INTO parent VALUES (1), (2), (3), (4);
+INSERT INTO child VALUES (1,1), (2,2), (3,3), (4,4);
+connection node_1;
+START TRANSACTION;
+SELECT * FROM parent FOR UPDATE;
+pk
+1
+2
+3
+4
+connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
+REPAIR TABLE child;;
+Table	Op	Msg_type	Msg_text
+test.child	repair	note	The storage engine for the table doesn't support repair
+connection node_1;
+COMMIT;
+DROP TABLE child, parent;
+disconnect node_1a;
+CREATE TABLE parent (pk INTEGER PRIMARY KEY);
+CREATE TABLE child (pk INTEGER PRIMARY KEY, parent_id INTEGER, FOREIGN KEY(parent_id) REFERENCES parent(pk) ON DELETE CASCADE);
+INSERT INTO parent VALUES (1), (2), (3), (4);
+INSERT INTO child VALUES (1,1), (2,2), (3,3), (4,4);
+connection node_1;
+START TRANSACTION;
+SELECT * FROM parent FOR UPDATE;
+pk
+1
+2
+3
+4
+connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
+REPAIR TABLE child;;
+Table	Op	Msg_type	Msg_text
+test.child	repair	note	The storage engine for the table doesn't support repair
+connection node_1;
+COMMIT;
+DROP TABLE child, parent;
+disconnect node_1a;
+CREATE TABLE parent (pk INTEGER PRIMARY KEY);
+CREATE TABLE child (pk INTEGER PRIMARY KEY, parent_id INTEGER, FOREIGN KEY(parent_id) REFERENCES parent(pk) ON UPDATE CASCADE ON DELETE CASCADE);
+INSERT INTO parent VALUES (1), (2), (3), (4);
+INSERT INTO child VALUES (1,1), (2,2), (3,3), (4,4);
+connection node_1;
+START TRANSACTION;
+SELECT * FROM parent FOR UPDATE;
+pk
+1
+2
+3
+4
+connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
+REPAIR TABLE child;;
+Table	Op	Msg_type	Msg_text
+test.child	repair	note	The storage engine for the table doesn't support repair
+connection node_1;
+COMMIT;
+DROP TABLE child, parent;
+disconnect node_1a;
+CREATE TABLE parent (pk INTEGER PRIMARY KEY);
+CREATE TABLE child (pk INTEGER PRIMARY KEY, parent_id INTEGER, FOREIGN KEY(parent_id) REFERENCES parent(pk) );
+INSERT INTO parent VALUES (1), (2), (3), (4);
+INSERT INTO child VALUES (1,1), (2,2), (3,3), (4,4);
+connection node_1;
+START TRANSACTION;
+SELECT * FROM parent FOR UPDATE;
+pk
+1
+2
+3
+4
+connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
+CHECK TABLE child;;
+Table	Op	Msg_type	Msg_text
+test.child	check	status	OK
+connection node_1;
+COMMIT;
+DROP TABLE child, parent;
+disconnect node_1a;
+CREATE TABLE parent (pk INTEGER PRIMARY KEY);
+CREATE TABLE child (pk INTEGER PRIMARY KEY, parent_id INTEGER, FOREIGN KEY(parent_id) REFERENCES parent(pk) ON UPDATE CASCADE);
+INSERT INTO parent VALUES (1), (2), (3), (4);
+INSERT INTO child VALUES (1,1), (2,2), (3,3), (4,4);
+connection node_1;
+START TRANSACTION;
+SELECT * FROM parent FOR UPDATE;
+pk
+1
+2
+3
+4
+connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
+CHECK TABLE child;;
+Table	Op	Msg_type	Msg_text
+test.child	check	status	OK
+connection node_1;
+COMMIT;
+DROP TABLE child, parent;
+disconnect node_1a;
+CREATE TABLE parent (pk INTEGER PRIMARY KEY);
+CREATE TABLE child (pk INTEGER PRIMARY KEY, parent_id INTEGER, FOREIGN KEY(parent_id) REFERENCES parent(pk) ON DELETE CASCADE);
+INSERT INTO parent VALUES (1), (2), (3), (4);
+INSERT INTO child VALUES (1,1), (2,2), (3,3), (4,4);
+connection node_1;
+START TRANSACTION;
+SELECT * FROM parent FOR UPDATE;
+pk
+1
+2
+3
+4
+connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
+CHECK TABLE child;;
+Table	Op	Msg_type	Msg_text
+test.child	check	status	OK
+connection node_1;
+COMMIT;
+DROP TABLE child, parent;
+disconnect node_1a;
+CREATE TABLE parent (pk INTEGER PRIMARY KEY);
+CREATE TABLE child (pk INTEGER PRIMARY KEY, parent_id INTEGER, FOREIGN KEY(parent_id) REFERENCES parent(pk) ON UPDATE CASCADE ON DELETE CASCADE);
+INSERT INTO parent VALUES (1), (2), (3), (4);
+INSERT INTO child VALUES (1,1), (2,2), (3,3), (4,4);
+connection node_1;
+START TRANSACTION;
+SELECT * FROM parent FOR UPDATE;
+pk
+1
+2
+3
+4
+connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
+CHECK TABLE child;;
+Table	Op	Msg_type	Msg_text
+test.child	check	status	OK
+connection node_1;
+COMMIT;
+DROP TABLE child, parent;
+disconnect node_1a;
+CREATE TABLE parent (pk INTEGER PRIMARY KEY);
+CREATE TABLE child (pk INTEGER PRIMARY KEY, parent_id INTEGER, FOREIGN KEY(parent_id) REFERENCES parent(pk) );
+INSERT INTO parent VALUES (1), (2), (3), (4);
+INSERT INTO child VALUES (1,1), (2,2), (3,3), (4,4);
+connection node_1;
+START TRANSACTION;
+SELECT * FROM parent FOR UPDATE;
+pk
+1
+2
+3
+4
+connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
+ANALYZE TABLE child;;
+Table	Op	Msg_type	Msg_text
+test.child	analyze	status	Engine-independent statistics collected
+test.child	analyze	status	OK
+connection node_1;
+COMMIT;
+DROP TABLE child, parent;
+disconnect node_1a;
+CREATE TABLE parent (pk INTEGER PRIMARY KEY);
+CREATE TABLE child (pk INTEGER PRIMARY KEY, parent_id INTEGER, FOREIGN KEY(parent_id) REFERENCES parent(pk) ON UPDATE CASCADE);
+INSERT INTO parent VALUES (1), (2), (3), (4);
+INSERT INTO child VALUES (1,1), (2,2), (3,3), (4,4);
+connection node_1;
+START TRANSACTION;
+SELECT * FROM parent FOR UPDATE;
+pk
+1
+2
+3
+4
+connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
+ANALYZE TABLE child;;
+Table	Op	Msg_type	Msg_text
+test.child	analyze	status	Engine-independent statistics collected
+test.child	analyze	status	OK
+connection node_1;
+COMMIT;
+DROP TABLE child, parent;
+disconnect node_1a;
+CREATE TABLE parent (pk INTEGER PRIMARY KEY);
+CREATE TABLE child (pk INTEGER PRIMARY KEY, parent_id INTEGER, FOREIGN KEY(parent_id) REFERENCES parent(pk) ON DELETE CASCADE);
+INSERT INTO parent VALUES (1), (2), (3), (4);
+INSERT INTO child VALUES (1,1), (2,2), (3,3), (4,4);
+connection node_1;
+START TRANSACTION;
+SELECT * FROM parent FOR UPDATE;
+pk
+1
+2
+3
+4
+connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
+ANALYZE TABLE child;;
+Table	Op	Msg_type	Msg_text
+test.child	analyze	status	Engine-independent statistics collected
+test.child	analyze	status	OK
+connection node_1;
+COMMIT;
+DROP TABLE child, parent;
+disconnect node_1a;
+CREATE TABLE parent (pk INTEGER PRIMARY KEY);
+CREATE TABLE child (pk INTEGER PRIMARY KEY, parent_id INTEGER, FOREIGN KEY(parent_id) REFERENCES parent(pk) ON UPDATE CASCADE ON DELETE CASCADE);
+INSERT INTO parent VALUES (1), (2), (3), (4);
+INSERT INTO child VALUES (1,1), (2,2), (3,3), (4,4);
+connection node_1;
+START TRANSACTION;
+SELECT * FROM parent FOR UPDATE;
+pk
+1
+2
+3
+4
+connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
+ANALYZE TABLE child;;
+Table	Op	Msg_type	Msg_text
+test.child	analyze	status	Engine-independent statistics collected
+test.child	analyze	status	OK
+connection node_1;
+COMMIT;
+DROP TABLE child, parent;
+disconnect node_1a;
diff --git a/mysql-test/suite/galera/r/galera_gtid_server_id.result b/mysql-test/suite/galera/r/galera_gtid_server_id.result
new file mode 100644
index 00000000000..8765fcc1636
--- /dev/null
+++ b/mysql-test/suite/galera/r/galera_gtid_server_id.result
@@ -0,0 +1,83 @@
+connection node_2;
+connection node_1;
+connection node_1;
+select @@gtid_domain_id, @@server_id, @@wsrep_gtid_domain_id,@@wsrep_gtid_mode;
+@@gtid_domain_id	@@server_id	@@wsrep_gtid_domain_id	@@wsrep_gtid_mode
+0	11	1	1
+connection node_2;
+call mtr.add_suppression("WSREP: Ignoring server id for non bootstrap node.");
+select @@gtid_domain_id, @@server_id, @@wsrep_gtid_domain_id,@@wsrep_gtid_mode;
+@@gtid_domain_id	@@server_id	@@wsrep_gtid_domain_id	@@wsrep_gtid_mode
+0	12	1	1
+connection node_1;
+CREATE TABLE t1(id int not null primary key) engine=innodb;
+INSERT INTO t1 values (1);
+show global variables  like '%gtid%';
+Variable_name	Value
+gtid_binlog_pos	1-11-2
+gtid_binlog_state	1-11-2
+gtid_cleanup_batch_size	64
+gtid_current_pos	1-11-2
+gtid_domain_id	0
+gtid_ignore_duplicates	OFF
+gtid_pos_auto_engines	
+gtid_slave_pos	
+gtid_strict_mode	OFF
+wsrep_gtid_domain_id	1
+wsrep_gtid_mode	ON
+connection node_2;
+SET SESSION wsrep_sync_wait=15;
+show global variables  like '%gtid%';
+Variable_name	Value
+gtid_binlog_pos	0-12-1,1-11-2
+gtid_binlog_state	0-12-1,1-11-2
+gtid_cleanup_batch_size	64
+gtid_current_pos	0-12-1
+gtid_domain_id	0
+gtid_ignore_duplicates	OFF
+gtid_pos_auto_engines	
+gtid_slave_pos	
+gtid_strict_mode	OFF
+wsrep_gtid_domain_id	1
+wsrep_gtid_mode	ON
+SET GLOBAL server_id=200;
+ERROR 42000: Variable 'server_id' can't be set to the value of '200'
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1231	Can't change server_id because wsrep and wsrep_gtid_mode is set. You can set server_id only with wsrep_new_cluster. 
+Error	1231	Variable 'server_id' can't be set to the value of '200'
+SET SESSION server_id=200;
+ERROR 42000: Variable 'server_id' can't be set to the value of '200'
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1231	Can't change server_id because wsrep and wsrep_gtid_mode is set. You can set server_id only with wsrep_new_cluster. 
+Error	1231	Variable 'server_id' can't be set to the value of '200'
+INSERT INTO t1 values(2);
+show global variables  like '%gtid%';
+Variable_name	Value
+gtid_binlog_pos	0-12-1,1-11-3
+gtid_binlog_state	0-12-1,1-11-3
+gtid_cleanup_batch_size	64
+gtid_current_pos	0-12-1
+gtid_domain_id	0
+gtid_ignore_duplicates	OFF
+gtid_pos_auto_engines	
+gtid_slave_pos	
+gtid_strict_mode	OFF
+wsrep_gtid_domain_id	1
+wsrep_gtid_mode	ON
+connection node_1;
+show global variables  like '%gtid%';
+Variable_name	Value
+gtid_binlog_pos	1-11-3
+gtid_binlog_state	1-11-3
+gtid_cleanup_batch_size	64
+gtid_current_pos	1-11-3
+gtid_domain_id	0
+gtid_ignore_duplicates	OFF
+gtid_pos_auto_engines	
+gtid_slave_pos	
+gtid_strict_mode	OFF
+wsrep_gtid_domain_id	1
+wsrep_gtid_mode	ON
+DROP TABLE t1;
diff --git a/mysql-test/suite/galera/r/galera_gtid_slave.result b/mysql-test/suite/galera/r/galera_gtid_slave.result
index 1ff062064e7..d460d169811 100644
--- a/mysql-test/suite/galera/r/galera_gtid_slave.result
+++ b/mysql-test/suite/galera/r/galera_gtid_slave.result
@@ -41,3 +41,5 @@ reset master;
 SET GLOBAL wsrep_on=ON;
 connection node_3;
 reset master;
+connection node_2;
+CALL mtr.add_suppression("Ignoring server id for non bootstrap node");
diff --git a/mysql-test/suite/galera/r/galera_gtid_slave_sst_rsync.result b/mysql-test/suite/galera/r/galera_gtid_slave_sst_rsync.result
index 992f6c3455b..f41e3abc497 100644
--- a/mysql-test/suite/galera/r/galera_gtid_slave_sst_rsync.result
+++ b/mysql-test/suite/galera/r/galera_gtid_slave_sst_rsync.result
@@ -166,3 +166,5 @@ set global wsrep_on=ON;
 #Connection 3
 connection node_3;
 reset master;
+connection node_2;
+CALL mtr.add_suppression("Ignoring server id for non bootstrap node");
diff --git a/mysql-test/suite/galera/r/galera_gtid_trx_conflict.result b/mysql-test/suite/galera/r/galera_gtid_trx_conflict.result
index dcabff40841..602816f18a9 100644
--- a/mysql-test/suite/galera/r/galera_gtid_trx_conflict.result
+++ b/mysql-test/suite/galera/r/galera_gtid_trx_conflict.result
@@ -42,3 +42,4 @@ SELECT @@gtid_binlog_state;
 @@gtid_binlog_state
 1-1-101
 DROP TABLE t1;
+CALL mtr.add_suppression("Ignoring server id for non bootstrap node");
diff --git a/mysql-test/suite/galera/r/galera_last_committed_id.result b/mysql-test/suite/galera/r/galera_last_committed_id.result
index eadf49d7ce0..1a1339ede32 100644
--- a/mysql-test/suite/galera/r/galera_last_committed_id.result
+++ b/mysql-test/suite/galera/r/galera_last_committed_id.result
@@ -33,3 +33,5 @@ wsrep_last_written_id_advanced
 1
 SET AUTOCOMMIT=ON;
 DROP TABLE t1;
+connection node_2;
+CALL mtr.add_suppression("Ignoring server id for non bootstrap node");
diff --git a/mysql-test/suite/galera/r/galera_myisam_transactions.result b/mysql-test/suite/galera/r/galera_myisam_transactions.result
index 091c5ffb6f6..04f68c29305 100644
--- a/mysql-test/suite/galera/r/galera_myisam_transactions.result
+++ b/mysql-test/suite/galera/r/galera_myisam_transactions.result
@@ -37,3 +37,18 @@ SELECT COUNT(*) = 0 FROM t2;
 COUNT(*) = 0
 1
 DROP TABLE t1, t2, t3;
+SET SESSION lock_wait_timeout=2;
+SET GLOBAL wsrep_replicate_myisam= ON;
+Warnings:
+Warning	1287	'@@wsrep_replicate_myisam' is deprecated and will be removed in a future release. Please use '@@wsrep_mode=REPLICATE_MYISAM' instead
+CREATE TEMPORARY TABLE t1 (i INT, PRIMARY KEY pk (i)) ENGINE=MyISAM;
+Warnings:
+Warning	1280	Name 'pk' ignored for PRIMARY key.
+PREPARE stmt FROM "INSERT INTO t1 (id) SELECT * FROM (SELECT 4 AS i) AS y";
+INSERT INTO t1 VALUES(4);
+DEALLOCATE PREPARE stmt;
+COMMIT;
+DROP TABLE t1;
+SET GLOBAL wsrep_replicate_myisam=OFF;
+Warnings:
+Warning	1287	'@@wsrep_replicate_myisam' is deprecated and will be removed in a future release. Please use '@@wsrep_mode=REPLICATE_MYISAM' instead
diff --git a/mysql-test/suite/galera/r/galera_repair_view.result b/mysql-test/suite/galera/r/galera_repair_view.result
new file mode 100644
index 00000000000..8dfe8c8db52
--- /dev/null
+++ b/mysql-test/suite/galera/r/galera_repair_view.result
@@ -0,0 +1,17 @@
+connection node_2;
+connection node_1;
+CREATE TABLE t1(a int not null primary key) engine=innodb;
+REPAIR TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	repair	note	The storage engine for the table doesn't support repair
+CREATE VIEW v1 AS SELECT a FROM t1;
+REPAIR VIEW v1;
+Table	Op	Msg_type	Msg_text
+test.v1	repair	status	OK
+DROP VIEW v1;
+DROP TABLE t1;
+CREATE VIEW v1 AS SELECT table_name FROM information_schema.tables;
+REPAIR VIEW v1;
+Table	Op	Msg_type	Msg_text
+test.v1	repair	status	OK
+DROP VIEW v1;
diff --git a/mysql-test/suite/galera/r/galera_sequences.result b/mysql-test/suite/galera/r/galera_sequences.result
new file mode 100644
index 00000000000..48593d2a258
--- /dev/null
+++ b/mysql-test/suite/galera/r/galera_sequences.result
@@ -0,0 +1,49 @@
+connection node_2;
+connection node_1;
+connection node_1;
+CREATE SEQUENCE `seq` start with 1 minvalue 1 maxvalue 1000000 increment by 0 cache 1000 nocycle ENGINE=InnoDB;
+SHOW CREATE SEQUENCE seq;
+Table	Create Table
+seq	CREATE SEQUENCE `seq` start with 1 minvalue 1 maxvalue 1000000 increment by 0 cache 1000 nocycle ENGINE=InnoDB
+connection node_2;
+SHOW CREATE SEQUENCE seq;
+Table	Create Table
+seq	CREATE SEQUENCE `seq` start with 1 minvalue 1 maxvalue 1000000 increment by 0 cache 1000 nocycle ENGINE=InnoDB
+connection node_1;
+ALTER SEQUENCE seq MAXVALUE = 10000;
+SHOW CREATE SEQUENCE seq;
+Table	Create Table
+seq	CREATE SEQUENCE `seq` start with 1 minvalue 1 maxvalue 10000 increment by 0 cache 1000 nocycle ENGINE=InnoDB
+connection node_2;
+SHOW CREATE SEQUENCE seq;
+Table	Create Table
+seq	CREATE SEQUENCE `seq` start with 1 minvalue 1 maxvalue 10000 increment by 0 cache 1000 nocycle ENGINE=InnoDB
+connection node_1;
+DROP SEQUENCE seq;
+SHOW CREATE SEQUENCE seq;
+ERROR 42S02: Table 'test.seq' doesn't exist
+connection node_2;
+SHOW CREATE SEQUENCE seq;
+ERROR 42S02: Table 'test.seq' doesn't exist
+connection node_1;
+CREATE SEQUENCE Seq1_1     START WITH 1     INCREMENT BY 1;
+select NEXT VALUE FOR Seq1_1;
+NEXT VALUE FOR Seq1_1
+1
+alter table Seq1_1 engine=myisam;
+select NEXT VALUE FOR Seq1_1;
+NEXT VALUE FOR Seq1_1
+1001
+alter table Seq1_1 engine=innodb;
+select NEXT VALUE FOR Seq1_1;
+NEXT VALUE FOR Seq1_1
+2001
+connection node_2;
+SHOW CREATE SEQUENCE Seq1_1;
+Table	Create Table
+Seq1_1	CREATE SEQUENCE `Seq1_1` start with 1 minvalue 1 maxvalue 9223372036854775806 increment by 1 cache 1000 nocycle ENGINE=InnoDB
+select NEXT VALUE FOR Seq1_1;
+NEXT VALUE FOR Seq1_1
+1
+connection node_1;
+DROP SEQUENCE Seq1_1;
diff --git a/mysql-test/suite/galera/r/galera_sync_wait_upto.result b/mysql-test/suite/galera/r/galera_sync_wait_upto.result
index e18cd3b5432..c9f468774fb 100644
--- a/mysql-test/suite/galera/r/galera_sync_wait_upto.result
+++ b/mysql-test/suite/galera/r/galera_sync_wait_upto.result
@@ -23,3 +23,5 @@ WSREP_SYNC_WAIT_UPTO
 1
 connection node_1;
 DROP TABLE t1;
+connection node_2;
+CALL mtr.add_suppression("Ignoring server id for non bootstrap node");
diff --git a/mysql-test/suite/galera/r/galera_var_gtid_domain_id.result b/mysql-test/suite/galera/r/galera_var_gtid_domain_id.result
index 3a23f0c8122..0edfdf47d34 100644
--- a/mysql-test/suite/galera/r/galera_var_gtid_domain_id.result
+++ b/mysql-test/suite/galera/r/galera_var_gtid_domain_id.result
@@ -89,6 +89,8 @@ connection node_2;
 set global wsrep_on=OFF;
 reset master;
 set global wsrep_on=ON;
+connection node_2;
+CALL mtr.add_suppression("Ignoring server id for non bootstrap node");
 disconnect node_2;
 disconnect node_1;
 # End of test
diff --git a/mysql-test/suite/galera/r/mdev_10518.result b/mysql-test/suite/galera/r/mdev_10518.result
index b07f5303586..8426cd31349 100644
--- a/mysql-test/suite/galera/r/mdev_10518.result
+++ b/mysql-test/suite/galera/r/mdev_10518.result
@@ -89,6 +89,8 @@ connection node_2;
 set global wsrep_on=OFF;
 reset master;
 set global wsrep_on=ON;
+connection node_2;
+CALL mtr.add_suppression("Ignoring server id for non bootstrap node");
 disconnect node_2;
 disconnect node_1;
 # End of test
diff --git a/mysql-test/suite/sys_vars/r/wsrep_slave_threads_basic.result b/mysql-test/suite/galera/r/wsrep_slave_threads_basic.result
index 62be5a42416..edfb4747d92 100644
--- a/mysql-test/suite/sys_vars/r/wsrep_slave_threads_basic.result
+++ b/mysql-test/suite/galera/r/wsrep_slave_threads_basic.result
@@ -1,3 +1,5 @@
+connection node_2;
+connection node_1;
 #
 # wsrep_slave_threads
 #
diff --git a/mysql-test/suite/galera/t/MDEV-10715.test b/mysql-test/suite/galera/t/MDEV-10715.test
index 186320589c3..20c5293f01b 100644
--- a/mysql-test/suite/galera/t/MDEV-10715.test
+++ b/mysql-test/suite/galera/t/MDEV-10715.test
@@ -17,3 +17,6 @@ select wsrep_last_written_gtid();
 
 --connection node_1
 drop table t1;
+
+--connection node_2
+CALL mtr.add_suppression("Ignoring server id for non bootstrap node");
\ No newline at end of file
diff --git a/mysql-test/suite/galera/t/MDEV-20225.test b/mysql-test/suite/galera/t/MDEV-20225.test
index 2124e499530..60ab1c53e40 100644
--- a/mysql-test/suite/galera/t/MDEV-20225.test
+++ b/mysql-test/suite/galera/t/MDEV-20225.test
@@ -34,12 +34,16 @@ INSERT INTO t1 VALUES (NULL);
 # so there is no sync point or condition to wait.
 --sleep 1
 
---connection node_2
+--let $galera_connection_name = node_2a
+--let $galera_server_number = 2
+--source include/galera_connect.inc
+--connection node_2a
 SET GLOBAL debug_dbug = 'RESET';
 SET DEBUG_SYNC = 'now SIGNAL signal.mdev_20225_continue';
 SET DEBUG_SYNC = 'RESET';
 SET GLOBAL wsrep_slave_threads = 1;
 
+--connection node_2
 # Trigger should now be dropped on node_2.
 --let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.TRIGGERS WHERE TRIGGER_NAME like '%tr1'
 --source include/wait_condition.inc
diff --git a/mysql-test/suite/galera/t/MDEV-25494.test b/mysql-test/suite/galera/t/MDEV-25494.test
new file mode 100644
index 00000000000..a6a70145469
--- /dev/null
+++ b/mysql-test/suite/galera/t/MDEV-25494.test
@@ -0,0 +1,7 @@
+--source include/galera_cluster.inc
+
+SET SESSION binlog_format=STATEMENT;
+CREATE TEMPORARY TABLE t (i INT) UNION=(t);
+ALTER TABLE t ADD extrac CHAR(1);
+SHOW CREATE TABLE t;
+DROP TABLE t;
diff --git a/mysql-test/suite/galera/t/galera-features#117.test b/mysql-test/suite/galera/t/galera-features#117.test
index 0436b201a09..30301996d1c 100644
--- a/mysql-test/suite/galera/t/galera-features#117.test
+++ b/mysql-test/suite/galera/t/galera-features#117.test
@@ -4,6 +4,11 @@
 --source include/galera_cluster.inc
 --source include/have_innodb.inc
 
+# Save original auto_increment_offset values.
+--let $node_1=node_1
+--let $node_2=node_2
+--source ../galera/include/auto_increment_offset_save.inc
+
 --connection node_2
 SET SESSION wsrep_on=OFF;
 CREATE TABLE test.t1 (f2 INTEGER);
@@ -36,3 +41,7 @@ SHOW TABLES IN test;
 CALL mtr.add_suppression("Inconsistent by consensus.");
 CALL mtr.add_suppression("WSREP: Failed to execute TOI action");
 CALL mtr.add_suppression("WSREP: TO isolation end failed");
+
+--connection node_1
+# Restore original auto_increment_offset values.
+--source ../galera/include/auto_increment_offset_restore.inc
diff --git a/mysql-test/suite/galera/t/galera_create_table_like.test b/mysql-test/suite/galera/t/galera_create_table_like.test
index 0e0e8b0ffcf..3cf51521be1 100644
--- a/mysql-test/suite/galera/t/galera_create_table_like.test
+++ b/mysql-test/suite/galera/t/galera_create_table_like.test
@@ -48,3 +48,12 @@ DROP TABLE schema2.real_table3;
 
 DROP SCHEMA schema1;
 DROP SCHEMA schema2;
+
+#
+# MDEV-25856: SIGSEGV in ha_myisammrg::append_create_info
+#
+use test;
+CREATE TEMPORARY TABLE t (c INT) ENGINE=mrg_myisam UNION=(t,t2) insert_method=FIRST;
+--error 1472
+CREATE TABLE t2 LIKE t;
+DROP TABLE t;
diff --git a/mysql-test/suite/galera/t/galera_ddl_fk_conflict.test b/mysql-test/suite/galera/t/galera_ddl_fk_conflict.test
index 88837933e5a..4ec866a9f74 100644
--- a/mysql-test/suite/galera/t/galera_ddl_fk_conflict.test
+++ b/mysql-test/suite/galera/t/galera_ddl_fk_conflict.test
@@ -17,14 +17,6 @@ SET SESSION wsrep_sync_wait=0;
 --connection node_1b
 SET SESSION wsrep_sync_wait=0;
 
---let $table_admin_command = OPTIMIZE
---source galera_ddl_fk_conflict.inc
---source galera_ddl_fk_conflict_with_tmp.inc
-
---let $table_admin_command = REPAIR
---source galera_ddl_fk_conflict.inc
---source galera_ddl_fk_conflict_with_tmp.inc
-
 --let $table_admin_command = ALTER
 --let $table_admin_command_end = ENGINE=INNODB
 --source galera_ddl_fk_conflict.inc
diff --git a/mysql-test/suite/galera/t/galera_ddl_fk_no_conflict.inc b/mysql-test/suite/galera/t/galera_ddl_fk_no_conflict.inc
new file mode 100644
index 00000000000..9e2dd391678
--- /dev/null
+++ b/mysql-test/suite/galera/t/galera_ddl_fk_no_conflict.inc
@@ -0,0 +1,34 @@
+# This test attempts to show that OPTIMIZE on a child table does NOT
+# acquire MDL locks on the parent table. #
+# param: $table_admin_command
+#        DDL table command to test, script will build full SQL statement:
+#        $table_admin_command TABLE c;
+#
+# param: $FK_constraint
+#        Foreign key constraint to use when creating the child table.
+#
+
+CREATE TABLE parent (pk INTEGER PRIMARY KEY);
+--eval CREATE TABLE child (pk INTEGER PRIMARY KEY, parent_id INTEGER, FOREIGN KEY(parent_id) REFERENCES parent(pk) $fk_constraint)
+
+INSERT INTO parent VALUES (1), (2), (3), (4);
+INSERT INTO child VALUES (1,1), (2,2), (3,3), (4,4);
+
+--connection node_1
+# Start a transaction that uses the parent table,
+# so that we acquire MDL lock on parent.
+START TRANSACTION;
+SELECT * FROM parent FOR UPDATE;
+
+# In a different connection, execute the table
+# admin command (OPTIMIZE / REPAIR ...) on the child table.
+--connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1
+--eval $table_admin_command TABLE child;
+
+# Expect no conflict.
+--connection node_1
+COMMIT;
+
+DROP TABLE child, parent;
+
+--disconnect node_1a
diff --git a/mysql-test/suite/galera/t/galera_ddl_fk_no_conflict.test b/mysql-test/suite/galera/t/galera_ddl_fk_no_conflict.test
new file mode 100644
index 00000000000..6307b629e2b
--- /dev/null
+++ b/mysql-test/suite/galera/t/galera_ddl_fk_no_conflict.test
@@ -0,0 +1,57 @@
+#
+# This test attempts to show that table admin commands
+# (OPTIMIZE / REPAIR / ANALYZE ...) on child table,
+# do NOT cause conflicts on parent table operations.
+# Contrary to what is said in MDEV-21577, which claimed
+# that OPTIMIZE and REPAIR do take MDL locks on parent
+# table.
+#
+# Should this test start failing due to a conflict
+# (i.e. ER_LOCK_DEADLOCK), then it might be that we
+# are missing additional keys for certification
+# on the corresponding table admin command.
+
+--source include/galera_cluster.inc
+
+--let $table_admin_command = OPTIMIZE
+--let $fk_constraint =
+--source galera_ddl_fk_no_conflict.inc
+--let $fk_constraint = ON UPDATE CASCADE
+--source galera_ddl_fk_no_conflict.inc
+--let $fk_constraint = ON DELETE CASCADE
+--source galera_ddl_fk_no_conflict.inc
+--let $fk_constraint = ON UPDATE CASCADE ON DELETE CASCADE
+--source galera_ddl_fk_no_conflict.inc
+
+
+--let $table_admin_command = REPAIR
+--let $fk_constraint =
+--source galera_ddl_fk_no_conflict.inc
+--let $fk_constraint = ON UPDATE CASCADE
+--source galera_ddl_fk_no_conflict.inc
+--let $fk_constraint = ON DELETE CASCADE
+--source galera_ddl_fk_no_conflict.inc
+--let $fk_constraint = ON UPDATE CASCADE ON DELETE CASCADE
+--source galera_ddl_fk_no_conflict.inc
+
+
+--let $table_admin_command = CHECK
+--let $fk_constraint =
+--source galera_ddl_fk_no_conflict.inc
+--let $fk_constraint = ON UPDATE CASCADE
+--source galera_ddl_fk_no_conflict.inc
+--let $fk_constraint = ON DELETE CASCADE
+--source galera_ddl_fk_no_conflict.inc
+--let $fk_constraint = ON UPDATE CASCADE ON DELETE CASCADE
+--source galera_ddl_fk_no_conflict.inc
+
+
+--let $table_admin_command = ANALYZE
+--let $fk_constraint =
+--source galera_ddl_fk_no_conflict.inc
+--let $fk_constraint = ON UPDATE CASCADE
+--source galera_ddl_fk_no_conflict.inc
+--let $fk_constraint = ON DELETE CASCADE
+--source galera_ddl_fk_no_conflict.inc
+--let $fk_constraint = ON UPDATE CASCADE ON DELETE CASCADE
+--source galera_ddl_fk_no_conflict.inc
diff --git a/mysql-test/suite/galera/t/galera_gtid_server_id.cnf b/mysql-test/suite/galera/t/galera_gtid_server_id.cnf
new file mode 100644
index 00000000000..bda7a00ab2e
--- /dev/null
+++ b/mysql-test/suite/galera/t/galera_gtid_server_id.cnf
@@ -0,0 +1,16 @@
+!include ../galera_2nodes.cnf
+
+[mysqld.1]
+wsrep_gtid_domain_id=1
+wsrep_gtid_mode=ON
+server-id=11
+log_slave_updates
+log_bin
+
+[mysqld.2]
+wsrep_gtid_domain_id=1
+wsrep_gtid_mode=ON
+server-id=12
+log_slave_updates
+log_bin
+
diff --git a/mysql-test/suite/galera/t/galera_gtid_server_id.test b/mysql-test/suite/galera/t/galera_gtid_server_id.test
new file mode 100644
index 00000000000..9bb07371f92
--- /dev/null
+++ b/mysql-test/suite/galera/t/galera_gtid_server_id.test
@@ -0,0 +1,28 @@
+--source include/galera_cluster.inc
+
+--connection node_1
+select @@gtid_domain_id, @@server_id, @@wsrep_gtid_domain_id,@@wsrep_gtid_mode;
+--connection node_2
+call mtr.add_suppression("WSREP: Ignoring server id for non bootstrap node.");
+select @@gtid_domain_id, @@server_id, @@wsrep_gtid_domain_id,@@wsrep_gtid_mode;
+
+--connection node_1
+CREATE TABLE t1(id int not null primary key) engine=innodb;
+INSERT INTO t1 values (1);
+show global variables  like '%gtid%';
+--connection node_2
+SET SESSION wsrep_sync_wait=15;
+show global variables  like '%gtid%';
+# This should give error
+--error ER_WRONG_VALUE_FOR_VAR
+SET GLOBAL server_id=200;
+SHOW WARNINGS;
+# This should give error
+--error ER_WRONG_VALUE_FOR_VAR
+SET SESSION server_id=200;
+SHOW WARNINGS;
+INSERT INTO t1 values(2);
+show global variables  like '%gtid%';
+--connection node_1
+show global variables  like '%gtid%';
+DROP TABLE t1;
diff --git a/mysql-test/suite/galera/t/galera_gtid_slave.test b/mysql-test/suite/galera/t/galera_gtid_slave.test
index df55ea03cb0..b3fbbb02d5f 100644
--- a/mysql-test/suite/galera/t/galera_gtid_slave.test
+++ b/mysql-test/suite/galera/t/galera_gtid_slave.test
@@ -90,3 +90,6 @@ SET GLOBAL wsrep_on=ON;
 
 --connection node_3
 reset master;
+
+--connection node_2
+CALL mtr.add_suppression("Ignoring server id for non bootstrap node");
diff --git a/mysql-test/suite/galera/t/galera_gtid_slave_sst_rsync.test b/mysql-test/suite/galera/t/galera_gtid_slave_sst_rsync.test
index d03445d537a..b2ddc7e153d 100644
--- a/mysql-test/suite/galera/t/galera_gtid_slave_sst_rsync.test
+++ b/mysql-test/suite/galera/t/galera_gtid_slave_sst_rsync.test
@@ -197,3 +197,6 @@ set global wsrep_on=ON;
 --echo #Connection 3
 --connection node_3
 reset master;
+
+--connection node_2
+CALL mtr.add_suppression("Ignoring server id for non bootstrap node");
diff --git a/mysql-test/suite/galera/t/galera_gtid_trx_conflict.test b/mysql-test/suite/galera/t/galera_gtid_trx_conflict.test
index 27539b2ab52..6f05196b8da 100644
--- a/mysql-test/suite/galera/t/galera_gtid_trx_conflict.test
+++ b/mysql-test/suite/galera/t/galera_gtid_trx_conflict.test
@@ -51,6 +51,6 @@ SELECT @@gtid_binlog_state;
 
 --connection node_2
 SELECT @@gtid_binlog_state;
-
-
 DROP TABLE t1;
+
+CALL mtr.add_suppression("Ignoring server id for non bootstrap node");
diff --git a/mysql-test/suite/galera/t/galera_last_committed_id.test b/mysql-test/suite/galera/t/galera_last_committed_id.test
index b6e3e1f7e7a..6e1f0de7d0b 100644
--- a/mysql-test/suite/galera/t/galera_last_committed_id.test
+++ b/mysql-test/suite/galera/t/galera_last_committed_id.test
@@ -64,3 +64,6 @@ COMMIT;
 SET AUTOCOMMIT=ON;
 
 DROP TABLE t1;
+
+--connection node_2
+CALL mtr.add_suppression("Ignoring server id for non bootstrap node");
diff --git a/mysql-test/suite/galera/t/galera_myisam_transactions.test b/mysql-test/suite/galera/t/galera_myisam_transactions.test
index 00e0bf3fdca..30677ddbe4d 100644
--- a/mysql-test/suite/galera/t/galera_myisam_transactions.test
+++ b/mysql-test/suite/galera/t/galera_myisam_transactions.test
@@ -34,3 +34,16 @@ SELECT COUNT(*) = 0 FROM t2;
 SELECT COUNT(*) = 0 FROM t2;
 
 DROP TABLE t1, t2, t3;
+
+#
+# MDEV-25201 : Assertion `thd->wsrep_trx_meta.gtid.seqno == (-1)' failed in int wsrep_to_isolation_begin(THD*, const char*, const char*, const TABLE_LIST*, Alter_info*)
+#
+SET SESSION lock_wait_timeout=2;
+SET GLOBAL wsrep_replicate_myisam= ON;
+CREATE TEMPORARY TABLE t1 (i INT, PRIMARY KEY pk (i)) ENGINE=MyISAM;
+PREPARE stmt FROM "INSERT INTO t1 (id) SELECT * FROM (SELECT 4 AS i) AS y";
+INSERT INTO t1 VALUES(4);
+DEALLOCATE PREPARE stmt;
+COMMIT;
+DROP TABLE t1;
+SET GLOBAL wsrep_replicate_myisam=OFF;
diff --git a/mysql-test/suite/galera/t/galera_repair_view.test b/mysql-test/suite/galera/t/galera_repair_view.test
new file mode 100644
index 00000000000..0010d90c7ec
--- /dev/null
+++ b/mysql-test/suite/galera/t/galera_repair_view.test
@@ -0,0 +1,12 @@
+--source include/galera_cluster.inc
+
+CREATE TABLE t1(a int not null primary key) engine=innodb;
+REPAIR TABLE t1;
+CREATE VIEW v1 AS SELECT a FROM t1;
+REPAIR VIEW v1;
+DROP VIEW v1;
+DROP TABLE t1;
+
+CREATE VIEW v1 AS SELECT table_name FROM information_schema.tables;
+REPAIR VIEW v1;
+DROP VIEW v1;
diff --git a/mysql-test/suite/galera/t/galera_sequences.test b/mysql-test/suite/galera/t/galera_sequences.test
new file mode 100644
index 00000000000..480366f6a6f
--- /dev/null
+++ b/mysql-test/suite/galera/t/galera_sequences.test
@@ -0,0 +1,46 @@
+--source include/galera_cluster.inc
+
+#
+# MDEV-19353 : Alter Sequence do not replicate to another nodes with in Galera Cluster
+#
+
+--connection node_1
+CREATE SEQUENCE `seq` start with 1 minvalue 1 maxvalue 1000000 increment by 0 cache 1000 nocycle ENGINE=InnoDB;
+SHOW CREATE SEQUENCE seq;
+
+--connection node_2
+SHOW CREATE SEQUENCE seq;
+
+--connection node_1
+ALTER SEQUENCE seq MAXVALUE = 10000;
+SHOW CREATE SEQUENCE seq;
+
+--connection node_2
+SHOW CREATE SEQUENCE seq;
+
+--connection node_1
+DROP SEQUENCE seq;
+--error ER_NO_SUCH_TABLE
+SHOW CREATE SEQUENCE seq;
+
+--connection node_2
+--error ER_NO_SUCH_TABLE
+SHOW CREATE SEQUENCE seq;
+
+#
+# MDEV-18848 : Galera: 10.4 node crashed with Assertion `client_state.transaction().active()` after altering SEQUENCE table's engine to myisam and back to innodb
+#
+--connection node_1
+CREATE SEQUENCE Seq1_1     START WITH 1     INCREMENT BY 1;
+select NEXT VALUE FOR Seq1_1;
+alter table Seq1_1 engine=myisam;
+select NEXT VALUE FOR Seq1_1;
+alter table Seq1_1 engine=innodb;
+select NEXT VALUE FOR Seq1_1;
+
+--connection node_2
+SHOW CREATE SEQUENCE Seq1_1;
+select NEXT VALUE FOR Seq1_1;
+
+--connection node_1
+DROP SEQUENCE Seq1_1;
diff --git a/mysql-test/suite/galera/t/galera_sync_wait_upto.test b/mysql-test/suite/galera/t/galera_sync_wait_upto.test
index 05353ac7a3a..8465ddebfeb 100644
--- a/mysql-test/suite/galera/t/galera_sync_wait_upto.test
+++ b/mysql-test/suite/galera/t/galera_sync_wait_upto.test
@@ -70,3 +70,6 @@ INSERT INTO t1 VALUES (2);
 
 --connection node_1
 DROP TABLE t1;
+
+--connection node_2
+CALL mtr.add_suppression("Ignoring server id for non bootstrap node");
diff --git a/mysql-test/suite/galera/t/galera_var_gtid_domain_id.test b/mysql-test/suite/galera/t/galera_var_gtid_domain_id.test
index eec47507e3a..4de1121ae77 100644
--- a/mysql-test/suite/galera/t/galera_var_gtid_domain_id.test
+++ b/mysql-test/suite/galera/t/galera_var_gtid_domain_id.test
@@ -59,6 +59,8 @@ set global wsrep_on=OFF;
 reset master;
 set global wsrep_on=ON;
 
+--connection node_2
+CALL mtr.add_suppression("Ignoring server id for non bootstrap node");
+
 --source include/galera_end.inc
 --echo # End of test
-
diff --git a/mysql-test/suite/galera/t/mdev_10518.test b/mysql-test/suite/galera/t/mdev_10518.test
index eec47507e3a..4de1121ae77 100644
--- a/mysql-test/suite/galera/t/mdev_10518.test
+++ b/mysql-test/suite/galera/t/mdev_10518.test
@@ -59,6 +59,8 @@ set global wsrep_on=OFF;
 reset master;
 set global wsrep_on=ON;
 
+--connection node_2
+CALL mtr.add_suppression("Ignoring server id for non bootstrap node");
+
 --source include/galera_end.inc
 --echo # End of test
-
diff --git a/mysql-test/suite/sys_vars/t/wsrep_slave_threads_basic.test b/mysql-test/suite/galera/t/wsrep_slave_threads_basic.test
index 80b4648982d..ecf159f8365 100644
--- a/mysql-test/suite/sys_vars/t/wsrep_slave_threads_basic.test
+++ b/mysql-test/suite/galera/t/wsrep_slave_threads_basic.test
@@ -1,4 +1,4 @@
---source include/have_wsrep.inc
+--source include/galera_cluster.inc
 
 --echo #
 --echo # wsrep_slave_threads
diff --git a/mysql-test/suite/galera_3nodes/r/GCF-363.result b/mysql-test/suite/galera_3nodes/r/GCF-363.result
index afab5012ee5..d7078227ec3 100644
--- a/mysql-test/suite/galera_3nodes/r/GCF-363.result
+++ b/mysql-test/suite/galera_3nodes/r/GCF-363.result
@@ -1,7 +1,10 @@
 connection node_2;
 connection node_1;
-CREATE TABLE t1 (f1 INTEGER PRIMARY KEY, f2 CHAR(1)) ENGINE=InnoDB;
 connection node_1;
+connection node_1;
+connection node_2;
+connection node_1;
+CREATE TABLE t1 (f1 INTEGER PRIMARY KEY, f2 CHAR(1)) ENGINE=InnoDB;
 SET GLOBAL wsrep_on=OFF;
 INSERT INTO t1 VALUES (1, 'a');
 SET GLOBAL wsrep_on=ON;
@@ -44,3 +47,4 @@ connection node_3;
 CALL mtr.add_suppression("WSREP: Vote 0 \\\(success\\\) on (.*) is inconsistent with group. Leaving cluster.");
 CALL mtr.add_suppression("WSREP: Inconsistency detected: Inconsistent by consensus on ");
 CALL mtr.add_suppression("Plugin 'InnoDB' will be forced to shutdown");
+connection node_1;
diff --git a/mysql-test/suite/galera_3nodes/r/galera_2_cluster.result b/mysql-test/suite/galera_3nodes/r/galera_2_cluster.result
index 87898891f9b..5214eafa1c8 100644
--- a/mysql-test/suite/galera_3nodes/r/galera_2_cluster.result
+++ b/mysql-test/suite/galera_3nodes/r/galera_2_cluster.result
@@ -75,15 +75,19 @@ connection node_2;
 SET GLOBAL wsrep_on = OFF;
 RESET MASTER;
 SET GLOBAL wsrep_on = ON;
+CALL mtr.add_suppression("Ignoring server id for non bootstrap node");
 connection node_3;
 SET GLOBAL wsrep_on = OFF;
 RESET MASTER;
 SET GLOBAL wsrep_on = ON;
+CALL mtr.add_suppression("Ignoring server id for non bootstrap node");
 connection node_5;
 SET GLOBAL wsrep_on = OFF;
 RESET MASTER;
 SET GLOBAL wsrep_on = ON;
+CALL mtr.add_suppression("Ignoring server id for non bootstrap node");
 connection node_6;
 SET GLOBAL wsrep_on = OFF;
 RESET MASTER;
 SET GLOBAL wsrep_on = ON;
+CALL mtr.add_suppression("Ignoring server id for non bootstrap node");
diff --git a/mysql-test/suite/galera_3nodes/t/GCF-363.test b/mysql-test/suite/galera_3nodes/t/GCF-363.test
index a65c42bcc5a..5867247e6ee 100644
--- a/mysql-test/suite/galera_3nodes/t/GCF-363.test
+++ b/mysql-test/suite/galera_3nodes/t/GCF-363.test
@@ -5,9 +5,15 @@
 --source include/galera_cluster.inc
 --source include/have_innodb.inc
 
-CREATE TABLE t1 (f1 INTEGER PRIMARY KEY, f2 CHAR(1)) ENGINE=InnoDB;
+--connection node_1
+# Save original auto_increment_offset values.
+--let $node_1=node_1
+--let $node_2=node_2
+--source ../galera/include/auto_increment_offset_save.inc
 
 --connection node_1
+CREATE TABLE t1 (f1 INTEGER PRIMARY KEY, f2 CHAR(1)) ENGINE=InnoDB;
+
 SET GLOBAL wsrep_on=OFF;
 INSERT INTO t1 VALUES (1, 'a');
 SET GLOBAL wsrep_on=ON;
@@ -63,4 +69,7 @@ CALL mtr.add_suppression("WSREP: Vote 0 \\\(success\\\) on (.*) is inconsistent
 CALL mtr.add_suppression("WSREP: Inconsistency detected: Inconsistent by consensus on ");
 CALL mtr.add_suppression("Plugin 'InnoDB' will be forced to shutdown");
 
+--connection node_1
+# Restore original auto_increment_offset values.
+--source ../galera/include/auto_increment_offset_restore.inc
 
diff --git a/mysql-test/suite/galera_3nodes/t/galera_2_cluster.test b/mysql-test/suite/galera_3nodes/t/galera_2_cluster.test
index 8a9a74a7252..d7b0f36551f 100644
--- a/mysql-test/suite/galera_3nodes/t/galera_2_cluster.test
+++ b/mysql-test/suite/galera_3nodes/t/galera_2_cluster.test
@@ -129,20 +129,28 @@ SET GLOBAL wsrep_on = OFF;
 RESET MASTER;
 SET GLOBAL wsrep_on = ON;
 
+CALL mtr.add_suppression("Ignoring server id for non bootstrap node");
+
 --connection node_3
 
 SET GLOBAL wsrep_on = OFF;
 RESET MASTER;
 SET GLOBAL wsrep_on = ON;
 
+CALL mtr.add_suppression("Ignoring server id for non bootstrap node");
+
 --connection node_5
 
 SET GLOBAL wsrep_on = OFF;
 RESET MASTER;
 SET GLOBAL wsrep_on = ON;
 
+CALL mtr.add_suppression("Ignoring server id for non bootstrap node");
+
 --connection node_6
 
 SET GLOBAL wsrep_on = OFF;
 RESET MASTER;
 SET GLOBAL wsrep_on = ON;
+
+CALL mtr.add_suppression("Ignoring server id for non bootstrap node");
diff --git a/mysql-test/suite/galera_sr/r/MDEV-27553.result b/mysql-test/suite/galera_sr/r/MDEV-27553.result
new file mode 100644
index 00000000000..f6f81bd13f1
--- /dev/null
+++ b/mysql-test/suite/galera_sr/r/MDEV-27553.result
@@ -0,0 +1,23 @@
+connection node_2;
+connection node_1;
+CREATE TABLE t1 (f1 INTEGER PRIMARY KEY);
+connection node_1;
+SET SESSION wsrep_trx_fragment_size=1;
+START TRANSACTION;
+INSERT INTO t1 VALUES (1);
+SET @@global.debug_dbug="+d,ha_index_init_fail";
+ROLLBACK;
+connection node_2;
+SELECT COUNT(*) `Expect 0` FROM mysql.wsrep_streaming_log;
+Expect 0
+0
+connection node_1;
+SET @@global.debug_dbug="";
+SELECT COUNT(*) `Expect 1` FROM mysql.wsrep_streaming_log;
+Expect 1
+1
+SET SESSION wsrep_on=OFF;
+DELETE FROM mysql.wsrep_streaming_log;
+SET SESSION wsrep_on=ON;
+DROP TABLE t1;
+CALL mtr.add_suppression("WSREP: Failed to init table for index scan");
diff --git a/mysql-test/suite/galera_sr/r/MDEV-27615.result b/mysql-test/suite/galera_sr/r/MDEV-27615.result
new file mode 100644
index 00000000000..a3475811285
--- /dev/null
+++ b/mysql-test/suite/galera_sr/r/MDEV-27615.result
@@ -0,0 +1,27 @@
+connection node_2;
+connection node_1;
+connection node_1;
+connection node_2;
+connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2;
+connection node_2;
+CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) Engine=InnoDB;
+SET DEBUG_SYNC='wsrep_before_fragment_certification SIGNAL before_fragment WAIT_FOR continue';
+SET SESSION wsrep_trx_fragment_size=1;
+START TRANSACTION;
+INSERT INTO t1 VALUES (1);;
+connection node_2a;
+SET SESSION wsrep_sync_wait = 0;
+SET DEBUG_SYNC='now WAIT_FOR before_fragment';
+SET GLOBAL wsrep_cluster_address = '';
+SET DEBUG_SYNC = 'now SIGNAL continue';
+connection node_2;
+ERROR HY000: Lost connection to MySQL server during query
+connection node_2a;
+SELECT * FROM mysql.wsrep_streaming_log;
+node_uuid	trx_id	seqno	flags	frag
+SELECT * FROM t1;
+f1
+DROP TABLE t1;
+SET DEBUG_SYNC = 'RESET';
+disconnect node_2;
+connect node_2, 127.0.0.1, root, , test, $NODE_MYPORT_2;
diff --git a/mysql-test/suite/galera_sr/r/mdev_18631.result b/mysql-test/suite/galera_sr/r/mdev_18631.result
index bc6c0e48538..779ae5266a3 100644
--- a/mysql-test/suite/galera_sr/r/mdev_18631.result
+++ b/mysql-test/suite/galera_sr/r/mdev_18631.result
@@ -5,6 +5,7 @@ connection node_1;
 CREATE TABLE t1(f1 INT PRIMARY KEY) ENGINE=INNODB;
 INSERT INTO t1 VALUES (1), (2), (3);
 connection node_2;
+call mtr.add_suppression("WSREP: Ignoring server id for non bootstrap node.");
 SELECT * FROM  t1;
 f1
 1
diff --git a/mysql-test/suite/galera_sr/t/MDEV-27553.test b/mysql-test/suite/galera_sr/t/MDEV-27553.test
new file mode 100644
index 00000000000..d17af175512
--- /dev/null
+++ b/mysql-test/suite/galera_sr/t/MDEV-27553.test
@@ -0,0 +1,33 @@
+#
+# MDEV-27553 Assertion `inited==INDEX' failed: int handler::ha_index_end()
+#
+
+--source include/galera_cluster.inc
+--source include/have_debug.inc
+
+CREATE TABLE t1 (f1 INTEGER PRIMARY KEY);
+
+--connection node_1
+--let $wsrep_cluster_address_orig = `SELECT @@wsrep_cluster_address`
+SET SESSION wsrep_trx_fragment_size=1;
+START TRANSACTION;
+INSERT INTO t1 VALUES (1);
+# This will result in failure to remove fragments
+# from streaming log, in the following ROLLBACK.
+SET @@global.debug_dbug="+d,ha_index_init_fail";
+ROLLBACK;
+
+--connection node_2
+SELECT COUNT(*) `Expect 0` FROM mysql.wsrep_streaming_log;
+
+
+--connection node_1
+SET @@global.debug_dbug="";
+SELECT COUNT(*) `Expect 1` FROM mysql.wsrep_streaming_log;
+
+SET SESSION wsrep_on=OFF;
+DELETE FROM mysql.wsrep_streaming_log;
+SET SESSION wsrep_on=ON;
+DROP TABLE t1;
+
+CALL mtr.add_suppression("WSREP: Failed to init table for index scan");
diff --git a/mysql-test/suite/galera_sr/t/MDEV-27615.test b/mysql-test/suite/galera_sr/t/MDEV-27615.test
new file mode 100644
index 00000000000..121a85fb20c
--- /dev/null
+++ b/mysql-test/suite/galera_sr/t/MDEV-27615.test
@@ -0,0 +1,72 @@
+#
+# MDEV-27615 - Assertion `server_id.is_undefined() == false'
+# failed in wsrep::transaction::certify_fragment()
+#
+
+--source include/galera_cluster.inc
+--source include/have_debug_sync.inc
+
+--let $node_1=node_1
+--let $node_2=node_2
+--source suite/galera/include/auto_increment_offset_save.inc
+
+--connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2
+
+--connection node_2
+CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) Engine=InnoDB;
+
+#
+# Set debug sync point right before the assert
+#
+SET DEBUG_SYNC='wsrep_before_fragment_certification SIGNAL before_fragment WAIT_FOR continue';
+
+SET SESSION wsrep_trx_fragment_size=1;
+START TRANSACTION;
+--send INSERT INTO t1 VALUES (1);
+
+
+#
+# Disconnect node_2 from cluster
+#
+--connection node_2a
+SET SESSION wsrep_sync_wait = 0;
+--let $node_2_cluster_address = `SELECT @@wsrep_cluster_address`
+SET DEBUG_SYNC='now WAIT_FOR before_fragment';
+SET GLOBAL wsrep_cluster_address = '';
+
+--let $wait_condition = SELECT VARIABLE_VALUE = 'Disconnected' FROM information_schema.global_status WHERE VARIABLE_NAME = 'wsrep_cluster_status';
+--source include/wait_condition.inc
+SET DEBUG_SYNC = 'now SIGNAL continue';
+
+
+#
+# Disconnect causes connection to node_2 to be closed
+#
+--connection node_2
+--error 2013 # CR_SERVER_LOST
+--reap
+
+
+#
+# Reconnect node 2
+#
+--connection node_2a
+--disable_query_log
+--eval SET GLOBAL wsrep_cluster_address = '$node_2_cluster_address';
+--enable_query_log
+--source include/wait_wsrep_ready.inc
+
+#
+# Expect the transaction to be rolled back and cleanup
+#
+SELECT * FROM mysql.wsrep_streaming_log;
+SELECT * FROM t1;
+
+DROP TABLE t1;
+SET DEBUG_SYNC = 'RESET';
+
+--disconnect node_2
+--connect node_2, 127.0.0.1, root, , test, $NODE_MYPORT_2
+
+
+--source suite/galera/include/auto_increment_offset_restore.inc
diff --git a/mysql-test/suite/galera_sr/t/mdev_18631.test b/mysql-test/suite/galera_sr/t/mdev_18631.test
index b6a0d85bbd4..0d1ea34c2f2 100644
--- a/mysql-test/suite/galera_sr/t/mdev_18631.test
+++ b/mysql-test/suite/galera_sr/t/mdev_18631.test
@@ -14,6 +14,7 @@ CREATE TABLE t1(f1 INT PRIMARY KEY) ENGINE=INNODB;
 INSERT INTO t1 VALUES (1), (2), (3);
 
 --connection node_2
+call mtr.add_suppression("WSREP: Ignoring server id for non bootstrap node.");
 SELECT * FROM  t1;
 
 --connection node_1
diff --git a/mysql-test/suite/innodb/r/innodb-wl5522.result b/mysql-test/suite/innodb/r/innodb-wl5522.result
index dc03bd91424..8079057712d 100644
--- a/mysql-test/suite/innodb/r/innodb-wl5522.result
+++ b/mysql-test/suite/innodb/r/innodb-wl5522.result
@@ -337,7 +337,7 @@ SELECT * FROM t1;
 ERROR HY000: Tablespace has been discarded for table `t1`
 restore: t1 .ibd and .cfg files
 ALTER TABLE t1 IMPORT TABLESPACE;
-ERROR HY000: Schema mismatch (Number of columns don't match, table has 6 columns but the tablespace meta-data file has 5 columns)
+ERROR HY000: Schema mismatch (Column c3 not found in tablespace.)
 unlink: t1.ibd
 unlink: t1.cfg
 DROP TABLE t1;
@@ -922,6 +922,22 @@ c1	c2
 15	1
 16	1
 DROP TABLE t1;
+CREATE TABLE t1 ( id INT NOT NULL, i1 INT, i2 INT, i3 INT, PRIMARY KEY (id)) engine=innodb;
+CREATE TABLE t2 ( id INT NOT NULL, i1 INT, i2 INT, PRIMARY KEY (id)) engine=innodb;
+ALTER TABLE t2 DISCARD TABLESPACE;
+FLUSH TABLES t1 FOR EXPORT;
+UNLOCK TABLES;
+ALTER TABLE t2 IMPORT TABLESPACE;
+ERROR HY000: Schema mismatch (Column DB_ROW_ID ordinal value mismatch, it's at 3 in the table and 4 in the tablespace meta-data file)
+DROP TABLE t1, t2;
+CREATE TABLE t1 ( id INT NOT NULL, i1 INT, i2 INT, PRIMARY KEY (id)) engine=innodb;
+CREATE TABLE t2 ( id INT NOT NULL, i1 INT, i2 INT, i3 INT, PRIMARY KEY (id)) engine=innodb;
+ALTER TABLE t2 DISCARD TABLESPACE;
+FLUSH TABLES t1 FOR EXPORT;
+UNLOCK TABLES;
+ALTER TABLE t2 IMPORT TABLESPACE;
+ERROR HY000: Schema mismatch (Column i3 not found in tablespace.)
+DROP TABLE t1, t2;
 call mtr.add_suppression("Got error -1 when reading table '.*'");
 call mtr.add_suppression("InnoDB: Error: tablespace id and flags in file '.*'");
 call mtr.add_suppression("InnoDB: The table .* doesn't have a corresponding tablespace, it was discarded");
diff --git a/mysql-test/suite/innodb/r/innodb_buffer_pool_resize_with_chunks.result b/mysql-test/suite/innodb/r/innodb_buffer_pool_resize_with_chunks.result
index 4bf244c9588..efb652091bf 100644
--- a/mysql-test/suite/innodb/r/innodb_buffer_pool_resize_with_chunks.result
+++ b/mysql-test/suite/innodb/r/innodb_buffer_pool_resize_with_chunks.result
@@ -1,6 +1,6 @@
 select @@innodb_buffer_pool_chunk_size;
 @@innodb_buffer_pool_chunk_size
-2097152
+4194304
 create table t1 (id int not null, val int not null default '0', primary key (id)) ENGINE=InnoDB ROW_FORMAT=COMPRESSED;
 create or replace view view0 as select 1 union all select 1;
 set @`v_id` := 0;
@@ -18,9 +18,9 @@ count(val)
 262144
 drop table t1;
 drop view view0;
-set global innodb_buffer_pool_size = 1048576;
+set global innodb_buffer_pool_size = 2*1048576;
 Warnings:
-Warning	1292	Truncated incorrect innodb_buffer_pool_size value: '1048576'
+Warning	1292	Truncated incorrect innodb_buffer_pool_size value: '2097152'
 select @@innodb_buffer_pool_size;
 @@innodb_buffer_pool_size
-6291456
+4194304
diff --git a/mysql-test/suite/innodb/r/innodb_information_schema.result b/mysql-test/suite/innodb/r/innodb_information_schema.result
index 6325917c236..921b062eae3 100644
--- a/mysql-test/suite/innodb/r/innodb_information_schema.result
+++ b/mysql-test/suite/innodb/r/innodb_information_schema.result
@@ -1,18 +1,18 @@
 lock_mode	lock_type	lock_table	lock_index	lock_rec	lock_data
-X	RECORD	`test`.```t'\"_str`	PRIMARY	2	'1', 'abc', '''abc', 'abc''', 'a''bc', 'a''bc''', '''abc'''''
-X	RECORD	`test`.```t'\"_str`	PRIMARY	2	'1', 'abc', '''abc', 'abc''', 'a''bc', 'a''bc''', '''abc'''''
-X	RECORD	`test`.```t'\"_str`	PRIMARY	3	'2', 'abc', '"abc', 'abc"', 'a"bc', 'a"bc"', '"abc""'
-X	RECORD	`test`.```t'\"_str`	PRIMARY	3	'2', 'abc', '"abc', 'abc"', 'a"bc', 'a"bc"', '"abc""'
-X	RECORD	`test`.```t'\"_str`	PRIMARY	4	'3', 'abc', '\\abc', 'abc\\', 'a\\bc', 'a\\bc\\', '\\abc\\\\'
-X	RECORD	`test`.```t'\"_str`	PRIMARY	4	'3', 'abc', '\\abc', 'abc\\', 'a\\bc', 'a\\bc\\', '\\abc\\\\'
-X	RECORD	`test`.```t'\"_str`	PRIMARY	5	'4', 'abc', '\0abc', 'abc\0', 'a\0bc', 'a\0bc\0', 'a\0bc\0\0'
-X	RECORD	`test`.```t'\"_str`	PRIMARY	5	'4', 'abc', '\0abc', 'abc\0', 'a\0bc', 'a\0bc\0', 'a\0bc\0\0'
-X	RECORD	`test`.`t_min`	PRIMARY	2	-128, 0, -32768, 0, -8388608, 0, -2147483648, 0, -9223372036854775808, 0
-X	RECORD	`test`.`t_min`	PRIMARY	2	-128, 0, -32768, 0, -8388608, 0, -2147483648, 0, -9223372036854775808, 0
-X	RECORD	`test`.`t_max`	PRIMARY	2	127, 255, 32767, 65535, 8388607, 16777215, 2147483647, 4294967295, 9223372036854775807, 18446744073709551615
-X	RECORD	`test`.`t_max`	PRIMARY	2	127, 255, 32767, 65535, 8388607, 16777215, 2147483647, 4294967295, 9223372036854775807, 18446744073709551615
-X	RECORD	`test`.```t'\"_str`	PRIMARY	1	supremum pseudo-record
-X	RECORD	`test`.```t'\"_str`	PRIMARY	1	supremum pseudo-record
+X	RECORD	`test`.```t'\"_str`	PRIMARY	1	#
+X	RECORD	`test`.```t'\"_str`	PRIMARY	1	#
+X	RECORD	`test`.```t'\"_str`	PRIMARY	2	#
+X	RECORD	`test`.```t'\"_str`	PRIMARY	2	#
+X	RECORD	`test`.```t'\"_str`	PRIMARY	3	#
+X	RECORD	`test`.```t'\"_str`	PRIMARY	3	#
+X	RECORD	`test`.```t'\"_str`	PRIMARY	4	#
+X	RECORD	`test`.```t'\"_str`	PRIMARY	4	#
+X	RECORD	`test`.```t'\"_str`	PRIMARY	5	#
+X	RECORD	`test`.```t'\"_str`	PRIMARY	5	#
+X	RECORD	`test`.`t_max`	PRIMARY	2	#
+X	RECORD	`test`.`t_max`	PRIMARY	2	#
+X	RECORD	`test`.`t_min`	PRIMARY	2	#
+X	RECORD	`test`.`t_min`	PRIMARY	2	#
 lock_table	COUNT(*)
 `test`.`t_max`	2
 `test`.`t_min`	2
@@ -22,28 +22,28 @@ lock_table	COUNT(*)
 "test"."t_min"	2
 "test"."`t'\""_str"	10
 Field	Type	Null	Key	Default	Extra
-trx_id	bigint(21) unsigned	NO		0	
-trx_state	varchar(13)	NO			
-trx_started	datetime	NO		0000-00-00 00:00:00	
+trx_id	bigint(21) unsigned	NO		NULL	
+trx_state	varchar(13)	NO		NULL	
+trx_started	datetime	NO		NULL	
 trx_requested_lock_id	varchar(81)	YES		NULL	
 trx_wait_started	datetime	YES		NULL	
-trx_weight	bigint(21) unsigned	NO		0	
-trx_mysql_thread_id	bigint(21) unsigned	NO		0	
+trx_weight	bigint(21) unsigned	NO		NULL	
+trx_mysql_thread_id	bigint(21) unsigned	NO		NULL	
 trx_query	varchar(1024)	YES		NULL	
 trx_operation_state	varchar(64)	YES		NULL	
-trx_tables_in_use	bigint(21) unsigned	NO		0	
-trx_tables_locked	bigint(21) unsigned	NO		0	
-trx_lock_structs	bigint(21) unsigned	NO		0	
-trx_lock_memory_bytes	bigint(21) unsigned	NO		0	
-trx_rows_locked	bigint(21) unsigned	NO		0	
-trx_rows_modified	bigint(21) unsigned	NO		0	
-trx_concurrency_tickets	bigint(21) unsigned	NO		0	
+trx_tables_in_use	bigint(21) unsigned	NO		NULL	
+trx_tables_locked	bigint(21) unsigned	NO		NULL	
+trx_lock_structs	bigint(21) unsigned	NO		NULL	
+trx_lock_memory_bytes	bigint(21) unsigned	NO		NULL	
+trx_rows_locked	bigint(21) unsigned	NO		NULL	
+trx_rows_modified	bigint(21) unsigned	NO		NULL	
+trx_concurrency_tickets	bigint(21) unsigned	NO		NULL	
 trx_isolation_level	enum('READ UNCOMMITTED','READ COMMITTED','REPEATABLE READ','SERIALIZABLE')	NO		NULL	
-trx_unique_checks	int(1)	NO		0	
-trx_foreign_key_checks	int(1)	NO		0	
+trx_unique_checks	int(1)	NO		NULL	
+trx_foreign_key_checks	int(1)	NO		NULL	
 trx_last_foreign_key_error	varchar(256)	YES		NULL	
-trx_is_read_only	int(1)	NO		0	
-trx_autocommit_non_locking	int(1)	NO		0	
+trx_is_read_only	int(1)	NO		NULL	
+trx_autocommit_non_locking	int(1)	NO		NULL	
 trx_state	trx_weight	trx_tables_in_use	trx_tables_locked	trx_rows_locked	trx_rows_modified	trx_concurrency_tickets	trx_isolation_level	trx_unique_checks	trx_foreign_key_checks
 RUNNING	3	0	1	6	1	0	REPEATABLE READ	1	1
 trx_isolation_level	trx_unique_checks	trx_foreign_key_checks
diff --git a/mysql-test/suite/innodb/r/instant_alter_import.result b/mysql-test/suite/innodb/r/instant_alter_import.result
index c569c65d4ce..5c6497b5939 100644
--- a/mysql-test/suite/innodb/r/instant_alter_import.result
+++ b/mysql-test/suite/innodb/r/instant_alter_import.result
@@ -121,3 +121,12 @@ FLUSH TABLE t1 FOR EXPORT;
 UNLOCK TABLES;
 ALTER TABLE t2 IMPORT TABLESPACE;
 DROP TABLE t2, t1;
+CREATE TABLE t1 ( id INT NOT NULL, i1 INT, i2 INT, PRIMARY KEY (id)) engine=innodb;
+CREATE TABLE t2 ( id INT NOT NULL, i1 INT, i2 INT, PRIMARY KEY (id)) engine=innodb;
+ALTER TABLE test.t1 add COLUMN i3 INT AFTER i1;
+ALTER TABLE t2 DISCARD TABLESPACE;
+FLUSH TABLES t1 FOR EXPORT;
+UNLOCK TABLES;
+ALTER TABLE t2 IMPORT TABLESPACE;
+ERROR HY000: Index for table 't2' is corrupt; try to repair it
+DROP TABLE t1, t2;
diff --git a/mysql-test/suite/innodb/r/no_pad.result b/mysql-test/suite/innodb/r/no_pad.result
new file mode 100644
index 00000000000..0c039c30a5e
--- /dev/null
+++ b/mysql-test/suite/innodb/r/no_pad.result
@@ -0,0 +1,7 @@
+CREATE TABLE t1 (a CHAR(8), id INT, PRIMARY KEY (a,id)) COLLATE utf8_nopad_bin
+ENGINE=InnoDB ROW_FORMAT=REDUNDANT;
+INSERT INTO t1 VALUES ('',1);
+ALTER TABLE t1 ROW_FORMAT=DYNAMIC;
+INSERT INTO t1 VALUES ('',2);
+ALTER TABLE t1 ROW_FORMAT=REDUNDANT;
+DROP TABLE t1;
diff --git a/mysql-test/suite/innodb/r/recovery_memory.result b/mysql-test/suite/innodb/r/recovery_memory.result
new file mode 100644
index 00000000000..4fa31009130
--- /dev/null
+++ b/mysql-test/suite/innodb/r/recovery_memory.result
@@ -0,0 +1,12 @@
+CREATE TABLE t1(c TEXT, KEY(c(3072)))ENGINE=InnoDB;
+CREATE PROCEDURE dorepeat()
+LOOP
+INSERT INTO t1 VALUES ('abc');
+UPDATE t1 SET c='cba';
+END LOOP
+|
+connect con1,localhost,root,,,;
+CALL dorepeat();
+connection default;
+# restart: --innodb_buffer_pool_size=5242880
+DROP TABLE t1;
diff --git a/mysql-test/suite/innodb/r/restart,16k,innodb.rdiff b/mysql-test/suite/innodb/r/restart,16k,innodb.rdiff
new file mode 100644
index 00000000000..b36ed067913
--- /dev/null
+++ b/mysql-test/suite/innodb/r/restart,16k,innodb.rdiff
@@ -0,0 +1,16 @@
+--- ./suite/innodb/r/restart.result	2022-01-18 20:36:56.054653376 +1100
++++ suite/innodb/r/restart.reject	2022-01-19 08:12:28.602794678 +1100
+@@ -32,10 +32,10 @@
+ SELECT @@innodb_buffer_pool_size INTO @innodb_buffer_pool_size_orig;
+ SELECT CEILING((256 + 64) * @@innodb_page_size / 1048576) * 1048576 INTO @min_pool_size;
+ EXECUTE IMMEDIATE 'SET GLOBAL innodb_buffer_pool_size = ?' USING (@min_pool_size -1);
+-ERROR 42000: Variable 'innodb_buffer_pool_size' can't be set to the value of 'WRONG_VALUE'
++ERROR 42000: Variable 'innodb_buffer_pool_size' can't be set to the value of '5242879'
+ SHOW WARNINGS;
+ Level	Code	Message
+-Warning	1210	innodb_buffer_pool_size must be at least MIN_VAL for innodb_page_size=PAGE_SIZE
+-Error	1231	Variable 'innodb_buffer_pool_size' can't be set to the value of 'WRONG_VALUE'
++Warning	1210	innodb_buffer_pool_size must be at least 5242880 for innodb_page_size=16384
++Error	1231	Variable 'innodb_buffer_pool_size' can't be set to the value of '5242879'
+ EXECUTE IMMEDIATE 'SET GLOBAL innodb_buffer_pool_size = ?' USING (@min_pool_size);
+ SET GLOBAL innodb_buffer_pool_size = @innodb_buffer_pool_size_orig;
diff --git a/mysql-test/suite/innodb/r/restart,32k,innodb.rdiff b/mysql-test/suite/innodb/r/restart,32k,innodb.rdiff
new file mode 100644
index 00000000000..8fa057814c4
--- /dev/null
+++ b/mysql-test/suite/innodb/r/restart,32k,innodb.rdiff
@@ -0,0 +1,16 @@
+--- ./suite/innodb/r/restart.result	2022-01-18 20:36:56.054653376 +1100
++++ suite/innodb/r/restart.reject	2022-01-19 08:07:57.402230887 +1100
+@@ -32,10 +32,10 @@
+ SELECT @@innodb_buffer_pool_size INTO @innodb_buffer_pool_size_orig;
+ SELECT CEILING((256 + 64) * @@innodb_page_size / 1048576) * 1048576 INTO @min_pool_size;
+ EXECUTE IMMEDIATE 'SET GLOBAL innodb_buffer_pool_size = ?' USING (@min_pool_size -1);
+-ERROR 42000: Variable 'innodb_buffer_pool_size' can't be set to the value of 'WRONG_VALUE'
++ERROR 42000: Variable 'innodb_buffer_pool_size' can't be set to the value of '10485759'
+ SHOW WARNINGS;
+ Level	Code	Message
+-Warning	1210	innodb_buffer_pool_size must be at least MIN_VAL for innodb_page_size=PAGE_SIZE
+-Error	1231	Variable 'innodb_buffer_pool_size' can't be set to the value of 'WRONG_VALUE'
++Warning	1210	innodb_buffer_pool_size must be at least 10485760 for innodb_page_size=32768
++Error	1231	Variable 'innodb_buffer_pool_size' can't be set to the value of '10485759'
+ EXECUTE IMMEDIATE 'SET GLOBAL innodb_buffer_pool_size = ?' USING (@min_pool_size);
+ SET GLOBAL innodb_buffer_pool_size = @innodb_buffer_pool_size_orig;
diff --git a/mysql-test/suite/innodb/r/restart,4k,innodb.rdiff b/mysql-test/suite/innodb/r/restart,4k,innodb.rdiff
new file mode 100644
index 00000000000..7d0846360e0
--- /dev/null
+++ b/mysql-test/suite/innodb/r/restart,4k,innodb.rdiff
@@ -0,0 +1,16 @@
+--- ./suite/innodb/r/restart.result	2022-01-18 20:36:56.054653376 +1100
++++ suite/innodb/r/restart.reject	2022-01-19 08:13:56.397475513 +1100
+@@ -32,10 +32,10 @@
+ SELECT @@innodb_buffer_pool_size INTO @innodb_buffer_pool_size_orig;
+ SELECT CEILING((256 + 64) * @@innodb_page_size / 1048576) * 1048576 INTO @min_pool_size;
+ EXECUTE IMMEDIATE 'SET GLOBAL innodb_buffer_pool_size = ?' USING (@min_pool_size -1);
+-ERROR 42000: Variable 'innodb_buffer_pool_size' can't be set to the value of 'WRONG_VALUE'
++ERROR 42000: Variable 'innodb_buffer_pool_size' can't be set to the value of '2097151'
+ SHOW WARNINGS;
+ Level	Code	Message
+-Warning	1210	innodb_buffer_pool_size must be at least MIN_VAL for innodb_page_size=PAGE_SIZE
+-Error	1231	Variable 'innodb_buffer_pool_size' can't be set to the value of 'WRONG_VALUE'
++Warning	1210	innodb_buffer_pool_size must be at least 2097152 for innodb_page_size=4096
++Error	1231	Variable 'innodb_buffer_pool_size' can't be set to the value of '2097151'
+ EXECUTE IMMEDIATE 'SET GLOBAL innodb_buffer_pool_size = ?' USING (@min_pool_size);
+ SET GLOBAL innodb_buffer_pool_size = @innodb_buffer_pool_size_orig;
diff --git a/mysql-test/suite/innodb/r/restart,64k,innodb.rdiff b/mysql-test/suite/innodb/r/restart,64k,innodb.rdiff
new file mode 100644
index 00000000000..3ac9f45b196
--- /dev/null
+++ b/mysql-test/suite/innodb/r/restart,64k,innodb.rdiff
@@ -0,0 +1,16 @@
+--- ./suite/innodb/r/restart.result	2022-01-18 20:36:56.054653376 +1100
++++ suite/innodb/r/restart.reject	2022-01-19 08:11:32.418759095 +1100
+@@ -32,10 +32,10 @@
+ SELECT @@innodb_buffer_pool_size INTO @innodb_buffer_pool_size_orig;
+ SELECT CEILING((256 + 64) * @@innodb_page_size / 1048576) * 1048576 INTO @min_pool_size;
+ EXECUTE IMMEDIATE 'SET GLOBAL innodb_buffer_pool_size = ?' USING (@min_pool_size -1);
+-ERROR 42000: Variable 'innodb_buffer_pool_size' can't be set to the value of 'WRONG_VALUE'
++ERROR 42000: Variable 'innodb_buffer_pool_size' can't be set to the value of '20971519'
+ SHOW WARNINGS;
+ Level	Code	Message
+-Warning	1210	innodb_buffer_pool_size must be at least MIN_VAL for innodb_page_size=PAGE_SIZE
+-Error	1231	Variable 'innodb_buffer_pool_size' can't be set to the value of 'WRONG_VALUE'
++Warning	1210	innodb_buffer_pool_size must be at least 20971520 for innodb_page_size=65536
++Error	1231	Variable 'innodb_buffer_pool_size' can't be set to the value of '20971519'
+ EXECUTE IMMEDIATE 'SET GLOBAL innodb_buffer_pool_size = ?' USING (@min_pool_size);
+ SET GLOBAL innodb_buffer_pool_size = @innodb_buffer_pool_size_orig;
diff --git a/mysql-test/suite/innodb/r/restart,8k,innodb.rdiff b/mysql-test/suite/innodb/r/restart,8k,innodb.rdiff
new file mode 100644
index 00000000000..4da55ebfcef
--- /dev/null
+++ b/mysql-test/suite/innodb/r/restart,8k,innodb.rdiff
@@ -0,0 +1,16 @@
+--- ./suite/innodb/r/restart.result	2022-01-18 20:36:56.054653376 +1100
++++ suite/innodb/r/restart.reject	2022-01-19 08:13:11.027788852 +1100
+@@ -32,10 +32,10 @@
+ SELECT @@innodb_buffer_pool_size INTO @innodb_buffer_pool_size_orig;
+ SELECT CEILING((256 + 64) * @@innodb_page_size / 1048576) * 1048576 INTO @min_pool_size;
+ EXECUTE IMMEDIATE 'SET GLOBAL innodb_buffer_pool_size = ?' USING (@min_pool_size -1);
+-ERROR 42000: Variable 'innodb_buffer_pool_size' can't be set to the value of 'WRONG_VALUE'
++ERROR 42000: Variable 'innodb_buffer_pool_size' can't be set to the value of '3145727'
+ SHOW WARNINGS;
+ Level	Code	Message
+-Warning	1210	innodb_buffer_pool_size must be at least MIN_VAL for innodb_page_size=PAGE_SIZE
+-Error	1231	Variable 'innodb_buffer_pool_size' can't be set to the value of 'WRONG_VALUE'
++Warning	1210	innodb_buffer_pool_size must be at least 3145728 for innodb_page_size=8192
++Error	1231	Variable 'innodb_buffer_pool_size' can't be set to the value of '3145727'
+ EXECUTE IMMEDIATE 'SET GLOBAL innodb_buffer_pool_size = ?' USING (@min_pool_size);
+ SET GLOBAL innodb_buffer_pool_size = @innodb_buffer_pool_size_orig;
diff --git a/mysql-test/suite/innodb/r/restart.result b/mysql-test/suite/innodb/r/restart.result
index ea9734d5a01..aba08a9ae99 100644
--- a/mysql-test/suite/innodb/r/restart.result
+++ b/mysql-test/suite/innodb/r/restart.result
@@ -27,3 +27,16 @@ a
 SELECT * FROM td;
 a
 DROP TABLE tr,tc,td;
+#
+# MDEV-27467 innodb to enfore the minimum innodb_buffer_pool_size in SET (resize) the same as startup
+#
+SELECT @@innodb_buffer_pool_size INTO @innodb_buffer_pool_size_orig;
+SELECT CEILING((256 + 64) * @@innodb_page_size / 1048576) * 1048576 INTO @min_pool_size;
+EXECUTE IMMEDIATE 'SET GLOBAL innodb_buffer_pool_size = ?' USING (@min_pool_size -1);
+ERROR 42000: Variable 'innodb_buffer_pool_size' can't be set to the value of 'WRONG_VALUE'
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1210	innodb_buffer_pool_size must be at least MIN_VAL for innodb_page_size=PAGE_SIZE
+Error	1231	Variable 'innodb_buffer_pool_size' can't be set to the value of 'WRONG_VALUE'
+EXECUTE IMMEDIATE 'SET GLOBAL innodb_buffer_pool_size = ?' USING (@min_pool_size);
+SET GLOBAL innodb_buffer_pool_size = @innodb_buffer_pool_size_orig;
diff --git a/mysql-test/suite/innodb/r/skip_symbolic_links.result b/mysql-test/suite/innodb/r/skip_symbolic_links.result
new file mode 100644
index 00000000000..e7a8a3cf86b
--- /dev/null
+++ b/mysql-test/suite/innodb/r/skip_symbolic_links.result
@@ -0,0 +1,56 @@
+SELECT @@have_symlink;
+@@have_symlink
+DISABLED
+CREATE TABLE t1(a INT) ENGINE=InnoDB DATA DIRECTORY 'MYSQL_TMP_DIR';
+Warnings:
+Warning	1618	<DATA DIRECTORY> option ignored
+DROP TABLE t1;
+CREATE TABLE t1(a INT) ENGINE=InnoDB;
+ALTER TABLE t1 DATA DIRECTORY 'MYSQL_TMP_DIR';
+Warnings:
+Warning	1618	<DATA DIRECTORY> option ignored
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` int(11) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+DROP TABLE t1;
+# restart: --symbolic-links
+CREATE TABLE t1(a INT PRIMARY KEY, b INT) ENGINE=InnoDB
+DATA DIRECTORY 'MYSQL_TMP_DIR';
+CREATE TABLE t2(a INT PRIMARY KEY, b INT) ENGINE=InnoDB
+DATA DIRECTORY 'MYSQL_TMP_DIR';
+TRUNCATE TABLE t1;
+TRUNCATE TABLE t2;
+# restart
+ALTER TABLE t1 FORCE, ALGORITHM=INPLACE;
+Warnings:
+Warning	1618	<DATA DIRECTORY> option ignored
+ALTER TABLE t2 FORCE, ALGORITHM=COPY;
+Warnings:
+Warning	1618	<DATA DIRECTORY> option ignored
+OPTIMIZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	optimize	note	Table does not support optimize, doing recreate + analyze instead
+test.t1	optimize	status	OK
+Warnings:
+Warning	1618	<DATA DIRECTORY> option ignored
+t1.ibd
+DROP TABLE t2;
+RENAME TABLE t1 TO t2;
+ALTER TABLE t2 ADD UNIQUE INDEX(b), RENAME TO t3;
+Warnings:
+Warning	1618	<DATA DIRECTORY> option ignored
+ALTER TABLE t3 RENAME TO t2;
+ALTER TABLE t2 DROP INDEX b, RENAME TO t1;
+Warnings:
+Warning	1618	<DATA DIRECTORY> option ignored
+ALTER TABLE t1 CHANGE b c INT;
+Warnings:
+Warning	1618	<DATA DIRECTORY> option ignored
+ALTER TABLE t1 CHANGE c b INT NOT NULL;
+Warnings:
+Warning	1618	<DATA DIRECTORY> option ignored
+t1.ibd
+TRUNCATE TABLE t1;
+DROP TABLE t1;
diff --git a/mysql-test/suite/innodb/t/101_compatibility.test b/mysql-test/suite/innodb/t/101_compatibility.test
index eb1ec3b26ac..878daad2756 100644
--- a/mysql-test/suite/innodb/t/101_compatibility.test
+++ b/mysql-test/suite/innodb/t/101_compatibility.test
@@ -1,5 +1,6 @@
 --source include/innodb_page_size.inc
 --source include/not_embedded.inc
+--source include/have_symlink.inc
 
 -- echo #
 -- echo # MDEV-11623 MariaDB 10.1 fails to start datadir created with
diff --git a/mysql-test/suite/innodb/t/create_isl_with_direct.test b/mysql-test/suite/innodb/t/create_isl_with_direct.test
index 1427264e13e..2092d03b72f 100644
--- a/mysql-test/suite/innodb/t/create_isl_with_direct.test
+++ b/mysql-test/suite/innodb/t/create_isl_with_direct.test
@@ -1,5 +1,6 @@
 --source include/not_embedded.inc
 --source include/have_innodb.inc
+--source include/have_symlink.inc
 
 --disable_query_log
 CALL mtr.add_suppression(".*Failed to set O_DIRECT on file.*");
diff --git a/mysql-test/suite/innodb/t/innodb-wl5522.test b/mysql-test/suite/innodb/t/innodb-wl5522.test
index a70ae86f1cd..80d987fb87f 100644
--- a/mysql-test/suite/innodb/t/innodb-wl5522.test
+++ b/mysql-test/suite/innodb/t/innodb-wl5522.test
@@ -1084,6 +1084,44 @@ DROP TABLE t1;
 SET GLOBAL innodb_read_only_compressed=@save_innodb_read_only_compressed;
 --enable_query_log
 
+
+CREATE TABLE t1 ( id INT NOT NULL, i1 INT, i2 INT, i3 INT, PRIMARY KEY (id)) engine=innodb;
+CREATE TABLE t2 ( id INT NOT NULL, i1 INT, i2 INT, PRIMARY KEY (id)) engine=innodb;
+
+ALTER TABLE t2 DISCARD TABLESPACE;
+FLUSH TABLES t1 FOR EXPORT;
+
+--copy_file $MYSQLD_DATADIR/test/t1.ibd $MYSQLD_DATADIR/test/t2.ibd
+--copy_file $MYSQLD_DATADIR/test/t1.cfg $MYSQLD_DATADIR/test/t2.cfg
+
+UNLOCK TABLES;
+--error ER_TABLE_SCHEMA_MISMATCH
+ALTER TABLE t2 IMPORT TABLESPACE;
+
+DROP TABLE t1, t2;
+
+
+CREATE TABLE t1 ( id INT NOT NULL, i1 INT, i2 INT, PRIMARY KEY (id)) engine=innodb;
+--remove_file $MYSQLD_DATADIR/test/t2.ibd
+CREATE TABLE t2 ( id INT NOT NULL, i1 INT, i2 INT, i3 INT, PRIMARY KEY (id)) engine=innodb;
+
+ALTER TABLE t2 DISCARD TABLESPACE;
+FLUSH TABLES t1 FOR EXPORT;
+
+--copy_file $MYSQLD_DATADIR/test/t1.ibd $MYSQLD_DATADIR/test/t2.ibd
+--copy_file $MYSQLD_DATADIR/test/t1.cfg $MYSQLD_DATADIR/test/t2.cfg
+
+UNLOCK TABLES;
+--error ER_TABLE_SCHEMA_MISMATCH
+ALTER TABLE t2 IMPORT TABLESPACE;
+
+--remove_file $MYSQLD_DATADIR/test/t2.ibd
+--remove_file $MYSQLD_DATADIR/test/t2.cfg
+
+
+DROP TABLE t1, t2;
+
+
 call mtr.add_suppression("Got error -1 when reading table '.*'");
 call mtr.add_suppression("InnoDB: Error: tablespace id and flags in file '.*'");
 call mtr.add_suppression("InnoDB: The table .* doesn't have a corresponding tablespace, it was discarded");
diff --git a/mysql-test/suite/innodb/t/innodb-wl5980-alter.test b/mysql-test/suite/innodb/t/innodb-wl5980-alter.test
index f57d263fb3b..8f58bc6ce48 100644
--- a/mysql-test/suite/innodb/t/innodb-wl5980-alter.test
+++ b/mysql-test/suite/innodb/t/innodb-wl5980-alter.test
@@ -4,6 +4,7 @@
 --echo #
 
 --source include/have_innodb.inc
+--source include/have_symlink.inc
 
 SET @innodb_file_per_table_orig=@@GLOBAL.innodb_file_per_table;
 LET $regexp=/FTS_[0-9a-f_]+([A-Z0-9_]+)\.([islbd]{3})/FTS_AUX_\1.\2/;
diff --git a/mysql-test/suite/innodb/t/innodb-wl5980-debug.test b/mysql-test/suite/innodb/t/innodb-wl5980-debug.test
index 2c5e2b48870..dbb8ad33676 100644
--- a/mysql-test/suite/innodb/t/innodb-wl5980-debug.test
+++ b/mysql-test/suite/innodb/t/innodb-wl5980-debug.test
@@ -8,6 +8,7 @@
 --source include/not_embedded.inc
 --source include/have_debug.inc
 --source include/have_innodb.inc
+--source include/have_symlink.inc
 
 # These messages are expected in the log
 call mtr.add_suppression("Cannot find space id [0-9]+ in the tablespace memory cache");
diff --git a/mysql-test/suite/innodb/t/innodb_buffer_pool_resize_with_chunks.opt b/mysql-test/suite/innodb/t/innodb_buffer_pool_resize_with_chunks.opt
index b97a3995457..ade197de338 100644
--- a/mysql-test/suite/innodb/t/innodb_buffer_pool_resize_with_chunks.opt
+++ b/mysql-test/suite/innodb/t/innodb_buffer_pool_resize_with_chunks.opt
@@ -1,3 +1,3 @@
 --innodb-buffer-pool-size=16M
---innodb-buffer-pool-chunk-size=2M
+--innodb-buffer-pool-chunk-size=4M
 --innodb-page-size=4k
diff --git a/mysql-test/suite/innodb/t/innodb_buffer_pool_resize_with_chunks.test b/mysql-test/suite/innodb/t/innodb_buffer_pool_resize_with_chunks.test
index 36d6bd739b3..7f894bbb411 100644
--- a/mysql-test/suite/innodb/t/innodb_buffer_pool_resize_with_chunks.test
+++ b/mysql-test/suite/innodb/t/innodb_buffer_pool_resize_with_chunks.test
@@ -56,7 +56,7 @@ drop table t1;
 drop view view0;
 
 # Try to shrink buffer pool to smaller than chunk size
-set global innodb_buffer_pool_size = 1048576;
+set global innodb_buffer_pool_size = 2*1048576;
 --source include/wait_condition.inc
 select @@innodb_buffer_pool_size;
 
diff --git a/mysql-test/suite/innodb/t/innodb_information_schema.test b/mysql-test/suite/innodb/t/innodb_information_schema.test
index 395fa779773..88e2d3601a6 100644
--- a/mysql-test/suite/innodb/t/innodb_information_schema.test
+++ b/mysql-test/suite/innodb/t/innodb_information_schema.test
@@ -148,6 +148,8 @@ if (!$success)
     -- echo Timeout waiting for rows in INNODB_LOCKS to appear
 }
 
+--replace_column 6 #
+--sorted_result
 SELECT lock_mode, lock_type, lock_table, lock_index, lock_rec, lock_data
 FROM INFORMATION_SCHEMA.INNODB_LOCKS ORDER BY lock_data;
 
diff --git a/mysql-test/suite/innodb/t/instant_alter_import.test b/mysql-test/suite/innodb/t/instant_alter_import.test
index 99ae48ba815..5504cee4dce 100644
--- a/mysql-test/suite/innodb/t/instant_alter_import.test
+++ b/mysql-test/suite/innodb/t/instant_alter_import.test
@@ -6,6 +6,11 @@ call mtr.add_suppression("Operating system error number .* in a file operation."
 call mtr.add_suppression("The error means the system cannot find the path specified.");
 call mtr.add_suppression("File ./test/t1.ibd: 'delete' returned OS error");
 
+--disable_query_log
+call mtr.add_suppression("Table `test`.`t2` contains unrecognizable instant ALTER metadata");
+call mtr.add_suppression("Index for table 't2' is corrupt; try to repair it");
+--enable_query_log
+
 set default_storage_engine=innodb;
 
 --echo #
@@ -185,3 +190,21 @@ UNLOCK TABLES;
 ALTER TABLE t2 IMPORT TABLESPACE;
 
 DROP TABLE t2, t1;
+
+
+CREATE TABLE t1 ( id INT NOT NULL, i1 INT, i2 INT, PRIMARY KEY (id)) engine=innodb;
+CREATE TABLE t2 ( id INT NOT NULL, i1 INT, i2 INT, PRIMARY KEY (id)) engine=innodb;
+
+ALTER TABLE test.t1 add COLUMN i3 INT AFTER i1;
+
+ALTER TABLE t2 DISCARD TABLESPACE;
+FLUSH TABLES t1 FOR EXPORT;
+
+--copy_file $MYSQLD_DATADIR/test/t1.ibd $MYSQLD_DATADIR/test/t2.ibd
+--copy_file $MYSQLD_DATADIR/test/t1.cfg $MYSQLD_DATADIR/test/t2.cfg
+
+UNLOCK TABLES;
+--error ER_NOT_KEYFILE
+ALTER TABLE t2 IMPORT TABLESPACE;
+
+DROP TABLE t1, t2;
diff --git a/mysql-test/suite/innodb/t/no_pad.test b/mysql-test/suite/innodb/t/no_pad.test
new file mode 100644
index 00000000000..1be1972c9ca
--- /dev/null
+++ b/mysql-test/suite/innodb/t/no_pad.test
@@ -0,0 +1,10 @@
+--source include/have_innodb.inc
+
+CREATE TABLE t1 (a CHAR(8), id INT, PRIMARY KEY (a,id)) COLLATE utf8_nopad_bin
+ENGINE=InnoDB ROW_FORMAT=REDUNDANT;
+
+INSERT INTO t1 VALUES ('',1);
+ALTER TABLE t1 ROW_FORMAT=DYNAMIC;
+INSERT INTO t1 VALUES ('',2);
+ALTER TABLE t1 ROW_FORMAT=REDUNDANT;
+DROP TABLE t1;
diff --git a/mysql-test/suite/innodb/t/recovery_memory.opt b/mysql-test/suite/innodb/t/recovery_memory.opt
new file mode 100644
index 00000000000..7207fd27a42
--- /dev/null
+++ b/mysql-test/suite/innodb/t/recovery_memory.opt
@@ -0,0 +1 @@
+--innodb_buffer_pool_size=1073741824
diff --git a/mysql-test/suite/innodb/t/recovery_memory.test b/mysql-test/suite/innodb/t/recovery_memory.test
new file mode 100644
index 00000000000..d9afd52c499
--- /dev/null
+++ b/mysql-test/suite/innodb/t/recovery_memory.test
@@ -0,0 +1,21 @@
+--source include/have_innodb.inc
+--source include/big_test.inc
+CREATE TABLE t1(c TEXT, KEY(c(3072)))ENGINE=InnoDB;
+DELIMITER |;
+
+CREATE PROCEDURE dorepeat()
+  LOOP
+   INSERT INTO t1 VALUES ('abc');
+   UPDATE t1 SET c='cba';
+  END LOOP
+|
+
+DELIMITER ;|
+connect(con1,localhost,root,,,);
+send CALL dorepeat();
+connection default;
+sleep 10;
+let $shutdown_timeout=0;
+let $restart_parameters=--innodb_buffer_pool_size=5242880;
+--source include/restart_mysqld.inc
+DROP TABLE t1;
diff --git a/mysql-test/suite/innodb/t/restart.opt b/mysql-test/suite/innodb/t/restart.opt
new file mode 100644
index 00000000000..ce43e89cb2b
--- /dev/null
+++ b/mysql-test/suite/innodb/t/restart.opt
@@ -0,0 +1,2 @@
+--loose-innodb_disable_resize_buffer_pool_debug=0
+--innodb-buffer-pool-chunk-size=1M
diff --git a/mysql-test/suite/innodb/t/restart.test b/mysql-test/suite/innodb/t/restart.test
index a5f2e5a42e8..1ca4f51c747 100644
--- a/mysql-test/suite/innodb/t/restart.test
+++ b/mysql-test/suite/innodb/t/restart.test
@@ -1,5 +1,6 @@
 --source include/innodb_page_size.inc
 --source include/not_embedded.inc
+--source include/have_symlink.inc
 
 let datadir= `select @@datadir`;
 let page_size= `select @@innodb_page_size`;
@@ -85,3 +86,26 @@ SELECT * FROM tr;
 SELECT * FROM tc;
 SELECT * FROM td;
 DROP TABLE tr,tc,td;
+
+--echo #
+--echo # MDEV-27467 innodb to enfore the minimum innodb_buffer_pool_size in SET (resize) the same as startup
+--echo #
+
+let $wait_timeout = 180;
+let $wait_condition =
+  SELECT SUBSTR(variable_value, 1, 34) = 'Completed resizing buffer pool at '
+  FROM information_schema.global_status
+  WHERE LOWER(variable_name) = 'innodb_buffer_pool_resize_status';
+
+SELECT @@innodb_buffer_pool_size INTO @innodb_buffer_pool_size_orig;
+SELECT CEILING((256 + 64) * @@innodb_page_size / 1048576) * 1048576 INTO @min_pool_size;
+--error ER_WRONG_VALUE_FOR_VAR
+EXECUTE IMMEDIATE 'SET GLOBAL innodb_buffer_pool_size = ?' USING (@min_pool_size -1);
+
+SHOW WARNINGS;
+
+EXECUTE IMMEDIATE 'SET GLOBAL innodb_buffer_pool_size = ?' USING (@min_pool_size);
+
+--source include/wait_condition.inc
+
+SET GLOBAL innodb_buffer_pool_size = @innodb_buffer_pool_size_orig;
diff --git a/mysql-test/suite/innodb/t/skip_symbolic_links.opt b/mysql-test/suite/innodb/t/skip_symbolic_links.opt
new file mode 100644
index 00000000000..c7844699cdb
--- /dev/null
+++ b/mysql-test/suite/innodb/t/skip_symbolic_links.opt
@@ -0,0 +1 @@
+--skip-symbolic-links
diff --git a/mysql-test/suite/innodb/t/skip_symbolic_links.test b/mysql-test/suite/innodb/t/skip_symbolic_links.test
new file mode 100644
index 00000000000..b5274d220c8
--- /dev/null
+++ b/mysql-test/suite/innodb/t/skip_symbolic_links.test
@@ -0,0 +1,51 @@
+--source include/have_innodb.inc
+--source include/not_windows.inc
+
+SELECT @@have_symlink;
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+eval CREATE TABLE t1(a INT) ENGINE=InnoDB DATA DIRECTORY '$MYSQL_TMP_DIR';
+DROP TABLE t1;
+CREATE TABLE t1(a INT) ENGINE=InnoDB;
+
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+eval ALTER TABLE t1 DATA DIRECTORY '$MYSQL_TMP_DIR';
+SHOW CREATE TABLE t1;
+
+DROP TABLE t1;
+
+--let $restart_parameters=--symbolic-links
+--source include/restart_mysqld.inc
+
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+eval CREATE TABLE t1(a INT PRIMARY KEY, b INT) ENGINE=InnoDB
+DATA DIRECTORY '$MYSQL_TMP_DIR';
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+eval CREATE TABLE t2(a INT PRIMARY KEY, b INT) ENGINE=InnoDB
+DATA DIRECTORY '$MYSQL_TMP_DIR';
+
+TRUNCATE TABLE t1;
+TRUNCATE TABLE t2;
+
+--let $restart_parameters=
+--source include/restart_mysqld.inc
+
+# Native ALTER will retain DATA DIRECTORY
+ALTER TABLE t1 FORCE, ALGORITHM=INPLACE;
+ALTER TABLE t2 FORCE, ALGORITHM=COPY;
+OPTIMIZE TABLE t1;
+--list_files $MYSQL_TMP_DIR/test
+DROP TABLE t2;
+
+RENAME TABLE t1 TO t2;
+ALTER TABLE t2 ADD UNIQUE INDEX(b), RENAME TO t3;
+
+ALTER TABLE t3 RENAME TO t2;
+ALTER TABLE t2 DROP INDEX b, RENAME TO t1;
+ALTER TABLE t1 CHANGE b c INT;
+ALTER TABLE t1 CHANGE c b INT NOT NULL;
+
+--list_files $MYSQL_TMP_DIR/test
+# TRUNCATE TABLE will discard DATA DIRECTORY.
+TRUNCATE TABLE t1;
+--list_files $MYSQL_TMP_DIR/test
+DROP TABLE t1;
diff --git a/mysql-test/suite/innodb_fts/r/innodb_fts_plugin.result b/mysql-test/suite/innodb_fts/r/innodb_fts_plugin.result
index 85271aebcf4..60be41d5839 100644
--- a/mysql-test/suite/innodb_fts/r/innodb_fts_plugin.result
+++ b/mysql-test/suite/innodb_fts/r/innodb_fts_plugin.result
@@ -162,6 +162,7 @@ id	title	body
 SELECT COUNT(*) FROM articles;
 COUNT(*)
 5
+INSERT INTO articles (title, body) VALUES ('111', '1234 1234 1234');
 DROP TABLE articles;
 # Test Part 5: Test Uninstall Plugin After Index is Built
 CREATE TABLE articles (
diff --git a/mysql-test/suite/innodb_fts/t/innodb_fts_plugin.test b/mysql-test/suite/innodb_fts/t/innodb_fts_plugin.test
index 643e4a08b0e..aa52ef5051a 100644
--- a/mysql-test/suite/innodb_fts/t/innodb_fts_plugin.test
+++ b/mysql-test/suite/innodb_fts/t/innodb_fts_plugin.test
@@ -160,6 +160,8 @@ SELECT * FROM articles WHERE
 SELECT * FROM articles WHERE
          MATCH(title, body) AGAINST('full text search');
 SELECT COUNT(*) FROM articles;
+
+INSERT INTO articles (title, body) VALUES ('111', '1234 1234 1234');
 DROP TABLE articles;
 
 -- echo # Test Part 5: Test Uninstall Plugin After Index is Built
diff --git a/mysql-test/suite/innodb_gis/r/rtree_split.result b/mysql-test/suite/innodb_gis/r/rtree_split.result
index df88960ba3d..2d6e8a1dfbe 100644
--- a/mysql-test/suite/innodb_gis/r/rtree_split.result
+++ b/mysql-test/suite/innodb_gis/r/rtree_split.result
@@ -61,3 +61,10 @@ select count(*) from t1 where MBRWithin(t1.c2, @g1);
 count(*)
 57344
 drop table t1;
+#
+# MDEV-27417 Spatial index tries to update
+#	change buffer bookkeeping page
+#
+CREATE TEMPORARY TABLE t1 (c POINT NOT NULL, SPATIAL(c)) ENGINE=InnoDB;
+INSERT INTO t1 SELECT PointFromText('POINT(0 0)') FROM seq_1_to_366;
+DROP TABLE t1;
diff --git a/mysql-test/suite/innodb_gis/t/rtree_split.test b/mysql-test/suite/innodb_gis/t/rtree_split.test
index 6f285187508..8697141ddea 100644
--- a/mysql-test/suite/innodb_gis/t/rtree_split.test
+++ b/mysql-test/suite/innodb_gis/t/rtree_split.test
@@ -73,3 +73,11 @@ select count(*) from t1 where MBRWithin(t1.c2, @g1);
 
 # Clean up.
 drop table t1;
+
+--echo #
+--echo # MDEV-27417 Spatial index tries to update
+--echo #	change buffer bookkeeping page
+--echo #
+CREATE TEMPORARY TABLE t1 (c POINT NOT NULL, SPATIAL(c)) ENGINE=InnoDB;
+INSERT INTO t1 SELECT PointFromText('POINT(0 0)') FROM seq_1_to_366;
+DROP TABLE t1;
diff --git a/mysql-test/suite/innodb_i_s/innodb_buffer_page.result b/mysql-test/suite/innodb_i_s/innodb_buffer_page.result
index fb2e9913e47..91140c3d9af 100644
--- a/mysql-test/suite/innodb_i_s/innodb_buffer_page.result
+++ b/mysql-test/suite/innodb_i_s/innodb_buffer_page.result
@@ -1,26 +1,26 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_BUFFER_PAGE;
 Table	Create Table
 INNODB_BUFFER_PAGE	CREATE TEMPORARY TABLE `INNODB_BUFFER_PAGE` (
-  `POOL_ID` int(11) unsigned NOT NULL DEFAULT 0,
-  `BLOCK_ID` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `SPACE` int(11) unsigned NOT NULL DEFAULT 0,
-  `PAGE_NUMBER` int(11) unsigned NOT NULL DEFAULT 0,
-  `PAGE_TYPE` varchar(64) DEFAULT NULL,
-  `FLUSH_TYPE` int(11) unsigned NOT NULL DEFAULT 0,
-  `FIX_COUNT` int(11) unsigned NOT NULL DEFAULT 0,
-  `IS_HASHED` int(1) NOT NULL DEFAULT 0,
-  `NEWEST_MODIFICATION` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `OLDEST_MODIFICATION` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `ACCESS_TIME` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `TABLE_NAME` varchar(1024) DEFAULT NULL,
-  `INDEX_NAME` varchar(64) DEFAULT NULL,
-  `NUMBER_RECORDS` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `DATA_SIZE` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `COMPRESSED_SIZE` bigint(21) unsigned NOT NULL DEFAULT 0,
+  `POOL_ID` int(11) unsigned NOT NULL,
+  `BLOCK_ID` bigint(21) unsigned NOT NULL,
+  `SPACE` int(11) unsigned NOT NULL,
+  `PAGE_NUMBER` int(11) unsigned NOT NULL,
+  `PAGE_TYPE` varchar(64),
+  `FLUSH_TYPE` int(11) unsigned NOT NULL,
+  `FIX_COUNT` int(11) unsigned NOT NULL,
+  `IS_HASHED` int(1) NOT NULL,
+  `NEWEST_MODIFICATION` bigint(21) unsigned NOT NULL,
+  `OLDEST_MODIFICATION` bigint(21) unsigned NOT NULL,
+  `ACCESS_TIME` bigint(21) unsigned NOT NULL,
+  `TABLE_NAME` varchar(1024),
+  `INDEX_NAME` varchar(64),
+  `NUMBER_RECORDS` bigint(21) unsigned NOT NULL,
+  `DATA_SIZE` bigint(21) unsigned NOT NULL,
+  `COMPRESSED_SIZE` bigint(21) unsigned NOT NULL,
   `PAGE_STATE` enum('NOT_USED','MEMORY','REMOVE_HASH','FILE_PAGE') NOT NULL,
   `IO_FIX` enum('IO_NONE','IO_READ','IO_WRITE') NOT NULL,
-  `IS_OLD` int(1) NOT NULL DEFAULT 0,
-  `FREE_PAGE_CLOCK` bigint(21) unsigned NOT NULL DEFAULT 0
+  `IS_OLD` int(1) NOT NULL,
+  `FREE_PAGE_CLOCK` bigint(21) unsigned NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
 CREATE TEMPORARY TABLE t1 LIKE INFORMATION_SCHEMA.INNODB_BUFFER_PAGE;
 DROP TEMPORARY TABLE t1;
diff --git a/mysql-test/suite/innodb_i_s/innodb_buffer_page_lru.result b/mysql-test/suite/innodb_i_s/innodb_buffer_page_lru.result
index 7954c593164..6ba8503a062 100644
--- a/mysql-test/suite/innodb_i_s/innodb_buffer_page_lru.result
+++ b/mysql-test/suite/innodb_i_s/innodb_buffer_page_lru.result
@@ -1,26 +1,26 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_BUFFER_PAGE_LRU;
 Table	Create Table
 INNODB_BUFFER_PAGE_LRU	CREATE TEMPORARY TABLE `INNODB_BUFFER_PAGE_LRU` (
-  `POOL_ID` int(11) unsigned NOT NULL DEFAULT 0,
-  `LRU_POSITION` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `SPACE` int(11) unsigned NOT NULL DEFAULT 0,
-  `PAGE_NUMBER` int(11) unsigned NOT NULL DEFAULT 0,
-  `PAGE_TYPE` varchar(64) DEFAULT NULL,
-  `FLUSH_TYPE` int(11) unsigned NOT NULL DEFAULT 0,
-  `FIX_COUNT` int(11) unsigned NOT NULL DEFAULT 0,
-  `IS_HASHED` int(1) NOT NULL DEFAULT 0,
-  `NEWEST_MODIFICATION` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `OLDEST_MODIFICATION` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `ACCESS_TIME` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `TABLE_NAME` varchar(1024) DEFAULT NULL,
-  `INDEX_NAME` varchar(64) DEFAULT NULL,
-  `NUMBER_RECORDS` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `DATA_SIZE` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `COMPRESSED_SIZE` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `COMPRESSED` int(1) NOT NULL DEFAULT 0,
+  `POOL_ID` int(11) unsigned NOT NULL,
+  `LRU_POSITION` bigint(21) unsigned NOT NULL,
+  `SPACE` int(11) unsigned NOT NULL,
+  `PAGE_NUMBER` int(11) unsigned NOT NULL,
+  `PAGE_TYPE` varchar(64),
+  `FLUSH_TYPE` int(11) unsigned NOT NULL,
+  `FIX_COUNT` int(11) unsigned NOT NULL,
+  `IS_HASHED` int(1) NOT NULL,
+  `NEWEST_MODIFICATION` bigint(21) unsigned NOT NULL,
+  `OLDEST_MODIFICATION` bigint(21) unsigned NOT NULL,
+  `ACCESS_TIME` bigint(21) unsigned NOT NULL,
+  `TABLE_NAME` varchar(1024),
+  `INDEX_NAME` varchar(64),
+  `NUMBER_RECORDS` bigint(21) unsigned NOT NULL,
+  `DATA_SIZE` bigint(21) unsigned NOT NULL,
+  `COMPRESSED_SIZE` bigint(21) unsigned NOT NULL,
+  `COMPRESSED` int(1) NOT NULL,
   `IO_FIX` enum('IO_NONE','IO_READ','IO_WRITE') NOT NULL,
-  `IS_OLD` int(1) DEFAULT NULL,
-  `FREE_PAGE_CLOCK` bigint(21) unsigned NOT NULL DEFAULT 0
+  `IS_OLD` int(1),
+  `FREE_PAGE_CLOCK` bigint(21) unsigned NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
 CREATE TEMPORARY TABLE t1 LIKE INFORMATION_SCHEMA.INNODB_BUFFER_PAGE_LRU;
 DROP TEMPORARY TABLE t1;
diff --git a/mysql-test/suite/innodb_i_s/innodb_buffer_pool_stats.result b/mysql-test/suite/innodb_i_s/innodb_buffer_pool_stats.result
index 5e0c2ae8e89..9313aefd6f9 100644
--- a/mysql-test/suite/innodb_i_s/innodb_buffer_pool_stats.result
+++ b/mysql-test/suite/innodb_i_s/innodb_buffer_pool_stats.result
@@ -1,36 +1,36 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_BUFFER_POOL_STATS;
 Table	Create Table
 INNODB_BUFFER_POOL_STATS	CREATE TEMPORARY TABLE `INNODB_BUFFER_POOL_STATS` (
-  `POOL_ID` int(11) unsigned NOT NULL DEFAULT 0,
-  `POOL_SIZE` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `FREE_BUFFERS` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `DATABASE_PAGES` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `OLD_DATABASE_PAGES` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `MODIFIED_DATABASE_PAGES` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `PENDING_DECOMPRESS` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `PENDING_READS` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `PENDING_FLUSH_LRU` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `PENDING_FLUSH_LIST` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `PAGES_MADE_YOUNG` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `PAGES_NOT_MADE_YOUNG` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `PAGES_MADE_YOUNG_RATE` float NOT NULL DEFAULT 0,
-  `PAGES_MADE_NOT_YOUNG_RATE` float NOT NULL DEFAULT 0,
-  `NUMBER_PAGES_READ` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `NUMBER_PAGES_CREATED` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `NUMBER_PAGES_WRITTEN` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `PAGES_READ_RATE` float NOT NULL DEFAULT 0,
-  `PAGES_CREATE_RATE` float NOT NULL DEFAULT 0,
-  `PAGES_WRITTEN_RATE` float NOT NULL DEFAULT 0,
-  `NUMBER_PAGES_GET` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `HIT_RATE` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `YOUNG_MAKE_PER_THOUSAND_GETS` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `NOT_YOUNG_MAKE_PER_THOUSAND_GETS` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `NUMBER_PAGES_READ_AHEAD` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `NUMBER_READ_AHEAD_EVICTED` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `READ_AHEAD_RATE` float NOT NULL DEFAULT 0,
-  `READ_AHEAD_EVICTED_RATE` float NOT NULL DEFAULT 0,
-  `LRU_IO_TOTAL` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `LRU_IO_CURRENT` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `UNCOMPRESS_TOTAL` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `UNCOMPRESS_CURRENT` bigint(21) unsigned NOT NULL DEFAULT 0
+  `POOL_ID` int(11) unsigned NOT NULL,
+  `POOL_SIZE` bigint(21) unsigned NOT NULL,
+  `FREE_BUFFERS` bigint(21) unsigned NOT NULL,
+  `DATABASE_PAGES` bigint(21) unsigned NOT NULL,
+  `OLD_DATABASE_PAGES` bigint(21) unsigned NOT NULL,
+  `MODIFIED_DATABASE_PAGES` bigint(21) unsigned NOT NULL,
+  `PENDING_DECOMPRESS` bigint(21) unsigned NOT NULL,
+  `PENDING_READS` bigint(21) unsigned NOT NULL,
+  `PENDING_FLUSH_LRU` bigint(21) unsigned NOT NULL,
+  `PENDING_FLUSH_LIST` bigint(21) unsigned NOT NULL,
+  `PAGES_MADE_YOUNG` bigint(21) unsigned NOT NULL,
+  `PAGES_NOT_MADE_YOUNG` bigint(21) unsigned NOT NULL,
+  `PAGES_MADE_YOUNG_RATE` float NOT NULL,
+  `PAGES_MADE_NOT_YOUNG_RATE` float NOT NULL,
+  `NUMBER_PAGES_READ` bigint(21) unsigned NOT NULL,
+  `NUMBER_PAGES_CREATED` bigint(21) unsigned NOT NULL,
+  `NUMBER_PAGES_WRITTEN` bigint(21) unsigned NOT NULL,
+  `PAGES_READ_RATE` float NOT NULL,
+  `PAGES_CREATE_RATE` float NOT NULL,
+  `PAGES_WRITTEN_RATE` float NOT NULL,
+  `NUMBER_PAGES_GET` bigint(21) unsigned NOT NULL,
+  `HIT_RATE` bigint(21) unsigned NOT NULL,
+  `YOUNG_MAKE_PER_THOUSAND_GETS` bigint(21) unsigned NOT NULL,
+  `NOT_YOUNG_MAKE_PER_THOUSAND_GETS` bigint(21) unsigned NOT NULL,
+  `NUMBER_PAGES_READ_AHEAD` bigint(21) unsigned NOT NULL,
+  `NUMBER_READ_AHEAD_EVICTED` bigint(21) unsigned NOT NULL,
+  `READ_AHEAD_RATE` float NOT NULL,
+  `READ_AHEAD_EVICTED_RATE` float NOT NULL,
+  `LRU_IO_TOTAL` bigint(21) unsigned NOT NULL,
+  `LRU_IO_CURRENT` bigint(21) unsigned NOT NULL,
+  `UNCOMPRESS_TOTAL` bigint(21) unsigned NOT NULL,
+  `UNCOMPRESS_CURRENT` bigint(21) unsigned NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_cmp.result b/mysql-test/suite/innodb_i_s/innodb_cmp.result
index d06bdf1dbc4..6b196a1b993 100644
--- a/mysql-test/suite/innodb_i_s/innodb_cmp.result
+++ b/mysql-test/suite/innodb_i_s/innodb_cmp.result
@@ -1,10 +1,10 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_CMP;
 Table	Create Table
 INNODB_CMP	CREATE TEMPORARY TABLE `INNODB_CMP` (
-  `page_size` int(5) NOT NULL DEFAULT 0,
-  `compress_ops` int(11) NOT NULL DEFAULT 0,
-  `compress_ops_ok` int(11) NOT NULL DEFAULT 0,
-  `compress_time` int(11) NOT NULL DEFAULT 0,
-  `uncompress_ops` int(11) NOT NULL DEFAULT 0,
-  `uncompress_time` int(11) NOT NULL DEFAULT 0
+  `page_size` int(5) NOT NULL,
+  `compress_ops` int(11) NOT NULL,
+  `compress_ops_ok` int(11) NOT NULL,
+  `compress_time` int(11) NOT NULL,
+  `uncompress_ops` int(11) NOT NULL,
+  `uncompress_time` int(11) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_cmp_per_index.result b/mysql-test/suite/innodb_i_s/innodb_cmp_per_index.result
index 5037957681a..b72dc1a1269 100644
--- a/mysql-test/suite/innodb_i_s/innodb_cmp_per_index.result
+++ b/mysql-test/suite/innodb_i_s/innodb_cmp_per_index.result
@@ -1,12 +1,12 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_CMP_PER_INDEX;
 Table	Create Table
 INNODB_CMP_PER_INDEX	CREATE TEMPORARY TABLE `INNODB_CMP_PER_INDEX` (
-  `database_name` varchar(64) NOT NULL DEFAULT '',
-  `table_name` varchar(64) NOT NULL DEFAULT '',
-  `index_name` varchar(64) NOT NULL DEFAULT '',
-  `compress_ops` int(11) NOT NULL DEFAULT 0,
-  `compress_ops_ok` int(11) NOT NULL DEFAULT 0,
-  `compress_time` int(11) NOT NULL DEFAULT 0,
-  `uncompress_ops` int(11) NOT NULL DEFAULT 0,
-  `uncompress_time` int(11) NOT NULL DEFAULT 0
+  `database_name` varchar(64) NOT NULL,
+  `table_name` varchar(64) NOT NULL,
+  `index_name` varchar(64) NOT NULL,
+  `compress_ops` int(11) NOT NULL,
+  `compress_ops_ok` int(11) NOT NULL,
+  `compress_time` int(11) NOT NULL,
+  `uncompress_ops` int(11) NOT NULL,
+  `uncompress_time` int(11) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_cmp_per_index_reset.result b/mysql-test/suite/innodb_i_s/innodb_cmp_per_index_reset.result
index d044cf077ac..941c05d53d8 100644
--- a/mysql-test/suite/innodb_i_s/innodb_cmp_per_index_reset.result
+++ b/mysql-test/suite/innodb_i_s/innodb_cmp_per_index_reset.result
@@ -1,12 +1,12 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_CMP_PER_INDEX_RESET;
 Table	Create Table
 INNODB_CMP_PER_INDEX_RESET	CREATE TEMPORARY TABLE `INNODB_CMP_PER_INDEX_RESET` (
-  `database_name` varchar(64) NOT NULL DEFAULT '',
-  `table_name` varchar(64) NOT NULL DEFAULT '',
-  `index_name` varchar(64) NOT NULL DEFAULT '',
-  `compress_ops` int(11) NOT NULL DEFAULT 0,
-  `compress_ops_ok` int(11) NOT NULL DEFAULT 0,
-  `compress_time` int(11) NOT NULL DEFAULT 0,
-  `uncompress_ops` int(11) NOT NULL DEFAULT 0,
-  `uncompress_time` int(11) NOT NULL DEFAULT 0
+  `database_name` varchar(64) NOT NULL,
+  `table_name` varchar(64) NOT NULL,
+  `index_name` varchar(64) NOT NULL,
+  `compress_ops` int(11) NOT NULL,
+  `compress_ops_ok` int(11) NOT NULL,
+  `compress_time` int(11) NOT NULL,
+  `uncompress_ops` int(11) NOT NULL,
+  `uncompress_time` int(11) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_cmp_reset.result b/mysql-test/suite/innodb_i_s/innodb_cmp_reset.result
index 4a6ef866932..02d26a5ccf5 100644
--- a/mysql-test/suite/innodb_i_s/innodb_cmp_reset.result
+++ b/mysql-test/suite/innodb_i_s/innodb_cmp_reset.result
@@ -1,10 +1,10 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_CMP_RESET;
 Table	Create Table
 INNODB_CMP_RESET	CREATE TEMPORARY TABLE `INNODB_CMP_RESET` (
-  `page_size` int(5) NOT NULL DEFAULT 0,
-  `compress_ops` int(11) NOT NULL DEFAULT 0,
-  `compress_ops_ok` int(11) NOT NULL DEFAULT 0,
-  `compress_time` int(11) NOT NULL DEFAULT 0,
-  `uncompress_ops` int(11) NOT NULL DEFAULT 0,
-  `uncompress_time` int(11) NOT NULL DEFAULT 0
+  `page_size` int(5) NOT NULL,
+  `compress_ops` int(11) NOT NULL,
+  `compress_ops_ok` int(11) NOT NULL,
+  `compress_time` int(11) NOT NULL,
+  `uncompress_ops` int(11) NOT NULL,
+  `uncompress_time` int(11) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_cmpmem.result b/mysql-test/suite/innodb_i_s/innodb_cmpmem.result
index 4f66f491b6b..3be5e64421a 100644
--- a/mysql-test/suite/innodb_i_s/innodb_cmpmem.result
+++ b/mysql-test/suite/innodb_i_s/innodb_cmpmem.result
@@ -1,10 +1,10 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_CMPMEM;
 Table	Create Table
 INNODB_CMPMEM	CREATE TEMPORARY TABLE `INNODB_CMPMEM` (
-  `page_size` int(5) NOT NULL DEFAULT 0,
-  `buffer_pool_instance` int(11) NOT NULL DEFAULT 0,
-  `pages_used` int(11) NOT NULL DEFAULT 0,
-  `pages_free` int(11) NOT NULL DEFAULT 0,
-  `relocation_ops` bigint(21) NOT NULL DEFAULT 0,
-  `relocation_time` int(11) NOT NULL DEFAULT 0
+  `page_size` int(5) NOT NULL,
+  `buffer_pool_instance` int(11) NOT NULL,
+  `pages_used` int(11) NOT NULL,
+  `pages_free` int(11) NOT NULL,
+  `relocation_ops` bigint(21) NOT NULL,
+  `relocation_time` int(11) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_cmpmem_reset.result b/mysql-test/suite/innodb_i_s/innodb_cmpmem_reset.result
index 0f7adfc0fce..9d11c8221f2 100644
--- a/mysql-test/suite/innodb_i_s/innodb_cmpmem_reset.result
+++ b/mysql-test/suite/innodb_i_s/innodb_cmpmem_reset.result
@@ -1,10 +1,10 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_CMPMEM_RESET;
 Table	Create Table
 INNODB_CMPMEM_RESET	CREATE TEMPORARY TABLE `INNODB_CMPMEM_RESET` (
-  `page_size` int(5) NOT NULL DEFAULT 0,
-  `buffer_pool_instance` int(11) NOT NULL DEFAULT 0,
-  `pages_used` int(11) NOT NULL DEFAULT 0,
-  `pages_free` int(11) NOT NULL DEFAULT 0,
-  `relocation_ops` bigint(21) NOT NULL DEFAULT 0,
-  `relocation_time` int(11) NOT NULL DEFAULT 0
+  `page_size` int(5) NOT NULL,
+  `buffer_pool_instance` int(11) NOT NULL,
+  `pages_used` int(11) NOT NULL,
+  `pages_free` int(11) NOT NULL,
+  `relocation_ops` bigint(21) NOT NULL,
+  `relocation_time` int(11) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_ft_being_deleted.result b/mysql-test/suite/innodb_i_s/innodb_ft_being_deleted.result
index 7c2c2a4d183..b458d6b93eb 100644
--- a/mysql-test/suite/innodb_i_s/innodb_ft_being_deleted.result
+++ b/mysql-test/suite/innodb_i_s/innodb_ft_being_deleted.result
@@ -1,5 +1,5 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_FT_BEING_DELETED;
 Table	Create Table
 INNODB_FT_BEING_DELETED	CREATE TEMPORARY TABLE `INNODB_FT_BEING_DELETED` (
-  `DOC_ID` bigint(21) unsigned NOT NULL DEFAULT 0
+  `DOC_ID` bigint(21) unsigned NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_ft_config.result b/mysql-test/suite/innodb_i_s/innodb_ft_config.result
index 5d2f7ec87d5..e9a31cad3ad 100644
--- a/mysql-test/suite/innodb_i_s/innodb_ft_config.result
+++ b/mysql-test/suite/innodb_i_s/innodb_ft_config.result
@@ -1,6 +1,6 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_FT_CONFIG;
 Table	Create Table
 INNODB_FT_CONFIG	CREATE TEMPORARY TABLE `INNODB_FT_CONFIG` (
-  `KEY` varchar(193) NOT NULL DEFAULT '',
-  `VALUE` varchar(193) NOT NULL DEFAULT ''
+  `KEY` varchar(193) NOT NULL,
+  `VALUE` varchar(193) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_ft_default_stopword.result b/mysql-test/suite/innodb_i_s/innodb_ft_default_stopword.result
index 6f4e0012c5f..996594bb23c 100644
--- a/mysql-test/suite/innodb_i_s/innodb_ft_default_stopword.result
+++ b/mysql-test/suite/innodb_i_s/innodb_ft_default_stopword.result
@@ -1,5 +1,5 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_FT_DEFAULT_STOPWORD;
 Table	Create Table
 INNODB_FT_DEFAULT_STOPWORD	CREATE TEMPORARY TABLE `INNODB_FT_DEFAULT_STOPWORD` (
-  `value` varchar(18) NOT NULL DEFAULT ''
+  `value` varchar(18) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_ft_deleted.result b/mysql-test/suite/innodb_i_s/innodb_ft_deleted.result
index 6224ce747af..0824efd9301 100644
--- a/mysql-test/suite/innodb_i_s/innodb_ft_deleted.result
+++ b/mysql-test/suite/innodb_i_s/innodb_ft_deleted.result
@@ -1,5 +1,5 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_FT_DELETED;
 Table	Create Table
 INNODB_FT_DELETED	CREATE TEMPORARY TABLE `INNODB_FT_DELETED` (
-  `DOC_ID` bigint(21) unsigned NOT NULL DEFAULT 0
+  `DOC_ID` bigint(21) unsigned NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_ft_index_cache.result b/mysql-test/suite/innodb_i_s/innodb_ft_index_cache.result
index a17b9446c9f..d4726d2f15a 100644
--- a/mysql-test/suite/innodb_i_s/innodb_ft_index_cache.result
+++ b/mysql-test/suite/innodb_i_s/innodb_ft_index_cache.result
@@ -1,10 +1,10 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE;
 Table	Create Table
 INNODB_FT_INDEX_CACHE	CREATE TEMPORARY TABLE `INNODB_FT_INDEX_CACHE` (
-  `WORD` varchar(337) NOT NULL DEFAULT '',
-  `FIRST_DOC_ID` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `LAST_DOC_ID` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `DOC_COUNT` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `DOC_ID` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `POSITION` bigint(21) unsigned NOT NULL DEFAULT 0
+  `WORD` varchar(337) NOT NULL,
+  `FIRST_DOC_ID` bigint(21) unsigned NOT NULL,
+  `LAST_DOC_ID` bigint(21) unsigned NOT NULL,
+  `DOC_COUNT` bigint(21) unsigned NOT NULL,
+  `DOC_ID` bigint(21) unsigned NOT NULL,
+  `POSITION` bigint(21) unsigned NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_ft_index_table.result b/mysql-test/suite/innodb_i_s/innodb_ft_index_table.result
index 8ec767ce5d1..c8f44963fb1 100644
--- a/mysql-test/suite/innodb_i_s/innodb_ft_index_table.result
+++ b/mysql-test/suite/innodb_i_s/innodb_ft_index_table.result
@@ -1,10 +1,10 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_FT_INDEX_TABLE;
 Table	Create Table
 INNODB_FT_INDEX_TABLE	CREATE TEMPORARY TABLE `INNODB_FT_INDEX_TABLE` (
-  `WORD` varchar(337) NOT NULL DEFAULT '',
-  `FIRST_DOC_ID` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `LAST_DOC_ID` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `DOC_COUNT` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `DOC_ID` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `POSITION` bigint(21) unsigned NOT NULL DEFAULT 0
+  `WORD` varchar(337) NOT NULL,
+  `FIRST_DOC_ID` bigint(21) unsigned NOT NULL,
+  `LAST_DOC_ID` bigint(21) unsigned NOT NULL,
+  `DOC_COUNT` bigint(21) unsigned NOT NULL,
+  `DOC_ID` bigint(21) unsigned NOT NULL,
+  `POSITION` bigint(21) unsigned NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_lock_waits.result b/mysql-test/suite/innodb_i_s/innodb_lock_waits.result
index 8d8c2d158a7..656107349b9 100644
--- a/mysql-test/suite/innodb_i_s/innodb_lock_waits.result
+++ b/mysql-test/suite/innodb_i_s/innodb_lock_waits.result
@@ -1,8 +1,8 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_LOCK_WAITS;
 Table	Create Table
 INNODB_LOCK_WAITS	CREATE TEMPORARY TABLE `INNODB_LOCK_WAITS` (
-  `requesting_trx_id` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `requested_lock_id` varchar(81) NOT NULL DEFAULT '',
-  `blocking_trx_id` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `blocking_lock_id` varchar(81) NOT NULL DEFAULT ''
+  `requesting_trx_id` bigint(21) unsigned NOT NULL,
+  `requested_lock_id` varchar(81) NOT NULL,
+  `blocking_trx_id` bigint(21) unsigned NOT NULL,
+  `blocking_lock_id` varchar(81) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_locks.result b/mysql-test/suite/innodb_i_s/innodb_locks.result
index 977776ae2ec..389486411bb 100644
--- a/mysql-test/suite/innodb_i_s/innodb_locks.result
+++ b/mysql-test/suite/innodb_i_s/innodb_locks.result
@@ -1,16 +1,16 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_LOCKS;
 Table	Create Table
 INNODB_LOCKS	CREATE TEMPORARY TABLE `INNODB_LOCKS` (
-  `lock_id` varchar(81) NOT NULL DEFAULT '',
-  `lock_trx_id` bigint(21) unsigned NOT NULL DEFAULT 0,
+  `lock_id` varchar(81) NOT NULL,
+  `lock_trx_id` bigint(21) unsigned NOT NULL,
   `lock_mode` enum('S','S,GAP','X','X,GAP','IS','IS,GAP','IX','IX,GAP','AUTO_INC') NOT NULL,
   `lock_type` enum('RECORD','TABLE') NOT NULL,
-  `lock_table` varchar(1024) NOT NULL DEFAULT '',
-  `lock_index` varchar(1024) DEFAULT NULL,
-  `lock_space` int(11) unsigned DEFAULT NULL,
-  `lock_page` int(11) unsigned DEFAULT NULL,
-  `lock_rec` int(11) unsigned DEFAULT NULL,
-  `lock_data` varchar(8192) DEFAULT NULL
+  `lock_table` varchar(1024) NOT NULL,
+  `lock_index` varchar(1024),
+  `lock_space` int(11) unsigned,
+  `lock_page` int(11) unsigned,
+  `lock_rec` int(11) unsigned,
+  `lock_data` varchar(8192)
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
 CREATE TEMPORARY TABLE t1 LIKE INFORMATION_SCHEMA.INNODB_LOCKS;
 DROP TEMPORARY TABLE t1;
diff --git a/mysql-test/suite/innodb_i_s/innodb_metrics.result b/mysql-test/suite/innodb_i_s/innodb_metrics.result
index 7687fa8fc20..313c9cf80be 100644
--- a/mysql-test/suite/innodb_i_s/innodb_metrics.result
+++ b/mysql-test/suite/innodb_i_s/innodb_metrics.result
@@ -1,23 +1,23 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_METRICS;
 Table	Create Table
 INNODB_METRICS	CREATE TEMPORARY TABLE `INNODB_METRICS` (
-  `NAME` varchar(193) NOT NULL DEFAULT '',
-  `SUBSYSTEM` varchar(193) NOT NULL DEFAULT '',
-  `COUNT` bigint(21) NOT NULL DEFAULT 0,
-  `MAX_COUNT` bigint(21) DEFAULT NULL,
-  `MIN_COUNT` bigint(21) DEFAULT NULL,
-  `AVG_COUNT` float DEFAULT NULL,
-  `COUNT_RESET` bigint(21) NOT NULL DEFAULT 0,
-  `MAX_COUNT_RESET` bigint(21) DEFAULT NULL,
-  `MIN_COUNT_RESET` bigint(21) DEFAULT NULL,
-  `AVG_COUNT_RESET` float DEFAULT NULL,
-  `TIME_ENABLED` datetime DEFAULT NULL,
-  `TIME_DISABLED` datetime DEFAULT NULL,
-  `TIME_ELAPSED` bigint(21) DEFAULT NULL,
-  `TIME_RESET` datetime DEFAULT NULL,
-  `ENABLED` int(1) NOT NULL DEFAULT 0,
+  `NAME` varchar(193) NOT NULL,
+  `SUBSYSTEM` varchar(193) NOT NULL,
+  `COUNT` bigint(21) NOT NULL,
+  `MAX_COUNT` bigint(21),
+  `MIN_COUNT` bigint(21),
+  `AVG_COUNT` float,
+  `COUNT_RESET` bigint(21) NOT NULL,
+  `MAX_COUNT_RESET` bigint(21),
+  `MIN_COUNT_RESET` bigint(21),
+  `AVG_COUNT_RESET` float,
+  `TIME_ENABLED` datetime,
+  `TIME_DISABLED` datetime,
+  `TIME_ELAPSED` bigint(21),
+  `TIME_RESET` datetime,
+  `ENABLED` int(1) NOT NULL,
   `TYPE` enum('value','status_counter','set_owner','set_member','counter') NOT NULL,
-  `COMMENT` varchar(193) NOT NULL DEFAULT ''
+  `COMMENT` varchar(193) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
 CREATE TEMPORARY TABLE t1 LIKE INFORMATION_SCHEMA.INNODB_METRICS;
 DROP TEMPORARY TABLE t1;
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_columns.result b/mysql-test/suite/innodb_i_s/innodb_sys_columns.result
index a4f13d19854..c51f4bb7e0a 100644
--- a/mysql-test/suite/innodb_i_s/innodb_sys_columns.result
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_columns.result
@@ -1,10 +1,10 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_COLUMNS;
 Table	Create Table
 INNODB_SYS_COLUMNS	CREATE TEMPORARY TABLE `INNODB_SYS_COLUMNS` (
-  `TABLE_ID` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `NAME` varchar(64) NOT NULL DEFAULT '',
-  `POS` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `MTYPE` int(11) NOT NULL DEFAULT 0,
-  `PRTYPE` int(11) NOT NULL DEFAULT 0,
-  `LEN` int(11) NOT NULL DEFAULT 0
+  `TABLE_ID` bigint(21) unsigned NOT NULL,
+  `NAME` varchar(64) NOT NULL,
+  `POS` bigint(21) unsigned NOT NULL,
+  `MTYPE` int(11) NOT NULL,
+  `PRTYPE` int(11) NOT NULL,
+  `LEN` int(11) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_fields.result b/mysql-test/suite/innodb_i_s/innodb_sys_fields.result
index d69645e139a..decc27c3aca 100644
--- a/mysql-test/suite/innodb_i_s/innodb_sys_fields.result
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_fields.result
@@ -1,7 +1,7 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_FIELDS;
 Table	Create Table
 INNODB_SYS_FIELDS	CREATE TEMPORARY TABLE `INNODB_SYS_FIELDS` (
-  `INDEX_ID` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `NAME` varchar(64) NOT NULL DEFAULT '',
-  `POS` int(11) unsigned NOT NULL DEFAULT 0
+  `INDEX_ID` bigint(21) unsigned NOT NULL,
+  `NAME` varchar(64) NOT NULL,
+  `POS` int(11) unsigned NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_foreign.result b/mysql-test/suite/innodb_i_s/innodb_sys_foreign.result
index 1995db45f5d..27629871dd5 100644
--- a/mysql-test/suite/innodb_i_s/innodb_sys_foreign.result
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_foreign.result
@@ -1,9 +1,9 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_FOREIGN;
 Table	Create Table
 INNODB_SYS_FOREIGN	CREATE TEMPORARY TABLE `INNODB_SYS_FOREIGN` (
-  `ID` varchar(193) NOT NULL DEFAULT '',
-  `FOR_NAME` varchar(193) NOT NULL DEFAULT '',
-  `REF_NAME` varchar(193) NOT NULL DEFAULT '',
-  `N_COLS` int(11) unsigned NOT NULL DEFAULT 0,
-  `TYPE` int(11) unsigned NOT NULL DEFAULT 0
+  `ID` varchar(193) NOT NULL,
+  `FOR_NAME` varchar(193) NOT NULL,
+  `REF_NAME` varchar(193) NOT NULL,
+  `N_COLS` int(11) unsigned NOT NULL,
+  `TYPE` int(11) unsigned NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_foreign_cols.result b/mysql-test/suite/innodb_i_s/innodb_sys_foreign_cols.result
index 48d98a371c0..9a17d5f2b3a 100644
--- a/mysql-test/suite/innodb_i_s/innodb_sys_foreign_cols.result
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_foreign_cols.result
@@ -1,8 +1,8 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_FOREIGN_COLS;
 Table	Create Table
 INNODB_SYS_FOREIGN_COLS	CREATE TEMPORARY TABLE `INNODB_SYS_FOREIGN_COLS` (
-  `ID` varchar(193) NOT NULL DEFAULT '',
-  `FOR_COL_NAME` varchar(64) NOT NULL DEFAULT '',
-  `REF_COL_NAME` varchar(64) NOT NULL DEFAULT '',
-  `POS` int(11) unsigned NOT NULL DEFAULT 0
+  `ID` varchar(193) NOT NULL,
+  `FOR_COL_NAME` varchar(64) NOT NULL,
+  `REF_COL_NAME` varchar(64) NOT NULL,
+  `POS` int(11) unsigned NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_indexes.result b/mysql-test/suite/innodb_i_s/innodb_sys_indexes.result
index 81d1447e60d..d74f557cbf6 100644
--- a/mysql-test/suite/innodb_i_s/innodb_sys_indexes.result
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_indexes.result
@@ -1,12 +1,12 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_INDEXES;
 Table	Create Table
 INNODB_SYS_INDEXES	CREATE TEMPORARY TABLE `INNODB_SYS_INDEXES` (
-  `INDEX_ID` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `NAME` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_ID` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `TYPE` int(11) NOT NULL DEFAULT 0,
-  `N_FIELDS` int(11) NOT NULL DEFAULT 0,
-  `PAGE_NO` int(11) NOT NULL DEFAULT 0,
-  `SPACE` int(11) NOT NULL DEFAULT 0,
-  `MERGE_THRESHOLD` int(11) NOT NULL DEFAULT 0
+  `INDEX_ID` bigint(21) unsigned NOT NULL,
+  `NAME` varchar(64) NOT NULL,
+  `TABLE_ID` bigint(21) unsigned NOT NULL,
+  `TYPE` int(11) NOT NULL,
+  `N_FIELDS` int(11) NOT NULL,
+  `PAGE_NO` int(11) NOT NULL,
+  `SPACE` int(11) NOT NULL,
+  `MERGE_THRESHOLD` int(11) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_tables.result b/mysql-test/suite/innodb_i_s/innodb_sys_tables.result
index 49afc1cc4c8..5ccee563c21 100644
--- a/mysql-test/suite/innodb_i_s/innodb_sys_tables.result
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_tables.result
@@ -1,12 +1,12 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_TABLES;
 Table	Create Table
 INNODB_SYS_TABLES	CREATE TEMPORARY TABLE `INNODB_SYS_TABLES` (
-  `TABLE_ID` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `NAME` varchar(655) NOT NULL DEFAULT '',
-  `FLAG` int(11) NOT NULL DEFAULT 0,
-  `N_COLS` int(11) unsigned NOT NULL DEFAULT 0,
-  `SPACE` int(11) unsigned NOT NULL DEFAULT 0,
-  `ROW_FORMAT` enum('Redundant','Compact','Compressed','Dynamic') DEFAULT NULL,
-  `ZIP_PAGE_SIZE` int(11) unsigned NOT NULL DEFAULT 0,
-  `SPACE_TYPE` enum('Single','System') DEFAULT NULL
+  `TABLE_ID` bigint(21) unsigned NOT NULL,
+  `NAME` varchar(655) NOT NULL,
+  `FLAG` int(11) NOT NULL,
+  `N_COLS` int(11) unsigned NOT NULL,
+  `SPACE` int(11) unsigned NOT NULL,
+  `ROW_FORMAT` enum('Redundant','Compact','Compressed','Dynamic'),
+  `ZIP_PAGE_SIZE` int(11) unsigned NOT NULL,
+  `SPACE_TYPE` enum('Single','System')
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_tablespaces.result b/mysql-test/suite/innodb_i_s/innodb_sys_tablespaces.result
index 830ec87130f..b2e4350cdfa 100644
--- a/mysql-test/suite/innodb_i_s/innodb_sys_tablespaces.result
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_tablespaces.result
@@ -1,13 +1,13 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_TABLESPACES;
 Table	Create Table
 INNODB_SYS_TABLESPACES	CREATE TEMPORARY TABLE `INNODB_SYS_TABLESPACES` (
-  `SPACE` int(11) unsigned NOT NULL DEFAULT 0,
-  `NAME` varchar(655) NOT NULL DEFAULT '',
-  `FLAG` int(11) unsigned NOT NULL DEFAULT 0,
-  `ROW_FORMAT` varchar(22) DEFAULT NULL,
-  `PAGE_SIZE` int(11) unsigned NOT NULL DEFAULT 0,
-  `FILENAME` varchar(512) NOT NULL DEFAULT '',
-  `FS_BLOCK_SIZE` int(11) unsigned NOT NULL DEFAULT 0,
-  `FILE_SIZE` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `ALLOCATED_SIZE` bigint(21) unsigned NOT NULL DEFAULT 0
+  `SPACE` int(11) unsigned NOT NULL,
+  `NAME` varchar(655) NOT NULL,
+  `FLAG` int(11) unsigned NOT NULL,
+  `ROW_FORMAT` varchar(22),
+  `PAGE_SIZE` int(11) unsigned NOT NULL,
+  `FILENAME` varchar(512) NOT NULL,
+  `FS_BLOCK_SIZE` int(11) unsigned NOT NULL,
+  `FILE_SIZE` bigint(21) unsigned NOT NULL,
+  `ALLOCATED_SIZE` bigint(21) unsigned NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_tablestats.result b/mysql-test/suite/innodb_i_s/innodb_sys_tablestats.result
index eefe5ee83a1..19e676d34a1 100644
--- a/mysql-test/suite/innodb_i_s/innodb_sys_tablestats.result
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_tablestats.result
@@ -1,13 +1,13 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS;
 Table	Create Table
 INNODB_SYS_TABLESTATS	CREATE TEMPORARY TABLE `INNODB_SYS_TABLESTATS` (
-  `TABLE_ID` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `NAME` varchar(64) NOT NULL DEFAULT '',
-  `STATS_INITIALIZED` int(1) NOT NULL DEFAULT 0,
-  `NUM_ROWS` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `CLUST_INDEX_SIZE` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `OTHER_INDEX_SIZE` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `MODIFIED_COUNTER` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `AUTOINC` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `REF_COUNT` int(11) NOT NULL DEFAULT 0
+  `TABLE_ID` bigint(21) unsigned NOT NULL,
+  `NAME` varchar(64) NOT NULL,
+  `STATS_INITIALIZED` int(1) NOT NULL,
+  `NUM_ROWS` bigint(21) unsigned NOT NULL,
+  `CLUST_INDEX_SIZE` bigint(21) unsigned NOT NULL,
+  `OTHER_INDEX_SIZE` bigint(21) unsigned NOT NULL,
+  `MODIFIED_COUNTER` bigint(21) unsigned NOT NULL,
+  `AUTOINC` bigint(21) unsigned NOT NULL,
+  `REF_COUNT` int(11) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_virtual.result b/mysql-test/suite/innodb_i_s/innodb_sys_virtual.result
index 831f29faa95..bc622c9ee4b 100644
--- a/mysql-test/suite/innodb_i_s/innodb_sys_virtual.result
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_virtual.result
@@ -1,7 +1,7 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_VIRTUAL;
 Table	Create Table
 INNODB_SYS_VIRTUAL	CREATE TEMPORARY TABLE `INNODB_SYS_VIRTUAL` (
-  `TABLE_ID` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `POS` int(11) unsigned NOT NULL DEFAULT 0,
-  `BASE_POS` int(11) unsigned NOT NULL DEFAULT 0
+  `TABLE_ID` bigint(21) unsigned NOT NULL,
+  `POS` int(11) unsigned NOT NULL,
+  `BASE_POS` int(11) unsigned NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_tablespaces_encryption.result b/mysql-test/suite/innodb_i_s/innodb_tablespaces_encryption.result
index 31a4805b275..481b5c0e6fa 100644
--- a/mysql-test/suite/innodb_i_s/innodb_tablespaces_encryption.result
+++ b/mysql-test/suite/innodb_i_s/innodb_tablespaces_encryption.result
@@ -1,14 +1,14 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION;
 Table	Create Table
 INNODB_TABLESPACES_ENCRYPTION	CREATE TEMPORARY TABLE `INNODB_TABLESPACES_ENCRYPTION` (
-  `SPACE` int(11) unsigned NOT NULL DEFAULT 0,
-  `NAME` varchar(655) DEFAULT NULL,
-  `ENCRYPTION_SCHEME` int(11) unsigned NOT NULL DEFAULT 0,
-  `KEYSERVER_REQUESTS` int(11) unsigned NOT NULL DEFAULT 0,
-  `MIN_KEY_VERSION` int(11) unsigned NOT NULL DEFAULT 0,
-  `CURRENT_KEY_VERSION` int(11) unsigned NOT NULL DEFAULT 0,
-  `KEY_ROTATION_PAGE_NUMBER` bigint(21) unsigned DEFAULT NULL,
-  `KEY_ROTATION_MAX_PAGE_NUMBER` bigint(21) unsigned DEFAULT NULL,
-  `CURRENT_KEY_ID` int(11) unsigned NOT NULL DEFAULT 0,
-  `ROTATING_OR_FLUSHING` int(1) NOT NULL DEFAULT 0
+  `SPACE` int(11) unsigned NOT NULL,
+  `NAME` varchar(655),
+  `ENCRYPTION_SCHEME` int(11) unsigned NOT NULL,
+  `KEYSERVER_REQUESTS` int(11) unsigned NOT NULL,
+  `MIN_KEY_VERSION` int(11) unsigned NOT NULL,
+  `CURRENT_KEY_VERSION` int(11) unsigned NOT NULL,
+  `KEY_ROTATION_PAGE_NUMBER` bigint(21) unsigned,
+  `KEY_ROTATION_MAX_PAGE_NUMBER` bigint(21) unsigned,
+  `CURRENT_KEY_ID` int(11) unsigned NOT NULL,
+  `ROTATING_OR_FLUSHING` int(1) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_trx.result b/mysql-test/suite/innodb_i_s/innodb_trx.result
index d4e10a99ee8..912ae49b760 100644
--- a/mysql-test/suite/innodb_i_s/innodb_trx.result
+++ b/mysql-test/suite/innodb_i_s/innodb_trx.result
@@ -1,28 +1,28 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_TRX;
 Table	Create Table
 INNODB_TRX	CREATE TEMPORARY TABLE `INNODB_TRX` (
-  `trx_id` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `trx_state` varchar(13) NOT NULL DEFAULT '',
-  `trx_started` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `trx_requested_lock_id` varchar(81) DEFAULT NULL,
-  `trx_wait_started` datetime DEFAULT NULL,
-  `trx_weight` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `trx_mysql_thread_id` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `trx_query` varchar(1024) DEFAULT NULL,
-  `trx_operation_state` varchar(64) DEFAULT NULL,
-  `trx_tables_in_use` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `trx_tables_locked` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `trx_lock_structs` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `trx_lock_memory_bytes` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `trx_rows_locked` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `trx_rows_modified` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `trx_concurrency_tickets` bigint(21) unsigned NOT NULL DEFAULT 0,
+  `trx_id` bigint(21) unsigned NOT NULL,
+  `trx_state` varchar(13) NOT NULL,
+  `trx_started` datetime NOT NULL,
+  `trx_requested_lock_id` varchar(81),
+  `trx_wait_started` datetime,
+  `trx_weight` bigint(21) unsigned NOT NULL,
+  `trx_mysql_thread_id` bigint(21) unsigned NOT NULL,
+  `trx_query` varchar(1024),
+  `trx_operation_state` varchar(64),
+  `trx_tables_in_use` bigint(21) unsigned NOT NULL,
+  `trx_tables_locked` bigint(21) unsigned NOT NULL,
+  `trx_lock_structs` bigint(21) unsigned NOT NULL,
+  `trx_lock_memory_bytes` bigint(21) unsigned NOT NULL,
+  `trx_rows_locked` bigint(21) unsigned NOT NULL,
+  `trx_rows_modified` bigint(21) unsigned NOT NULL,
+  `trx_concurrency_tickets` bigint(21) unsigned NOT NULL,
   `trx_isolation_level` enum('READ UNCOMMITTED','READ COMMITTED','REPEATABLE READ','SERIALIZABLE') NOT NULL,
-  `trx_unique_checks` int(1) NOT NULL DEFAULT 0,
-  `trx_foreign_key_checks` int(1) NOT NULL DEFAULT 0,
-  `trx_last_foreign_key_error` varchar(256) DEFAULT NULL,
-  `trx_is_read_only` int(1) NOT NULL DEFAULT 0,
-  `trx_autocommit_non_locking` int(1) NOT NULL DEFAULT 0
+  `trx_unique_checks` int(1) NOT NULL,
+  `trx_foreign_key_checks` int(1) NOT NULL,
+  `trx_last_foreign_key_error` varchar(256),
+  `trx_is_read_only` int(1) NOT NULL,
+  `trx_autocommit_non_locking` int(1) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
 CREATE TEMPORARY TABLE t1 LIKE INFORMATION_SCHEMA.INNODB_TRX;
 DROP TEMPORARY TABLE t1;
diff --git a/mysql-test/suite/innodb_zip/r/wl5522_zip.result b/mysql-test/suite/innodb_zip/r/wl5522_zip.result
index 4d6d23a3bff..83e0058a727 100644
--- a/mysql-test/suite/innodb_zip/r/wl5522_zip.result
+++ b/mysql-test/suite/innodb_zip/r/wl5522_zip.result
@@ -320,7 +320,7 @@ SELECT * FROM t1;
 ERROR HY000: Tablespace has been discarded for table `t1`
 restore: t1 .ibd and .cfg files
 ALTER TABLE t1 IMPORT TABLESPACE;
-ERROR HY000: Schema mismatch (Number of columns don't match, table has 6 columns but the tablespace meta-data file has 5 columns)
+ERROR HY000: Schema mismatch (Column c3 not found in tablespace.)
 unlink: t1.ibd
 unlink: t1.cfg
 DROP TABLE t1;
diff --git a/mysql-test/suite/innodb_zip/t/restart.test b/mysql-test/suite/innodb_zip/t/restart.test
index baef95a66d3..c442b919d71 100644
--- a/mysql-test/suite/innodb_zip/t/restart.test
+++ b/mysql-test/suite/innodb_zip/t/restart.test
@@ -5,6 +5,7 @@
 --source include/have_partition.inc
 --source include/not_embedded.inc
 --source include/innodb_checksum_algorithm.inc
+--source include/have_symlink.inc
 
 SET default_storage_engine=InnoDB;
 LET $MYSQLD_DATADIR = `select @@datadir`;
diff --git a/mysql-test/suite/json/r/rpl_json_char.result b/mysql-test/suite/json/r/rpl_json_char.result
new file mode 100644
index 00000000000..91da1cdd617
--- /dev/null
+++ b/mysql-test/suite/json/r/rpl_json_char.result
@@ -0,0 +1,22 @@
+include/master-slave.inc
+[connection master]
+#
+# Start of 10.5 tests
+#
+#
+# MDEV-27018 IF and COALESCE lose "json" property
+#
+CREATE TABLE t1 (a CHAR(100) CHECK(JSON_VALID(a)));
+connection slave;
+connection master;
+INSERT INTO t1 VALUES (JSON_OBJECT('a','b'));
+connection slave;
+SELECT * FROM t1 ORDER BY a;
+a
+{"a": "b"}
+connection master;
+DROP TABLE t1;
+#
+# End of 10.5 tests
+#
+include/rpl_end.inc
diff --git a/mysql-test/suite/json/r/rpl_json_longtext.result b/mysql-test/suite/json/r/rpl_json_longtext.result
new file mode 100644
index 00000000000..8d7f2a546aa
--- /dev/null
+++ b/mysql-test/suite/json/r/rpl_json_longtext.result
@@ -0,0 +1,22 @@
+include/master-slave.inc
+[connection master]
+#
+# Start of 10.5 tests
+#
+#
+# MDEV-27018 IF and COALESCE lose "json" property
+#
+CREATE TABLE t1 (a LONGTEXT CHECK(JSON_VALID(a)));
+connection slave;
+connection master;
+INSERT INTO t1 VALUES (JSON_OBJECT('a','b'));
+connection slave;
+SELECT * FROM t1 ORDER BY a;
+a
+{"a": "b"}
+connection master;
+DROP TABLE t1;
+#
+# End of 10.5 tests
+#
+include/rpl_end.inc
diff --git a/mysql-test/suite/json/r/rpl_json_mediumtext.result b/mysql-test/suite/json/r/rpl_json_mediumtext.result
new file mode 100644
index 00000000000..4cb1a87f473
--- /dev/null
+++ b/mysql-test/suite/json/r/rpl_json_mediumtext.result
@@ -0,0 +1,22 @@
+include/master-slave.inc
+[connection master]
+#
+# Start of 10.5 tests
+#
+#
+# MDEV-27018 IF and COALESCE lose "json" property
+#
+CREATE TABLE t1 (a MEDIUMTEXT CHECK(JSON_VALID(a)));
+connection slave;
+connection master;
+INSERT INTO t1 VALUES (JSON_OBJECT('a','b'));
+connection slave;
+SELECT * FROM t1 ORDER BY a;
+a
+{"a": "b"}
+connection master;
+DROP TABLE t1;
+#
+# End of 10.5 tests
+#
+include/rpl_end.inc
diff --git a/mysql-test/suite/json/r/rpl_json_text.result b/mysql-test/suite/json/r/rpl_json_text.result
new file mode 100644
index 00000000000..4c0bac87471
--- /dev/null
+++ b/mysql-test/suite/json/r/rpl_json_text.result
@@ -0,0 +1,22 @@
+include/master-slave.inc
+[connection master]
+#
+# Start of 10.5 tests
+#
+#
+# MDEV-27018 IF and COALESCE lose "json" property
+#
+CREATE TABLE t1 (a TEXT CHECK(JSON_VALID(a)));
+connection slave;
+connection master;
+INSERT INTO t1 VALUES (JSON_OBJECT('a','b'));
+connection slave;
+SELECT * FROM t1 ORDER BY a;
+a
+{"a": "b"}
+connection master;
+DROP TABLE t1;
+#
+# End of 10.5 tests
+#
+include/rpl_end.inc
diff --git a/mysql-test/suite/json/r/rpl_json_tinytext.result b/mysql-test/suite/json/r/rpl_json_tinytext.result
new file mode 100644
index 00000000000..92b228c3438
--- /dev/null
+++ b/mysql-test/suite/json/r/rpl_json_tinytext.result
@@ -0,0 +1,22 @@
+include/master-slave.inc
+[connection master]
+#
+# Start of 10.5 tests
+#
+#
+# MDEV-27018 IF and COALESCE lose "json" property
+#
+CREATE TABLE t1 (a TINYTEXT CHECK(JSON_VALID(a)));
+connection slave;
+connection master;
+INSERT INTO t1 VALUES (JSON_OBJECT('a','b'));
+connection slave;
+SELECT * FROM t1 ORDER BY a;
+a
+{"a": "b"}
+connection master;
+DROP TABLE t1;
+#
+# End of 10.5 tests
+#
+include/rpl_end.inc
diff --git a/mysql-test/suite/json/r/rpl_json_varchar.result b/mysql-test/suite/json/r/rpl_json_varchar.result
new file mode 100644
index 00000000000..3adbe3ebb48
--- /dev/null
+++ b/mysql-test/suite/json/r/rpl_json_varchar.result
@@ -0,0 +1,22 @@
+include/master-slave.inc
+[connection master]
+#
+# Start of 10.5 tests
+#
+#
+# MDEV-27018 IF and COALESCE lose "json" property
+#
+CREATE TABLE t1 (a VARCHAR(100) CHECK(JSON_VALID(a)));
+connection slave;
+connection master;
+INSERT INTO t1 VALUES (JSON_OBJECT('a','b'));
+connection slave;
+SELECT * FROM t1 ORDER BY a;
+a
+{"a": "b"}
+connection master;
+DROP TABLE t1;
+#
+# End of 10.5 tests
+#
+include/rpl_end.inc
diff --git a/mysql-test/suite/json/r/type_json.result b/mysql-test/suite/json/r/type_json.result
new file mode 100644
index 00000000000..b9b70f24190
--- /dev/null
+++ b/mysql-test/suite/json/r/type_json.result
@@ -0,0 +1,2884 @@
+#
+# Start of 10.5 tests
+#
+#
+# MDEV-27361 Hybrid functions with JSON arguments do not send format metadata
+#
+CREATE PROCEDURE p1(tbl TEXT, expr TEXT)
+BEGIN
+DECLARE t1cols INT DEFAULT (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
+WHERE TABLE_NAME=tbl AND TABLE_SCHEMA='test');
+FOR a IN 0..(t1cols-1) DO
+FOR b IN 0..(t1cols-1) DO
+BEGIN
+DECLARE query TEXT DEFAULT CONCAT('SELECT ', expr, ' FROM ', tbl);
+SET query= REPLACE(query, 'olt1', a);
+SET query= REPLACE(query, 'olt2', b);
+EXECUTE IMMEDIATE query;
+END;
+END FOR;
+END FOR;
+END;
+$$
+CREATE PROCEDURE p2(expr TEXT)
+BEGIN
+DECLARE t1cols INT DEFAULT (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
+WHERE TABLE_NAME='t1' AND TABLE_SCHEMA='test');
+DECLARE t2cols INT DEFAULT (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
+WHERE TABLE_NAME='t2' AND TABLE_SCHEMA='test');
+FOR a IN 0..(t1cols-1) DO
+FOR b IN 0..(t2cols-1) DO
+BEGIN
+DECLARE query TEXT DEFAULT CONCAT('SELECT ', expr, ' FROM t1, t2');
+SET query= REPLACE(query, 'olt1', a);
+SET query= REPLACE(query, 'olt2', b);
+EXECUTE IMMEDIATE query;
+END;
+END FOR;
+END FOR;
+END;
+$$
+CREATE TABLE t1
+(
+c0 CHAR(30)    DEFAULT '1'  CHECK(JSON_VALID(c0)),
+c1 VARCHAR(30) DEFAULT '1'  CHECK(JSON_VALID(c1)),
+c2 TINYTEXT    DEFAULT '1'  CHECK(JSON_VALID(c2)),
+c3 TEXT        DEFAULT '1'  CHECK(JSON_VALID(c3)),
+c4 MEDIUMTEXT  DEFAULT '1'  CHECK(JSON_VALID(c4)),
+c5 LONGTEXT    DEFAULT '1'  CHECK(JSON_VALID(c5)),
+# The below data types do not have any special JSON properties.
+# Just checking CHECK(JSON_VALID()) does not give any unexpected surprises.
+c6 INT         DEFAULT '1'  CHECK(JSON_VALID(c6)),
+c7 ENUM('1')   DEFAULT '1'  CHECK(JSON_VALID(c7))
+);
+INSERT INTO t1 VALUES ();
+CREATE TABLE t1c
+(
+c0 CHAR(30)               DEFAULT '1'  CHECK(JSON_VALID(c0)),
+c1 VARCHAR(30) COMPRESSED DEFAULT '1'  CHECK(JSON_VALID(c1)),
+c2 TINYTEXT    COMPRESSED DEFAULT '1'  CHECK(JSON_VALID(c2)),
+c3 TEXT        COMPRESSED DEFAULT '1'  CHECK(JSON_VALID(c3)),
+c4 MEDIUMTEXT  COMPRESSED DEFAULT '1'  CHECK(JSON_VALID(c4)),
+c5 LONGTEXT    COMPRESSED DEFAULT '1'  CHECK(JSON_VALID(c5)),
+# The below data types do not have any special JSON properties.
+# Just checking CHECK(JSON_VALID()) does not give any unexpected surprises.
+c6 INT                    DEFAULT '1'  CHECK(JSON_VALID(c6)),
+c7 ENUM('1')              DEFAULT '1'  CHECK(JSON_VALID(c7))
+);
+INSERT INTO t1c VALUES ();
+CREATE TABLE t2
+(
+c0 CHAR(30) DEFAULT '1',
+c1 VARCHAR(30) DEFAULT '1',
+c2 TINYTEXT DEFAULT '1',
+c3 TEXT DEFAULT '1',
+c4 MEDIUMTEXT DEFAULT '1',
+c5 LONGTEXT DEFAULT '1',
+c6 INT DEFAULT 1,
+c7 DOUBLE DEFAULT 1,
+c8 DECIMAL(10,2) DEFAULT 1.23,
+c9 TIME DEFAULT '10:20:30',
+c10 DATE DEFAULT '2001-01-01',
+c11 DATETIME DEFAULT '2001-01-01 10:20:30',
+c12 ENUM('1','2') DEFAULT '1'
+);
+INSERT INTO t2 VALUES ();
+CALL p1('t1', 'COALESCE(colt1, colt2)');
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c0, c0)	254 (format=json)	30	1	Y	0	39	8
+COALESCE(c0, c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c0, c1)	253 (format=json)	30	1	Y	0	39	8
+COALESCE(c0, c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c0, c2)	249 (format=json)	255	1	Y	0	39	8
+COALESCE(c0, c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c0, c3)	252 (format=json)	65535	1	Y	0	39	8
+COALESCE(c0, c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c0, c4)	250 (format=json)	16777215	1	Y	0	39	8
+COALESCE(c0, c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c0, c5)	251 (format=json)	4294967295	1	Y	0	39	8
+COALESCE(c0, c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c0, c6)	254	30	1	Y	0	39	8
+COALESCE(c0, c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c0, c7)	254	30	1	Y	0	39	8
+COALESCE(c0, c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c1, c0)	253 (format=json)	30	1	Y	0	39	8
+COALESCE(c1, c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c1, c1)	253 (format=json)	30	1	Y	0	39	8
+COALESCE(c1, c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c1, c2)	249 (format=json)	255	1	Y	0	39	8
+COALESCE(c1, c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c1, c3)	252 (format=json)	65535	1	Y	0	39	8
+COALESCE(c1, c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c1, c4)	250 (format=json)	16777215	1	Y	0	39	8
+COALESCE(c1, c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c1, c5)	251 (format=json)	4294967295	1	Y	0	39	8
+COALESCE(c1, c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c1, c6)	253	30	1	Y	0	39	8
+COALESCE(c1, c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c1, c7)	253	30	1	Y	0	39	8
+COALESCE(c1, c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c2, c0)	249 (format=json)	255	1	Y	0	39	8
+COALESCE(c2, c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c2, c1)	249 (format=json)	255	1	Y	0	39	8
+COALESCE(c2, c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c2, c2)	249 (format=json)	255	1	Y	0	39	8
+COALESCE(c2, c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c2, c3)	252 (format=json)	65535	1	Y	0	39	8
+COALESCE(c2, c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c2, c4)	250 (format=json)	16777215	1	Y	0	39	8
+COALESCE(c2, c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c2, c5)	251 (format=json)	4294967295	1	Y	0	39	8
+COALESCE(c2, c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c2, c6)	249	255	1	Y	0	39	8
+COALESCE(c2, c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c2, c7)	249	255	1	Y	0	39	8
+COALESCE(c2, c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c3, c0)	252 (format=json)	65535	1	Y	0	39	8
+COALESCE(c3, c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c3, c1)	252 (format=json)	65535	1	Y	0	39	8
+COALESCE(c3, c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c3, c2)	252 (format=json)	65535	1	Y	0	39	8
+COALESCE(c3, c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c3, c3)	252 (format=json)	65535	1	Y	0	39	8
+COALESCE(c3, c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c3, c4)	250 (format=json)	16777215	1	Y	0	39	8
+COALESCE(c3, c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c3, c5)	251 (format=json)	4294967295	1	Y	0	39	8
+COALESCE(c3, c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c3, c6)	252	65535	1	Y	0	39	8
+COALESCE(c3, c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c3, c7)	252	65535	1	Y	0	39	8
+COALESCE(c3, c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c4, c0)	250 (format=json)	16777215	1	Y	0	39	8
+COALESCE(c4, c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c4, c1)	250 (format=json)	16777215	1	Y	0	39	8
+COALESCE(c4, c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c4, c2)	250 (format=json)	16777215	1	Y	0	39	8
+COALESCE(c4, c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c4, c3)	250 (format=json)	16777215	1	Y	0	39	8
+COALESCE(c4, c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c4, c4)	250 (format=json)	16777215	1	Y	0	39	8
+COALESCE(c4, c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c4, c5)	251 (format=json)	4294967295	1	Y	0	39	8
+COALESCE(c4, c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c4, c6)	250	16777215	1	Y	0	39	8
+COALESCE(c4, c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c4, c7)	250	16777215	1	Y	0	39	8
+COALESCE(c4, c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c5, c0)	251 (format=json)	4294967295	1	Y	0	39	8
+COALESCE(c5, c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c5, c1)	251 (format=json)	4294967295	1	Y	0	39	8
+COALESCE(c5, c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c5, c2)	251 (format=json)	4294967295	1	Y	0	39	8
+COALESCE(c5, c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c5, c3)	251 (format=json)	4294967295	1	Y	0	39	8
+COALESCE(c5, c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c5, c4)	251 (format=json)	4294967295	1	Y	0	39	8
+COALESCE(c5, c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c5, c5)	251 (format=json)	4294967295	1	Y	0	39	8
+COALESCE(c5, c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c5, c6)	251	4294967295	1	Y	0	39	8
+COALESCE(c5, c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c5, c7)	251	4294967295	1	Y	0	39	8
+COALESCE(c5, c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c6, c0)	254	30	1	Y	0	39	8
+COALESCE(c6, c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c6, c1)	253	30	1	Y	0	39	8
+COALESCE(c6, c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c6, c2)	249	255	1	Y	0	39	8
+COALESCE(c6, c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c6, c3)	252	65535	1	Y	0	39	8
+COALESCE(c6, c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c6, c4)	250	16777215	1	Y	0	39	8
+COALESCE(c6, c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c6, c5)	251	4294967295	1	Y	0	39	8
+COALESCE(c6, c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c6, c6)	3	11	1	Y	32896	0	63
+COALESCE(c6, c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c6, c7)	254	11	1	Y	0	39	8
+COALESCE(c6, c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c7, c0)	254	30	1	Y	0	39	8
+COALESCE(c7, c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c7, c1)	253	30	1	Y	0	39	8
+COALESCE(c7, c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c7, c2)	249	255	1	Y	0	39	8
+COALESCE(c7, c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c7, c3)	252	65535	1	Y	0	39	8
+COALESCE(c7, c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c7, c4)	250	16777215	1	Y	0	39	8
+COALESCE(c7, c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c7, c5)	251	4294967295	1	Y	0	39	8
+COALESCE(c7, c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c7, c6)	254	11	1	Y	0	39	8
+COALESCE(c7, c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c7, c7)	254	1	1	Y	0	39	8
+COALESCE(c7, c7)
+1
+CALL p1('t1', 'LEAST(colt1, colt2)');
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c0, c0)	254	30	1	Y	0	39	8
+LEAST(c0, c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c0, c1)	253	30	1	Y	0	39	8
+LEAST(c0, c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c0, c2)	249	255	1	Y	0	39	8
+LEAST(c0, c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c0, c3)	252	65535	1	Y	0	39	8
+LEAST(c0, c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c0, c4)	250	16777215	1	Y	0	39	8
+LEAST(c0, c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c0, c5)	251	4294967295	1	Y	0	39	8
+LEAST(c0, c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c0, c6)	5	23	1	Y	32896	31	63
+LEAST(c0, c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c0, c7)	254	30	1	Y	0	39	8
+LEAST(c0, c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c1, c0)	253	30	1	Y	0	39	8
+LEAST(c1, c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c1, c1)	253	30	1	Y	0	39	8
+LEAST(c1, c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c1, c2)	249	255	1	Y	0	39	8
+LEAST(c1, c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c1, c3)	252	65535	1	Y	0	39	8
+LEAST(c1, c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c1, c4)	250	16777215	1	Y	0	39	8
+LEAST(c1, c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c1, c5)	251	4294967295	1	Y	0	39	8
+LEAST(c1, c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c1, c6)	5	23	1	Y	32896	31	63
+LEAST(c1, c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c1, c7)	253	30	1	Y	0	39	8
+LEAST(c1, c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c2, c0)	249	255	1	Y	0	39	8
+LEAST(c2, c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c2, c1)	249	255	1	Y	0	39	8
+LEAST(c2, c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c2, c2)	249	255	1	Y	0	39	8
+LEAST(c2, c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c2, c3)	252	65535	1	Y	0	39	8
+LEAST(c2, c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c2, c4)	250	16777215	1	Y	0	39	8
+LEAST(c2, c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c2, c5)	251	4294967295	1	Y	0	39	8
+LEAST(c2, c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c2, c6)	5	23	1	Y	32896	31	63
+LEAST(c2, c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c2, c7)	249	255	1	Y	0	39	8
+LEAST(c2, c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c3, c0)	252	65535	1	Y	0	39	8
+LEAST(c3, c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c3, c1)	252	65535	1	Y	0	39	8
+LEAST(c3, c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c3, c2)	252	65535	1	Y	0	39	8
+LEAST(c3, c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c3, c3)	252	65535	1	Y	0	39	8
+LEAST(c3, c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c3, c4)	250	16777215	1	Y	0	39	8
+LEAST(c3, c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c3, c5)	251	4294967295	1	Y	0	39	8
+LEAST(c3, c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c3, c6)	5	23	1	Y	32896	31	63
+LEAST(c3, c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c3, c7)	252	65535	1	Y	0	39	8
+LEAST(c3, c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c4, c0)	250	16777215	1	Y	0	39	8
+LEAST(c4, c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c4, c1)	250	16777215	1	Y	0	39	8
+LEAST(c4, c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c4, c2)	250	16777215	1	Y	0	39	8
+LEAST(c4, c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c4, c3)	250	16777215	1	Y	0	39	8
+LEAST(c4, c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c4, c4)	250	16777215	1	Y	0	39	8
+LEAST(c4, c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c4, c5)	251	4294967295	1	Y	0	39	8
+LEAST(c4, c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c4, c6)	5	23	1	Y	32896	31	63
+LEAST(c4, c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c4, c7)	250	16777215	1	Y	0	39	8
+LEAST(c4, c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c5, c0)	251	4294967295	1	Y	0	39	8
+LEAST(c5, c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c5, c1)	251	4294967295	1	Y	0	39	8
+LEAST(c5, c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c5, c2)	251	4294967295	1	Y	0	39	8
+LEAST(c5, c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c5, c3)	251	4294967295	1	Y	0	39	8
+LEAST(c5, c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c5, c4)	251	4294967295	1	Y	0	39	8
+LEAST(c5, c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c5, c5)	251	4294967295	1	Y	0	39	8
+LEAST(c5, c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c5, c6)	5	23	1	Y	32896	31	63
+LEAST(c5, c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c5, c7)	251	4294967295	1	Y	0	39	8
+LEAST(c5, c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c6, c0)	5	23	1	Y	32896	31	63
+LEAST(c6, c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c6, c1)	5	23	1	Y	32896	31	63
+LEAST(c6, c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c6, c2)	5	23	1	Y	32896	31	63
+LEAST(c6, c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c6, c3)	5	23	1	Y	32896	31	63
+LEAST(c6, c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c6, c4)	5	23	1	Y	32896	31	63
+LEAST(c6, c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c6, c5)	5	23	1	Y	32896	31	63
+LEAST(c6, c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c6, c6)	3	11	1	Y	32896	0	63
+LEAST(c6, c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c6, c7)	5	17	1	Y	32896	0	63
+LEAST(c6, c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c7, c0)	254	30	1	Y	0	39	8
+LEAST(c7, c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c7, c1)	253	30	1	Y	0	39	8
+LEAST(c7, c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c7, c2)	249	255	1	Y	0	39	8
+LEAST(c7, c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c7, c3)	252	65535	1	Y	0	39	8
+LEAST(c7, c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c7, c4)	250	16777215	1	Y	0	39	8
+LEAST(c7, c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c7, c5)	251	4294967295	1	Y	0	39	8
+LEAST(c7, c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c7, c6)	5	17	1	Y	32896	0	63
+LEAST(c7, c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c7, c7)	254	1	1	Y	0	39	8
+LEAST(c7, c7)
+1
+CALL p1('t1', 'colt1+colt2');
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c0+c0	5	23	1	Y	32896	31	63
+c0+c0
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c0+c1	5	23	1	Y	32896	31	63
+c0+c1
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c0+c2	5	23	1	Y	32896	31	63
+c0+c2
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c0+c3	5	23	1	Y	32896	31	63
+c0+c3
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c0+c4	5	23	1	Y	32896	31	63
+c0+c4
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c0+c5	5	23	1	Y	32896	31	63
+c0+c5
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c0+c6	5	23	1	Y	32896	31	63
+c0+c6
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c0+c7	5	23	1	Y	32896	31	63
+c0+c7
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c1+c0	5	23	1	Y	32896	31	63
+c1+c0
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c1+c1	5	23	1	Y	32896	31	63
+c1+c1
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c1+c2	5	23	1	Y	32896	31	63
+c1+c2
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c1+c3	5	23	1	Y	32896	31	63
+c1+c3
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c1+c4	5	23	1	Y	32896	31	63
+c1+c4
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c1+c5	5	23	1	Y	32896	31	63
+c1+c5
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c1+c6	5	23	1	Y	32896	31	63
+c1+c6
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c1+c7	5	23	1	Y	32896	31	63
+c1+c7
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c2+c0	5	23	1	Y	32896	31	63
+c2+c0
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c2+c1	5	23	1	Y	32896	31	63
+c2+c1
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c2+c2	5	23	1	Y	32896	31	63
+c2+c2
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c2+c3	5	23	1	Y	32896	31	63
+c2+c3
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c2+c4	5	23	1	Y	32896	31	63
+c2+c4
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c2+c5	5	23	1	Y	32896	31	63
+c2+c5
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c2+c6	5	23	1	Y	32896	31	63
+c2+c6
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c2+c7	5	23	1	Y	32896	31	63
+c2+c7
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c3+c0	5	23	1	Y	32896	31	63
+c3+c0
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c3+c1	5	23	1	Y	32896	31	63
+c3+c1
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c3+c2	5	23	1	Y	32896	31	63
+c3+c2
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c3+c3	5	23	1	Y	32896	31	63
+c3+c3
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c3+c4	5	23	1	Y	32896	31	63
+c3+c4
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c3+c5	5	23	1	Y	32896	31	63
+c3+c5
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c3+c6	5	23	1	Y	32896	31	63
+c3+c6
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c3+c7	5	23	1	Y	32896	31	63
+c3+c7
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c4+c0	5	23	1	Y	32896	31	63
+c4+c0
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c4+c1	5	23	1	Y	32896	31	63
+c4+c1
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c4+c2	5	23	1	Y	32896	31	63
+c4+c2
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c4+c3	5	23	1	Y	32896	31	63
+c4+c3
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c4+c4	5	23	1	Y	32896	31	63
+c4+c4
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c4+c5	5	23	1	Y	32896	31	63
+c4+c5
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c4+c6	5	23	1	Y	32896	31	63
+c4+c6
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c4+c7	5	23	1	Y	32896	31	63
+c4+c7
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c5+c0	5	23	1	Y	32896	31	63
+c5+c0
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c5+c1	5	23	1	Y	32896	31	63
+c5+c1
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c5+c2	5	23	1	Y	32896	31	63
+c5+c2
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c5+c3	5	23	1	Y	32896	31	63
+c5+c3
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c5+c4	5	23	1	Y	32896	31	63
+c5+c4
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c5+c5	5	23	1	Y	32896	31	63
+c5+c5
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c5+c6	5	23	1	Y	32896	31	63
+c5+c6
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c5+c7	5	23	1	Y	32896	31	63
+c5+c7
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c6+c0	5	23	1	Y	32896	31	63
+c6+c0
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c6+c1	5	23	1	Y	32896	31	63
+c6+c1
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c6+c2	5	23	1	Y	32896	31	63
+c6+c2
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c6+c3	5	23	1	Y	32896	31	63
+c6+c3
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c6+c4	5	23	1	Y	32896	31	63
+c6+c4
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c6+c5	5	23	1	Y	32896	31	63
+c6+c5
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c6+c6	8	12	1	Y	32896	0	63
+c6+c6
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c6+c7	8	12	1	Y	32896	0	63
+c6+c7
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c7+c0	5	23	1	Y	32896	31	63
+c7+c0
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c7+c1	5	23	1	Y	32896	31	63
+c7+c1
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c7+c2	5	23	1	Y	32896	31	63
+c7+c2
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c7+c3	5	23	1	Y	32896	31	63
+c7+c3
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c7+c4	5	23	1	Y	32896	31	63
+c7+c4
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c7+c5	5	23	1	Y	32896	31	63
+c7+c5
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c7+c6	8	12	1	Y	32896	0	63
+c7+c6
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c7+c7	3	3	1	Y	32896	0	63
+c7+c7
+2
+CALL p1('t1c', 'COALESCE(colt1, colt2)');
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c0, c0)	254 (format=json)	30	1	Y	0	39	8
+COALESCE(c0, c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c0, c1)	253 (format=json)	31	1	Y	0	39	8
+COALESCE(c0, c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c0, c2)	249 (format=json)	255	1	Y	0	39	8
+COALESCE(c0, c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c0, c3)	252 (format=json)	65535	1	Y	0	39	8
+COALESCE(c0, c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c0, c4)	250 (format=json)	16777215	1	Y	0	39	8
+COALESCE(c0, c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c0, c5)	251 (format=json)	4294967295	1	Y	0	39	8
+COALESCE(c0, c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c0, c6)	254	30	1	Y	0	39	8
+COALESCE(c0, c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c0, c7)	254	30	1	Y	0	39	8
+COALESCE(c0, c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c1, c0)	253 (format=json)	31	1	Y	0	39	8
+COALESCE(c1, c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c1, c1)	253 (format=json)	31	1	Y	0	39	8
+COALESCE(c1, c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c1, c2)	249 (format=json)	255	1	Y	0	39	8
+COALESCE(c1, c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c1, c3)	252 (format=json)	65535	1	Y	0	39	8
+COALESCE(c1, c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c1, c4)	250 (format=json)	16777215	1	Y	0	39	8
+COALESCE(c1, c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c1, c5)	251 (format=json)	4294967295	1	Y	0	39	8
+COALESCE(c1, c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c1, c6)	253	31	1	Y	0	39	8
+COALESCE(c1, c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c1, c7)	253	31	1	Y	0	39	8
+COALESCE(c1, c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c2, c0)	249 (format=json)	255	1	Y	0	39	8
+COALESCE(c2, c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c2, c1)	249 (format=json)	255	1	Y	0	39	8
+COALESCE(c2, c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c2, c2)	249 (format=json)	255	1	Y	0	39	8
+COALESCE(c2, c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c2, c3)	252 (format=json)	65535	1	Y	0	39	8
+COALESCE(c2, c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c2, c4)	250 (format=json)	16777215	1	Y	0	39	8
+COALESCE(c2, c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c2, c5)	251 (format=json)	4294967295	1	Y	0	39	8
+COALESCE(c2, c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c2, c6)	249	255	1	Y	0	39	8
+COALESCE(c2, c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c2, c7)	249	255	1	Y	0	39	8
+COALESCE(c2, c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c3, c0)	252 (format=json)	65535	1	Y	0	39	8
+COALESCE(c3, c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c3, c1)	252 (format=json)	65535	1	Y	0	39	8
+COALESCE(c3, c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c3, c2)	252 (format=json)	65535	1	Y	0	39	8
+COALESCE(c3, c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c3, c3)	252 (format=json)	65535	1	Y	0	39	8
+COALESCE(c3, c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c3, c4)	250 (format=json)	16777215	1	Y	0	39	8
+COALESCE(c3, c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c3, c5)	251 (format=json)	4294967295	1	Y	0	39	8
+COALESCE(c3, c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c3, c6)	252	65535	1	Y	0	39	8
+COALESCE(c3, c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c3, c7)	252	65535	1	Y	0	39	8
+COALESCE(c3, c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c4, c0)	250 (format=json)	16777215	1	Y	0	39	8
+COALESCE(c4, c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c4, c1)	250 (format=json)	16777215	1	Y	0	39	8
+COALESCE(c4, c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c4, c2)	250 (format=json)	16777215	1	Y	0	39	8
+COALESCE(c4, c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c4, c3)	250 (format=json)	16777215	1	Y	0	39	8
+COALESCE(c4, c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c4, c4)	250 (format=json)	16777215	1	Y	0	39	8
+COALESCE(c4, c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c4, c5)	251 (format=json)	4294967295	1	Y	0	39	8
+COALESCE(c4, c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c4, c6)	250	16777215	1	Y	0	39	8
+COALESCE(c4, c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c4, c7)	250	16777215	1	Y	0	39	8
+COALESCE(c4, c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c5, c0)	251 (format=json)	4294967295	1	Y	0	39	8
+COALESCE(c5, c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c5, c1)	251 (format=json)	4294967295	1	Y	0	39	8
+COALESCE(c5, c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c5, c2)	251 (format=json)	4294967295	1	Y	0	39	8
+COALESCE(c5, c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c5, c3)	251 (format=json)	4294967295	1	Y	0	39	8
+COALESCE(c5, c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c5, c4)	251 (format=json)	4294967295	1	Y	0	39	8
+COALESCE(c5, c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c5, c5)	251 (format=json)	4294967295	1	Y	0	39	8
+COALESCE(c5, c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c5, c6)	251	4294967295	1	Y	0	39	8
+COALESCE(c5, c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c5, c7)	251	4294967295	1	Y	0	39	8
+COALESCE(c5, c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c6, c0)	254	30	1	Y	0	39	8
+COALESCE(c6, c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c6, c1)	253	31	1	Y	0	39	8
+COALESCE(c6, c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c6, c2)	249	255	1	Y	0	39	8
+COALESCE(c6, c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c6, c3)	252	65535	1	Y	0	39	8
+COALESCE(c6, c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c6, c4)	250	16777215	1	Y	0	39	8
+COALESCE(c6, c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c6, c5)	251	4294967295	1	Y	0	39	8
+COALESCE(c6, c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c6, c6)	3	11	1	Y	32896	0	63
+COALESCE(c6, c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c6, c7)	254	11	1	Y	0	39	8
+COALESCE(c6, c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c7, c0)	254	30	1	Y	0	39	8
+COALESCE(c7, c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c7, c1)	253	31	1	Y	0	39	8
+COALESCE(c7, c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c7, c2)	249	255	1	Y	0	39	8
+COALESCE(c7, c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c7, c3)	252	65535	1	Y	0	39	8
+COALESCE(c7, c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c7, c4)	250	16777215	1	Y	0	39	8
+COALESCE(c7, c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c7, c5)	251	4294967295	1	Y	0	39	8
+COALESCE(c7, c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c7, c6)	254	11	1	Y	0	39	8
+COALESCE(c7, c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(c7, c7)	254	1	1	Y	0	39	8
+COALESCE(c7, c7)
+1
+CALL p1('t1c', 'LEAST(colt1, colt2)');
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c0, c0)	254	30	1	Y	0	39	8
+LEAST(c0, c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c0, c1)	253	31	1	Y	0	39	8
+LEAST(c0, c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c0, c2)	249	255	1	Y	0	39	8
+LEAST(c0, c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c0, c3)	252	65535	1	Y	0	39	8
+LEAST(c0, c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c0, c4)	250	16777215	1	Y	0	39	8
+LEAST(c0, c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c0, c5)	251	4294967295	1	Y	0	39	8
+LEAST(c0, c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c0, c6)	5	23	1	Y	32896	31	63
+LEAST(c0, c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c0, c7)	254	30	1	Y	0	39	8
+LEAST(c0, c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c1, c0)	253	31	1	Y	0	39	8
+LEAST(c1, c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c1, c1)	253	31	1	Y	0	39	8
+LEAST(c1, c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c1, c2)	249	255	1	Y	0	39	8
+LEAST(c1, c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c1, c3)	252	65535	1	Y	0	39	8
+LEAST(c1, c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c1, c4)	250	16777215	1	Y	0	39	8
+LEAST(c1, c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c1, c5)	251	4294967295	1	Y	0	39	8
+LEAST(c1, c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c1, c6)	5	23	1	Y	32896	31	63
+LEAST(c1, c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c1, c7)	253	31	1	Y	0	39	8
+LEAST(c1, c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c2, c0)	249	255	1	Y	0	39	8
+LEAST(c2, c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c2, c1)	249	255	1	Y	0	39	8
+LEAST(c2, c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c2, c2)	249	255	1	Y	0	39	8
+LEAST(c2, c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c2, c3)	252	65535	1	Y	0	39	8
+LEAST(c2, c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c2, c4)	250	16777215	1	Y	0	39	8
+LEAST(c2, c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c2, c5)	251	4294967295	1	Y	0	39	8
+LEAST(c2, c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c2, c6)	5	23	1	Y	32896	31	63
+LEAST(c2, c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c2, c7)	249	255	1	Y	0	39	8
+LEAST(c2, c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c3, c0)	252	65535	1	Y	0	39	8
+LEAST(c3, c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c3, c1)	252	65535	1	Y	0	39	8
+LEAST(c3, c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c3, c2)	252	65535	1	Y	0	39	8
+LEAST(c3, c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c3, c3)	252	65535	1	Y	0	39	8
+LEAST(c3, c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c3, c4)	250	16777215	1	Y	0	39	8
+LEAST(c3, c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c3, c5)	251	4294967295	1	Y	0	39	8
+LEAST(c3, c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c3, c6)	5	23	1	Y	32896	31	63
+LEAST(c3, c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c3, c7)	252	65535	1	Y	0	39	8
+LEAST(c3, c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c4, c0)	250	16777215	1	Y	0	39	8
+LEAST(c4, c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c4, c1)	250	16777215	1	Y	0	39	8
+LEAST(c4, c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c4, c2)	250	16777215	1	Y	0	39	8
+LEAST(c4, c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c4, c3)	250	16777215	1	Y	0	39	8
+LEAST(c4, c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c4, c4)	250	16777215	1	Y	0	39	8
+LEAST(c4, c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c4, c5)	251	4294967295	1	Y	0	39	8
+LEAST(c4, c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c4, c6)	5	23	1	Y	32896	31	63
+LEAST(c4, c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c4, c7)	250	16777215	1	Y	0	39	8
+LEAST(c4, c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c5, c0)	251	4294967295	1	Y	0	39	8
+LEAST(c5, c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c5, c1)	251	4294967295	1	Y	0	39	8
+LEAST(c5, c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c5, c2)	251	4294967295	1	Y	0	39	8
+LEAST(c5, c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c5, c3)	251	4294967295	1	Y	0	39	8
+LEAST(c5, c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c5, c4)	251	4294967295	1	Y	0	39	8
+LEAST(c5, c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c5, c5)	251	4294967295	1	Y	0	39	8
+LEAST(c5, c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c5, c6)	5	23	1	Y	32896	31	63
+LEAST(c5, c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c5, c7)	251	4294967295	1	Y	0	39	8
+LEAST(c5, c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c6, c0)	5	23	1	Y	32896	31	63
+LEAST(c6, c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c6, c1)	5	23	1	Y	32896	31	63
+LEAST(c6, c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c6, c2)	5	23	1	Y	32896	31	63
+LEAST(c6, c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c6, c3)	5	23	1	Y	32896	31	63
+LEAST(c6, c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c6, c4)	5	23	1	Y	32896	31	63
+LEAST(c6, c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c6, c5)	5	23	1	Y	32896	31	63
+LEAST(c6, c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c6, c6)	3	11	1	Y	32896	0	63
+LEAST(c6, c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c6, c7)	5	17	1	Y	32896	0	63
+LEAST(c6, c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c7, c0)	254	30	1	Y	0	39	8
+LEAST(c7, c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c7, c1)	253	31	1	Y	0	39	8
+LEAST(c7, c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c7, c2)	249	255	1	Y	0	39	8
+LEAST(c7, c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c7, c3)	252	65535	1	Y	0	39	8
+LEAST(c7, c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c7, c4)	250	16777215	1	Y	0	39	8
+LEAST(c7, c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c7, c5)	251	4294967295	1	Y	0	39	8
+LEAST(c7, c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c7, c6)	5	17	1	Y	32896	0	63
+LEAST(c7, c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(c7, c7)	254	1	1	Y	0	39	8
+LEAST(c7, c7)
+1
+CALL p1('t1c', 'colt1+colt2');
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c0+c0	5	23	1	Y	32896	31	63
+c0+c0
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c0+c1	5	23	1	Y	32896	31	63
+c0+c1
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c0+c2	5	23	1	Y	32896	31	63
+c0+c2
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c0+c3	5	23	1	Y	32896	31	63
+c0+c3
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c0+c4	5	23	1	Y	32896	31	63
+c0+c4
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c0+c5	5	23	1	Y	32896	31	63
+c0+c5
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c0+c6	5	23	1	Y	32896	31	63
+c0+c6
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c0+c7	5	23	1	Y	32896	31	63
+c0+c7
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c1+c0	5	23	1	Y	32896	31	63
+c1+c0
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c1+c1	5	23	1	Y	32896	31	63
+c1+c1
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c1+c2	5	23	1	Y	32896	31	63
+c1+c2
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c1+c3	5	23	1	Y	32896	31	63
+c1+c3
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c1+c4	5	23	1	Y	32896	31	63
+c1+c4
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c1+c5	5	23	1	Y	32896	31	63
+c1+c5
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c1+c6	5	23	1	Y	32896	31	63
+c1+c6
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c1+c7	5	23	1	Y	32896	31	63
+c1+c7
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c2+c0	5	23	1	Y	32896	31	63
+c2+c0
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c2+c1	5	23	1	Y	32896	31	63
+c2+c1
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c2+c2	5	23	1	Y	32896	31	63
+c2+c2
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c2+c3	5	23	1	Y	32896	31	63
+c2+c3
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c2+c4	5	23	1	Y	32896	31	63
+c2+c4
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c2+c5	5	23	1	Y	32896	31	63
+c2+c5
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c2+c6	5	23	1	Y	32896	31	63
+c2+c6
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c2+c7	5	23	1	Y	32896	31	63
+c2+c7
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c3+c0	5	23	1	Y	32896	31	63
+c3+c0
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c3+c1	5	23	1	Y	32896	31	63
+c3+c1
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c3+c2	5	23	1	Y	32896	31	63
+c3+c2
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c3+c3	5	23	1	Y	32896	31	63
+c3+c3
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c3+c4	5	23	1	Y	32896	31	63
+c3+c4
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c3+c5	5	23	1	Y	32896	31	63
+c3+c5
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c3+c6	5	23	1	Y	32896	31	63
+c3+c6
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c3+c7	5	23	1	Y	32896	31	63
+c3+c7
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c4+c0	5	23	1	Y	32896	31	63
+c4+c0
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c4+c1	5	23	1	Y	32896	31	63
+c4+c1
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c4+c2	5	23	1	Y	32896	31	63
+c4+c2
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c4+c3	5	23	1	Y	32896	31	63
+c4+c3
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c4+c4	5	23	1	Y	32896	31	63
+c4+c4
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c4+c5	5	23	1	Y	32896	31	63
+c4+c5
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c4+c6	5	23	1	Y	32896	31	63
+c4+c6
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c4+c7	5	23	1	Y	32896	31	63
+c4+c7
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c5+c0	5	23	1	Y	32896	31	63
+c5+c0
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c5+c1	5	23	1	Y	32896	31	63
+c5+c1
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c5+c2	5	23	1	Y	32896	31	63
+c5+c2
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c5+c3	5	23	1	Y	32896	31	63
+c5+c3
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c5+c4	5	23	1	Y	32896	31	63
+c5+c4
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c5+c5	5	23	1	Y	32896	31	63
+c5+c5
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c5+c6	5	23	1	Y	32896	31	63
+c5+c6
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c5+c7	5	23	1	Y	32896	31	63
+c5+c7
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c6+c0	5	23	1	Y	32896	31	63
+c6+c0
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c6+c1	5	23	1	Y	32896	31	63
+c6+c1
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c6+c2	5	23	1	Y	32896	31	63
+c6+c2
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c6+c3	5	23	1	Y	32896	31	63
+c6+c3
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c6+c4	5	23	1	Y	32896	31	63
+c6+c4
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c6+c5	5	23	1	Y	32896	31	63
+c6+c5
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c6+c6	8	12	1	Y	32896	0	63
+c6+c6
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c6+c7	8	12	1	Y	32896	0	63
+c6+c7
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c7+c0	5	23	1	Y	32896	31	63
+c7+c0
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c7+c1	5	23	1	Y	32896	31	63
+c7+c1
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c7+c2	5	23	1	Y	32896	31	63
+c7+c2
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c7+c3	5	23	1	Y	32896	31	63
+c7+c3
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c7+c4	5	23	1	Y	32896	31	63
+c7+c4
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c7+c5	5	23	1	Y	32896	31	63
+c7+c5
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c7+c6	8	12	1	Y	32896	0	63
+c7+c6
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					c7+c7	3	3	1	Y	32896	0	63
+c7+c7
+2
+CALL p2('COALESCE(t1.colt1, t2.colt2)');
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c0, t2.c0)	254	30	1	Y	0	39	8
+COALESCE(t1.c0, t2.c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c0, t2.c1)	253	30	1	Y	0	39	8
+COALESCE(t1.c0, t2.c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c0, t2.c2)	249	255	1	Y	0	39	8
+COALESCE(t1.c0, t2.c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c0, t2.c3)	252	65535	1	Y	0	39	8
+COALESCE(t1.c0, t2.c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c0, t2.c4)	250	16777215	1	Y	0	39	8
+COALESCE(t1.c0, t2.c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c0, t2.c5)	251	4294967295	1	Y	0	39	8
+COALESCE(t1.c0, t2.c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c0, t2.c6)	254	30	1	Y	0	39	8
+COALESCE(t1.c0, t2.c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c0, t2.c7)	254	30	1	Y	0	39	8
+COALESCE(t1.c0, t2.c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c0, t2.c8)	254	30	1	Y	0	39	8
+COALESCE(t1.c0, t2.c8)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c0, t2.c9)	254	30	1	Y	0	39	8
+COALESCE(t1.c0, t2.c9)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c0, t2.c10)	254	30	1	Y	0	39	8
+COALESCE(t1.c0, t2.c10)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c0, t2.c11)	254	30	1	Y	0	39	8
+COALESCE(t1.c0, t2.c11)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c0, t2.c12)	254	30	1	Y	0	39	8
+COALESCE(t1.c0, t2.c12)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c1, t2.c0)	253	30	1	Y	0	39	8
+COALESCE(t1.c1, t2.c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c1, t2.c1)	253	30	1	Y	0	39	8
+COALESCE(t1.c1, t2.c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c1, t2.c2)	249	255	1	Y	0	39	8
+COALESCE(t1.c1, t2.c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c1, t2.c3)	252	65535	1	Y	0	39	8
+COALESCE(t1.c1, t2.c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c1, t2.c4)	250	16777215	1	Y	0	39	8
+COALESCE(t1.c1, t2.c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c1, t2.c5)	251	4294967295	1	Y	0	39	8
+COALESCE(t1.c1, t2.c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c1, t2.c6)	253	30	1	Y	0	39	8
+COALESCE(t1.c1, t2.c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c1, t2.c7)	253	30	1	Y	0	39	8
+COALESCE(t1.c1, t2.c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c1, t2.c8)	253	30	1	Y	0	39	8
+COALESCE(t1.c1, t2.c8)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c1, t2.c9)	253	30	1	Y	0	39	8
+COALESCE(t1.c1, t2.c9)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c1, t2.c10)	253	30	1	Y	0	39	8
+COALESCE(t1.c1, t2.c10)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c1, t2.c11)	253	30	1	Y	0	39	8
+COALESCE(t1.c1, t2.c11)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c1, t2.c12)	253	30	1	Y	0	39	8
+COALESCE(t1.c1, t2.c12)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c2, t2.c0)	249	255	1	Y	0	39	8
+COALESCE(t1.c2, t2.c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c2, t2.c1)	249	255	1	Y	0	39	8
+COALESCE(t1.c2, t2.c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c2, t2.c2)	249	255	1	Y	0	39	8
+COALESCE(t1.c2, t2.c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c2, t2.c3)	252	65535	1	Y	0	39	8
+COALESCE(t1.c2, t2.c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c2, t2.c4)	250	16777215	1	Y	0	39	8
+COALESCE(t1.c2, t2.c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c2, t2.c5)	251	4294967295	1	Y	0	39	8
+COALESCE(t1.c2, t2.c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c2, t2.c6)	249	255	1	Y	0	39	8
+COALESCE(t1.c2, t2.c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c2, t2.c7)	249	255	1	Y	0	39	8
+COALESCE(t1.c2, t2.c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c2, t2.c8)	249	255	1	Y	0	39	8
+COALESCE(t1.c2, t2.c8)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c2, t2.c9)	249	255	1	Y	0	39	8
+COALESCE(t1.c2, t2.c9)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c2, t2.c10)	249	255	1	Y	0	39	8
+COALESCE(t1.c2, t2.c10)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c2, t2.c11)	249	255	1	Y	0	39	8
+COALESCE(t1.c2, t2.c11)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c2, t2.c12)	249	255	1	Y	0	39	8
+COALESCE(t1.c2, t2.c12)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c3, t2.c0)	252	65535	1	Y	0	39	8
+COALESCE(t1.c3, t2.c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c3, t2.c1)	252	65535	1	Y	0	39	8
+COALESCE(t1.c3, t2.c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c3, t2.c2)	252	65535	1	Y	0	39	8
+COALESCE(t1.c3, t2.c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c3, t2.c3)	252	65535	1	Y	0	39	8
+COALESCE(t1.c3, t2.c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c3, t2.c4)	250	16777215	1	Y	0	39	8
+COALESCE(t1.c3, t2.c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c3, t2.c5)	251	4294967295	1	Y	0	39	8
+COALESCE(t1.c3, t2.c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c3, t2.c6)	252	65535	1	Y	0	39	8
+COALESCE(t1.c3, t2.c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c3, t2.c7)	252	65535	1	Y	0	39	8
+COALESCE(t1.c3, t2.c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c3, t2.c8)	252	65535	1	Y	0	39	8
+COALESCE(t1.c3, t2.c8)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c3, t2.c9)	252	65535	1	Y	0	39	8
+COALESCE(t1.c3, t2.c9)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c3, t2.c10)	252	65535	1	Y	0	39	8
+COALESCE(t1.c3, t2.c10)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c3, t2.c11)	252	65535	1	Y	0	39	8
+COALESCE(t1.c3, t2.c11)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c3, t2.c12)	252	65535	1	Y	0	39	8
+COALESCE(t1.c3, t2.c12)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c4, t2.c0)	250	16777215	1	Y	0	39	8
+COALESCE(t1.c4, t2.c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c4, t2.c1)	250	16777215	1	Y	0	39	8
+COALESCE(t1.c4, t2.c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c4, t2.c2)	250	16777215	1	Y	0	39	8
+COALESCE(t1.c4, t2.c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c4, t2.c3)	250	16777215	1	Y	0	39	8
+COALESCE(t1.c4, t2.c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c4, t2.c4)	250	16777215	1	Y	0	39	8
+COALESCE(t1.c4, t2.c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c4, t2.c5)	251	4294967295	1	Y	0	39	8
+COALESCE(t1.c4, t2.c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c4, t2.c6)	250	16777215	1	Y	0	39	8
+COALESCE(t1.c4, t2.c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c4, t2.c7)	250	16777215	1	Y	0	39	8
+COALESCE(t1.c4, t2.c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c4, t2.c8)	250	16777215	1	Y	0	39	8
+COALESCE(t1.c4, t2.c8)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c4, t2.c9)	250	16777215	1	Y	0	39	8
+COALESCE(t1.c4, t2.c9)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c4, t2.c10)	250	16777215	1	Y	0	39	8
+COALESCE(t1.c4, t2.c10)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c4, t2.c11)	250	16777215	1	Y	0	39	8
+COALESCE(t1.c4, t2.c11)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c4, t2.c12)	250	16777215	1	Y	0	39	8
+COALESCE(t1.c4, t2.c12)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c5, t2.c0)	251	4294967295	1	Y	0	39	8
+COALESCE(t1.c5, t2.c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c5, t2.c1)	251	4294967295	1	Y	0	39	8
+COALESCE(t1.c5, t2.c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c5, t2.c2)	251	4294967295	1	Y	0	39	8
+COALESCE(t1.c5, t2.c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c5, t2.c3)	251	4294967295	1	Y	0	39	8
+COALESCE(t1.c5, t2.c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c5, t2.c4)	251	4294967295	1	Y	0	39	8
+COALESCE(t1.c5, t2.c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c5, t2.c5)	251	4294967295	1	Y	0	39	8
+COALESCE(t1.c5, t2.c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c5, t2.c6)	251	4294967295	1	Y	0	39	8
+COALESCE(t1.c5, t2.c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c5, t2.c7)	251	4294967295	1	Y	0	39	8
+COALESCE(t1.c5, t2.c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c5, t2.c8)	251	4294967295	1	Y	0	39	8
+COALESCE(t1.c5, t2.c8)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c5, t2.c9)	251	4294967295	1	Y	0	39	8
+COALESCE(t1.c5, t2.c9)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c5, t2.c10)	251	4294967295	1	Y	0	39	8
+COALESCE(t1.c5, t2.c10)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c5, t2.c11)	251	4294967295	1	Y	0	39	8
+COALESCE(t1.c5, t2.c11)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c5, t2.c12)	251	4294967295	1	Y	0	39	8
+COALESCE(t1.c5, t2.c12)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c6, t2.c0)	254	30	1	Y	0	39	8
+COALESCE(t1.c6, t2.c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c6, t2.c1)	253	30	1	Y	0	39	8
+COALESCE(t1.c6, t2.c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c6, t2.c2)	249	255	1	Y	0	39	8
+COALESCE(t1.c6, t2.c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c6, t2.c3)	252	65535	1	Y	0	39	8
+COALESCE(t1.c6, t2.c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c6, t2.c4)	250	16777215	1	Y	0	39	8
+COALESCE(t1.c6, t2.c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c6, t2.c5)	251	4294967295	1	Y	0	39	8
+COALESCE(t1.c6, t2.c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c6, t2.c6)	3	11	1	Y	32896	0	63
+COALESCE(t1.c6, t2.c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c6, t2.c7)	5	22	1	Y	32896	31	63
+COALESCE(t1.c6, t2.c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c6, t2.c8)	246	14	4	Y	32896	2	63
+COALESCE(t1.c6, t2.c8)
+1.00
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c6, t2.c9)	253	11	1	Y	0	39	8
+COALESCE(t1.c6, t2.c9)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c6, t2.c10)	253	11	1	Y	0	39	8
+COALESCE(t1.c6, t2.c10)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c6, t2.c11)	253	19	1	Y	0	39	8
+COALESCE(t1.c6, t2.c11)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c6, t2.c12)	254	11	1	Y	0	39	8
+COALESCE(t1.c6, t2.c12)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c7, t2.c0)	254	30	1	Y	0	39	8
+COALESCE(t1.c7, t2.c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c7, t2.c1)	253	30	1	Y	0	39	8
+COALESCE(t1.c7, t2.c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c7, t2.c2)	249	255	1	Y	0	39	8
+COALESCE(t1.c7, t2.c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c7, t2.c3)	252	65535	1	Y	0	39	8
+COALESCE(t1.c7, t2.c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c7, t2.c4)	250	16777215	1	Y	0	39	8
+COALESCE(t1.c7, t2.c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c7, t2.c5)	251	4294967295	1	Y	0	39	8
+COALESCE(t1.c7, t2.c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c7, t2.c6)	254	11	1	Y	0	39	8
+COALESCE(t1.c7, t2.c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c7, t2.c7)	254	22	1	Y	0	39	8
+COALESCE(t1.c7, t2.c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c7, t2.c8)	254	12	1	Y	0	39	8
+COALESCE(t1.c7, t2.c8)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c7, t2.c9)	254	10	1	Y	0	39	8
+COALESCE(t1.c7, t2.c9)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c7, t2.c10)	254	10	1	Y	0	39	8
+COALESCE(t1.c7, t2.c10)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c7, t2.c11)	254	19	1	Y	0	39	8
+COALESCE(t1.c7, t2.c11)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					COALESCE(t1.c7, t2.c12)	254	1	1	Y	0	39	8
+COALESCE(t1.c7, t2.c12)
+1
+CALL p2('LEAST(t1.colt1, t2.colt2)');
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c0, t2.c0)	254	30	1	Y	0	39	8
+LEAST(t1.c0, t2.c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c0, t2.c1)	253	30	1	Y	0	39	8
+LEAST(t1.c0, t2.c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c0, t2.c2)	249	255	1	Y	0	39	8
+LEAST(t1.c0, t2.c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c0, t2.c3)	252	65535	1	Y	0	39	8
+LEAST(t1.c0, t2.c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c0, t2.c4)	250	16777215	1	Y	0	39	8
+LEAST(t1.c0, t2.c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c0, t2.c5)	251	4294967295	1	Y	0	39	8
+LEAST(t1.c0, t2.c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c0, t2.c6)	5	23	1	Y	32896	31	63
+LEAST(t1.c0, t2.c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c0, t2.c7)	5	23	1	Y	32896	31	63
+LEAST(t1.c0, t2.c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c0, t2.c8)	5	23	1	Y	32896	31	63
+LEAST(t1.c0, t2.c8)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c0, t2.c9)	11	17	15	Y	128	6	63
+LEAST(t1.c0, t2.c9)
+00:00:01.000000
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c0, t2.c10)	10	10	10	Y	128	0	63
+LEAST(t1.c0, t2.c10)
+0000-00-00
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c0, t2.c11)	12	26	26	Y	128	6	63
+LEAST(t1.c0, t2.c11)
+0000-00-00 00:00:00.000000
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c0, t2.c12)	254	30	1	Y	0	39	8
+LEAST(t1.c0, t2.c12)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c1, t2.c0)	253	30	1	Y	0	39	8
+LEAST(t1.c1, t2.c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c1, t2.c1)	253	30	1	Y	0	39	8
+LEAST(t1.c1, t2.c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c1, t2.c2)	249	255	1	Y	0	39	8
+LEAST(t1.c1, t2.c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c1, t2.c3)	252	65535	1	Y	0	39	8
+LEAST(t1.c1, t2.c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c1, t2.c4)	250	16777215	1	Y	0	39	8
+LEAST(t1.c1, t2.c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c1, t2.c5)	251	4294967295	1	Y	0	39	8
+LEAST(t1.c1, t2.c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c1, t2.c6)	5	23	1	Y	32896	31	63
+LEAST(t1.c1, t2.c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c1, t2.c7)	5	23	1	Y	32896	31	63
+LEAST(t1.c1, t2.c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c1, t2.c8)	5	23	1	Y	32896	31	63
+LEAST(t1.c1, t2.c8)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c1, t2.c9)	11	17	15	Y	128	6	63
+LEAST(t1.c1, t2.c9)
+00:00:01.000000
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c1, t2.c10)	10	10	10	Y	128	0	63
+LEAST(t1.c1, t2.c10)
+0000-00-00
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c1, t2.c11)	12	26	26	Y	128	6	63
+LEAST(t1.c1, t2.c11)
+0000-00-00 00:00:00.000000
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c1, t2.c12)	253	30	1	Y	0	39	8
+LEAST(t1.c1, t2.c12)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c2, t2.c0)	249	255	1	Y	0	39	8
+LEAST(t1.c2, t2.c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c2, t2.c1)	249	255	1	Y	0	39	8
+LEAST(t1.c2, t2.c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c2, t2.c2)	249	255	1	Y	0	39	8
+LEAST(t1.c2, t2.c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c2, t2.c3)	252	65535	1	Y	0	39	8
+LEAST(t1.c2, t2.c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c2, t2.c4)	250	16777215	1	Y	0	39	8
+LEAST(t1.c2, t2.c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c2, t2.c5)	251	4294967295	1	Y	0	39	8
+LEAST(t1.c2, t2.c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c2, t2.c6)	5	23	1	Y	32896	31	63
+LEAST(t1.c2, t2.c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c2, t2.c7)	5	23	1	Y	32896	31	63
+LEAST(t1.c2, t2.c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c2, t2.c8)	5	23	1	Y	32896	31	63
+LEAST(t1.c2, t2.c8)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c2, t2.c9)	11	17	15	Y	128	6	63
+LEAST(t1.c2, t2.c9)
+00:00:01.000000
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c2, t2.c10)	10	10	10	Y	128	0	63
+LEAST(t1.c2, t2.c10)
+0000-00-00
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c2, t2.c11)	12	26	26	Y	128	6	63
+LEAST(t1.c2, t2.c11)
+0000-00-00 00:00:00.000000
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c2, t2.c12)	249	255	1	Y	0	39	8
+LEAST(t1.c2, t2.c12)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c3, t2.c0)	252	65535	1	Y	0	39	8
+LEAST(t1.c3, t2.c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c3, t2.c1)	252	65535	1	Y	0	39	8
+LEAST(t1.c3, t2.c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c3, t2.c2)	252	65535	1	Y	0	39	8
+LEAST(t1.c3, t2.c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c3, t2.c3)	252	65535	1	Y	0	39	8
+LEAST(t1.c3, t2.c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c3, t2.c4)	250	16777215	1	Y	0	39	8
+LEAST(t1.c3, t2.c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c3, t2.c5)	251	4294967295	1	Y	0	39	8
+LEAST(t1.c3, t2.c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c3, t2.c6)	5	23	1	Y	32896	31	63
+LEAST(t1.c3, t2.c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c3, t2.c7)	5	23	1	Y	32896	31	63
+LEAST(t1.c3, t2.c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c3, t2.c8)	5	23	1	Y	32896	31	63
+LEAST(t1.c3, t2.c8)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c3, t2.c9)	11	17	15	Y	128	6	63
+LEAST(t1.c3, t2.c9)
+00:00:01.000000
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c3, t2.c10)	10	10	10	Y	128	0	63
+LEAST(t1.c3, t2.c10)
+0000-00-00
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c3, t2.c11)	12	26	26	Y	128	6	63
+LEAST(t1.c3, t2.c11)
+0000-00-00 00:00:00.000000
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c3, t2.c12)	252	65535	1	Y	0	39	8
+LEAST(t1.c3, t2.c12)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c4, t2.c0)	250	16777215	1	Y	0	39	8
+LEAST(t1.c4, t2.c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c4, t2.c1)	250	16777215	1	Y	0	39	8
+LEAST(t1.c4, t2.c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c4, t2.c2)	250	16777215	1	Y	0	39	8
+LEAST(t1.c4, t2.c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c4, t2.c3)	250	16777215	1	Y	0	39	8
+LEAST(t1.c4, t2.c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c4, t2.c4)	250	16777215	1	Y	0	39	8
+LEAST(t1.c4, t2.c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c4, t2.c5)	251	4294967295	1	Y	0	39	8
+LEAST(t1.c4, t2.c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c4, t2.c6)	5	23	1	Y	32896	31	63
+LEAST(t1.c4, t2.c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c4, t2.c7)	5	23	1	Y	32896	31	63
+LEAST(t1.c4, t2.c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c4, t2.c8)	5	23	1	Y	32896	31	63
+LEAST(t1.c4, t2.c8)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c4, t2.c9)	11	17	15	Y	128	6	63
+LEAST(t1.c4, t2.c9)
+00:00:01.000000
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c4, t2.c10)	10	10	10	Y	128	0	63
+LEAST(t1.c4, t2.c10)
+0000-00-00
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c4, t2.c11)	12	26	26	Y	128	6	63
+LEAST(t1.c4, t2.c11)
+0000-00-00 00:00:00.000000
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c4, t2.c12)	250	16777215	1	Y	0	39	8
+LEAST(t1.c4, t2.c12)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c5, t2.c0)	251	4294967295	1	Y	0	39	8
+LEAST(t1.c5, t2.c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c5, t2.c1)	251	4294967295	1	Y	0	39	8
+LEAST(t1.c5, t2.c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c5, t2.c2)	251	4294967295	1	Y	0	39	8
+LEAST(t1.c5, t2.c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c5, t2.c3)	251	4294967295	1	Y	0	39	8
+LEAST(t1.c5, t2.c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c5, t2.c4)	251	4294967295	1	Y	0	39	8
+LEAST(t1.c5, t2.c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c5, t2.c5)	251	4294967295	1	Y	0	39	8
+LEAST(t1.c5, t2.c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c5, t2.c6)	5	23	1	Y	32896	31	63
+LEAST(t1.c5, t2.c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c5, t2.c7)	5	23	1	Y	32896	31	63
+LEAST(t1.c5, t2.c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c5, t2.c8)	5	23	1	Y	32896	31	63
+LEAST(t1.c5, t2.c8)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c5, t2.c9)	11	17	15	Y	128	6	63
+LEAST(t1.c5, t2.c9)
+00:00:01.000000
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c5, t2.c10)	10	10	10	Y	128	0	63
+LEAST(t1.c5, t2.c10)
+0000-00-00
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c5, t2.c11)	12	26	26	Y	128	6	63
+LEAST(t1.c5, t2.c11)
+0000-00-00 00:00:00.000000
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c5, t2.c12)	251	4294967295	1	Y	0	39	8
+LEAST(t1.c5, t2.c12)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c6, t2.c0)	5	23	1	Y	32896	31	63
+LEAST(t1.c6, t2.c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c6, t2.c1)	5	23	1	Y	32896	31	63
+LEAST(t1.c6, t2.c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c6, t2.c2)	5	23	1	Y	32896	31	63
+LEAST(t1.c6, t2.c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c6, t2.c3)	5	23	1	Y	32896	31	63
+LEAST(t1.c6, t2.c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c6, t2.c4)	5	23	1	Y	32896	31	63
+LEAST(t1.c6, t2.c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c6, t2.c5)	5	23	1	Y	32896	31	63
+LEAST(t1.c6, t2.c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c6, t2.c6)	3	11	1	Y	32896	0	63
+LEAST(t1.c6, t2.c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c6, t2.c7)	5	23	1	Y	32896	31	63
+LEAST(t1.c6, t2.c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c6, t2.c8)	246	14	4	Y	32896	2	63
+LEAST(t1.c6, t2.c8)
+1.00
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c6, t2.c9)	11	10	8	Y	128	0	63
+LEAST(t1.c6, t2.c9)
+00:00:01
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c6, t2.c10)	10	10	10	Y	128	0	63
+LEAST(t1.c6, t2.c10)
+0000-00-00
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c6, t2.c11)	12	19	19	Y	128	0	63
+LEAST(t1.c6, t2.c11)
+0000-00-00 00:00:00
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c6, t2.c12)	5	17	1	Y	32896	0	63
+LEAST(t1.c6, t2.c12)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c7, t2.c0)	254	30	1	Y	0	39	8
+LEAST(t1.c7, t2.c0)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c7, t2.c1)	253	30	1	Y	0	39	8
+LEAST(t1.c7, t2.c1)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c7, t2.c2)	249	255	1	Y	0	39	8
+LEAST(t1.c7, t2.c2)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c7, t2.c3)	252	65535	1	Y	0	39	8
+LEAST(t1.c7, t2.c3)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c7, t2.c4)	250	16777215	1	Y	0	39	8
+LEAST(t1.c7, t2.c4)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c7, t2.c5)	251	4294967295	1	Y	0	39	8
+LEAST(t1.c7, t2.c5)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c7, t2.c6)	5	17	1	Y	32896	0	63
+LEAST(t1.c7, t2.c6)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c7, t2.c7)	5	23	1	Y	32896	31	63
+LEAST(t1.c7, t2.c7)
+1
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c7, t2.c8)	5	19	4	Y	32896	2	63
+LEAST(t1.c7, t2.c8)
+1.00
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c7, t2.c9)	11	10	8	Y	128	0	63
+LEAST(t1.c7, t2.c9)
+00:00:01
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c7, t2.c10)	10	10	10	Y	128	0	63
+LEAST(t1.c7, t2.c10)
+0000-00-00
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c7, t2.c11)	12	19	19	Y	128	0	63
+LEAST(t1.c7, t2.c11)
+0000-00-00 00:00:00
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					LEAST(t1.c7, t2.c12)	254	1	1	Y	0	39	8
+LEAST(t1.c7, t2.c12)
+1
+CALL p2('t1.colt1+t2.colt2');
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c0+t2.c0	5	23	1	Y	32896	31	63
+t1.c0+t2.c0
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c0+t2.c1	5	23	1	Y	32896	31	63
+t1.c0+t2.c1
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c0+t2.c2	5	23	1	Y	32896	31	63
+t1.c0+t2.c2
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c0+t2.c3	5	23	1	Y	32896	31	63
+t1.c0+t2.c3
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c0+t2.c4	5	23	1	Y	32896	31	63
+t1.c0+t2.c4
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c0+t2.c5	5	23	1	Y	32896	31	63
+t1.c0+t2.c5
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c0+t2.c6	5	23	1	Y	32896	31	63
+t1.c0+t2.c6
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c0+t2.c7	5	23	1	Y	32896	31	63
+t1.c0+t2.c7
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c0+t2.c8	5	23	4	Y	32896	31	63
+t1.c0+t2.c8
+2.23
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c0+t2.c9	5	23	6	Y	32896	31	63
+t1.c0+t2.c9
+102031
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c0+t2.c10	5	23	8	Y	32896	31	63
+t1.c0+t2.c10
+20010102
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c0+t2.c11	5	23	14	Y	32896	31	63
+t1.c0+t2.c11
+20010101102031
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c0+t2.c12	5	23	1	Y	32896	31	63
+t1.c0+t2.c12
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c1+t2.c0	5	23	1	Y	32896	31	63
+t1.c1+t2.c0
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c1+t2.c1	5	23	1	Y	32896	31	63
+t1.c1+t2.c1
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c1+t2.c2	5	23	1	Y	32896	31	63
+t1.c1+t2.c2
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c1+t2.c3	5	23	1	Y	32896	31	63
+t1.c1+t2.c3
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c1+t2.c4	5	23	1	Y	32896	31	63
+t1.c1+t2.c4
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c1+t2.c5	5	23	1	Y	32896	31	63
+t1.c1+t2.c5
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c1+t2.c6	5	23	1	Y	32896	31	63
+t1.c1+t2.c6
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c1+t2.c7	5	23	1	Y	32896	31	63
+t1.c1+t2.c7
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c1+t2.c8	5	23	4	Y	32896	31	63
+t1.c1+t2.c8
+2.23
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c1+t2.c9	5	23	6	Y	32896	31	63
+t1.c1+t2.c9
+102031
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c1+t2.c10	5	23	8	Y	32896	31	63
+t1.c1+t2.c10
+20010102
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c1+t2.c11	5	23	14	Y	32896	31	63
+t1.c1+t2.c11
+20010101102031
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c1+t2.c12	5	23	1	Y	32896	31	63
+t1.c1+t2.c12
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c2+t2.c0	5	23	1	Y	32896	31	63
+t1.c2+t2.c0
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c2+t2.c1	5	23	1	Y	32896	31	63
+t1.c2+t2.c1
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c2+t2.c2	5	23	1	Y	32896	31	63
+t1.c2+t2.c2
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c2+t2.c3	5	23	1	Y	32896	31	63
+t1.c2+t2.c3
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c2+t2.c4	5	23	1	Y	32896	31	63
+t1.c2+t2.c4
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c2+t2.c5	5	23	1	Y	32896	31	63
+t1.c2+t2.c5
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c2+t2.c6	5	23	1	Y	32896	31	63
+t1.c2+t2.c6
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c2+t2.c7	5	23	1	Y	32896	31	63
+t1.c2+t2.c7
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c2+t2.c8	5	23	4	Y	32896	31	63
+t1.c2+t2.c8
+2.23
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c2+t2.c9	5	23	6	Y	32896	31	63
+t1.c2+t2.c9
+102031
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c2+t2.c10	5	23	8	Y	32896	31	63
+t1.c2+t2.c10
+20010102
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c2+t2.c11	5	23	14	Y	32896	31	63
+t1.c2+t2.c11
+20010101102031
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c2+t2.c12	5	23	1	Y	32896	31	63
+t1.c2+t2.c12
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c3+t2.c0	5	23	1	Y	32896	31	63
+t1.c3+t2.c0
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c3+t2.c1	5	23	1	Y	32896	31	63
+t1.c3+t2.c1
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c3+t2.c2	5	23	1	Y	32896	31	63
+t1.c3+t2.c2
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c3+t2.c3	5	23	1	Y	32896	31	63
+t1.c3+t2.c3
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c3+t2.c4	5	23	1	Y	32896	31	63
+t1.c3+t2.c4
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c3+t2.c5	5	23	1	Y	32896	31	63
+t1.c3+t2.c5
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c3+t2.c6	5	23	1	Y	32896	31	63
+t1.c3+t2.c6
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c3+t2.c7	5	23	1	Y	32896	31	63
+t1.c3+t2.c7
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c3+t2.c8	5	23	4	Y	32896	31	63
+t1.c3+t2.c8
+2.23
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c3+t2.c9	5	23	6	Y	32896	31	63
+t1.c3+t2.c9
+102031
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c3+t2.c10	5	23	8	Y	32896	31	63
+t1.c3+t2.c10
+20010102
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c3+t2.c11	5	23	14	Y	32896	31	63
+t1.c3+t2.c11
+20010101102031
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c3+t2.c12	5	23	1	Y	32896	31	63
+t1.c3+t2.c12
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c4+t2.c0	5	23	1	Y	32896	31	63
+t1.c4+t2.c0
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c4+t2.c1	5	23	1	Y	32896	31	63
+t1.c4+t2.c1
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c4+t2.c2	5	23	1	Y	32896	31	63
+t1.c4+t2.c2
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c4+t2.c3	5	23	1	Y	32896	31	63
+t1.c4+t2.c3
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c4+t2.c4	5	23	1	Y	32896	31	63
+t1.c4+t2.c4
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c4+t2.c5	5	23	1	Y	32896	31	63
+t1.c4+t2.c5
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c4+t2.c6	5	23	1	Y	32896	31	63
+t1.c4+t2.c6
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c4+t2.c7	5	23	1	Y	32896	31	63
+t1.c4+t2.c7
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c4+t2.c8	5	23	4	Y	32896	31	63
+t1.c4+t2.c8
+2.23
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c4+t2.c9	5	23	6	Y	32896	31	63
+t1.c4+t2.c9
+102031
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c4+t2.c10	5	23	8	Y	32896	31	63
+t1.c4+t2.c10
+20010102
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c4+t2.c11	5	23	14	Y	32896	31	63
+t1.c4+t2.c11
+20010101102031
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c4+t2.c12	5	23	1	Y	32896	31	63
+t1.c4+t2.c12
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c5+t2.c0	5	23	1	Y	32896	31	63
+t1.c5+t2.c0
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c5+t2.c1	5	23	1	Y	32896	31	63
+t1.c5+t2.c1
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c5+t2.c2	5	23	1	Y	32896	31	63
+t1.c5+t2.c2
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c5+t2.c3	5	23	1	Y	32896	31	63
+t1.c5+t2.c3
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c5+t2.c4	5	23	1	Y	32896	31	63
+t1.c5+t2.c4
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c5+t2.c5	5	23	1	Y	32896	31	63
+t1.c5+t2.c5
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c5+t2.c6	5	23	1	Y	32896	31	63
+t1.c5+t2.c6
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c5+t2.c7	5	23	1	Y	32896	31	63
+t1.c5+t2.c7
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c5+t2.c8	5	23	4	Y	32896	31	63
+t1.c5+t2.c8
+2.23
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c5+t2.c9	5	23	6	Y	32896	31	63
+t1.c5+t2.c9
+102031
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c5+t2.c10	5	23	8	Y	32896	31	63
+t1.c5+t2.c10
+20010102
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c5+t2.c11	5	23	14	Y	32896	31	63
+t1.c5+t2.c11
+20010101102031
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c5+t2.c12	5	23	1	Y	32896	31	63
+t1.c5+t2.c12
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c6+t2.c0	5	23	1	Y	32896	31	63
+t1.c6+t2.c0
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c6+t2.c1	5	23	1	Y	32896	31	63
+t1.c6+t2.c1
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c6+t2.c2	5	23	1	Y	32896	31	63
+t1.c6+t2.c2
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c6+t2.c3	5	23	1	Y	32896	31	63
+t1.c6+t2.c3
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c6+t2.c4	5	23	1	Y	32896	31	63
+t1.c6+t2.c4
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c6+t2.c5	5	23	1	Y	32896	31	63
+t1.c6+t2.c5
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c6+t2.c6	8	12	1	Y	32896	0	63
+t1.c6+t2.c6
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c6+t2.c7	5	23	1	Y	32896	31	63
+t1.c6+t2.c7
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c6+t2.c8	246	15	4	Y	32896	2	63
+t1.c6+t2.c8
+2.23
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c6+t2.c9	8	12	6	Y	32896	0	63
+t1.c6+t2.c9
+102031
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c6+t2.c10	8	12	8	Y	32896	0	63
+t1.c6+t2.c10
+20010102
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c6+t2.c11	8	16	14	Y	32896	0	63
+t1.c6+t2.c11
+20010101102031
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c6+t2.c12	8	12	1	Y	32896	0	63
+t1.c6+t2.c12
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c7+t2.c0	5	23	1	Y	32896	31	63
+t1.c7+t2.c0
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c7+t2.c1	5	23	1	Y	32896	31	63
+t1.c7+t2.c1
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c7+t2.c2	5	23	1	Y	32896	31	63
+t1.c7+t2.c2
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c7+t2.c3	5	23	1	Y	32896	31	63
+t1.c7+t2.c3
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c7+t2.c4	5	23	1	Y	32896	31	63
+t1.c7+t2.c4
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c7+t2.c5	5	23	1	Y	32896	31	63
+t1.c7+t2.c5
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c7+t2.c6	8	12	1	Y	32896	0	63
+t1.c7+t2.c6
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c7+t2.c7	5	23	1	Y	32896	31	63
+t1.c7+t2.c7
+2
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c7+t2.c8	246	13	4	Y	32896	2	63
+t1.c7+t2.c8
+2.23
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c7+t2.c9	3	9	6	Y	32896	0	63
+t1.c7+t2.c9
+102031
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c7+t2.c10	8	10	8	Y	32896	0	63
+t1.c7+t2.c10
+20010102
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c7+t2.c11	8	16	14	Y	32896	0	63
+t1.c7+t2.c11
+20010101102031
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					t1.c7+t2.c12	3	3	1	Y	32896	0	63
+t1.c7+t2.c12
+2
+DROP PROCEDURE p1;
+DROP PROCEDURE p2;
+DROP TABLE t1, t1c, t2;
+#
+# End of 10.5 tests
+#
diff --git a/mysql-test/suite/json/t/rpl_json_char.test b/mysql-test/suite/json/t/rpl_json_char.test
new file mode 100644
index 00000000000..51ad345a7ab
--- /dev/null
+++ b/mysql-test/suite/json/t/rpl_json_char.test
@@ -0,0 +1,27 @@
+--source include/master-slave.inc
+
+--echo #
+--echo # Start of 10.5 tests
+--echo #
+
+--echo #
+--echo # MDEV-27018 IF and COALESCE lose "json" property
+--echo #
+
+CREATE TABLE t1 (a CHAR(100) CHECK(JSON_VALID(a)));
+
+--sync_slave_with_master
+
+--connection master
+INSERT INTO t1 VALUES (JSON_OBJECT('a','b'));
+--sync_slave_with_master
+SELECT * FROM t1 ORDER BY a;
+
+--connection master
+DROP TABLE t1;
+
+--echo #
+--echo # End of 10.5 tests
+--echo #
+
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/json/t/rpl_json_longtext.test b/mysql-test/suite/json/t/rpl_json_longtext.test
new file mode 100644
index 00000000000..0155834458c
--- /dev/null
+++ b/mysql-test/suite/json/t/rpl_json_longtext.test
@@ -0,0 +1,27 @@
+--source include/master-slave.inc
+
+--echo #
+--echo # Start of 10.5 tests
+--echo #
+
+--echo #
+--echo # MDEV-27018 IF and COALESCE lose "json" property
+--echo #
+
+CREATE TABLE t1 (a LONGTEXT CHECK(JSON_VALID(a)));
+
+--sync_slave_with_master
+
+--connection master
+INSERT INTO t1 VALUES (JSON_OBJECT('a','b'));
+--sync_slave_with_master
+SELECT * FROM t1 ORDER BY a;
+
+--connection master
+DROP TABLE t1;
+
+--echo #
+--echo # End of 10.5 tests
+--echo #
+
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/json/t/rpl_json_mediumtext.test b/mysql-test/suite/json/t/rpl_json_mediumtext.test
new file mode 100644
index 00000000000..f4a52a19aa1
--- /dev/null
+++ b/mysql-test/suite/json/t/rpl_json_mediumtext.test
@@ -0,0 +1,27 @@
+--source include/master-slave.inc
+
+--echo #
+--echo # Start of 10.5 tests
+--echo #
+
+--echo #
+--echo # MDEV-27018 IF and COALESCE lose "json" property
+--echo #
+
+CREATE TABLE t1 (a MEDIUMTEXT CHECK(JSON_VALID(a)));
+
+--sync_slave_with_master
+
+--connection master
+INSERT INTO t1 VALUES (JSON_OBJECT('a','b'));
+--sync_slave_with_master
+SELECT * FROM t1 ORDER BY a;
+
+--connection master
+DROP TABLE t1;
+
+--echo #
+--echo # End of 10.5 tests
+--echo #
+
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/json/t/rpl_json_text.test b/mysql-test/suite/json/t/rpl_json_text.test
new file mode 100644
index 00000000000..7c7def768e8
--- /dev/null
+++ b/mysql-test/suite/json/t/rpl_json_text.test
@@ -0,0 +1,27 @@
+--source include/master-slave.inc
+
+--echo #
+--echo # Start of 10.5 tests
+--echo #
+
+--echo #
+--echo # MDEV-27018 IF and COALESCE lose "json" property
+--echo #
+
+CREATE TABLE t1 (a TEXT CHECK(JSON_VALID(a)));
+
+--sync_slave_with_master
+
+--connection master
+INSERT INTO t1 VALUES (JSON_OBJECT('a','b'));
+--sync_slave_with_master
+SELECT * FROM t1 ORDER BY a;
+
+--connection master
+DROP TABLE t1;
+
+--echo #
+--echo # End of 10.5 tests
+--echo #
+
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/json/t/rpl_json_tinytext.test b/mysql-test/suite/json/t/rpl_json_tinytext.test
new file mode 100644
index 00000000000..99a7c8c85b6
--- /dev/null
+++ b/mysql-test/suite/json/t/rpl_json_tinytext.test
@@ -0,0 +1,27 @@
+--source include/master-slave.inc
+
+--echo #
+--echo # Start of 10.5 tests
+--echo #
+
+--echo #
+--echo # MDEV-27018 IF and COALESCE lose "json" property
+--echo #
+
+CREATE TABLE t1 (a TINYTEXT CHECK(JSON_VALID(a)));
+
+--sync_slave_with_master
+
+--connection master
+INSERT INTO t1 VALUES (JSON_OBJECT('a','b'));
+--sync_slave_with_master
+SELECT * FROM t1 ORDER BY a;
+
+--connection master
+DROP TABLE t1;
+
+--echo #
+--echo # End of 10.5 tests
+--echo #
+
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/json/t/rpl_json_varchar.test b/mysql-test/suite/json/t/rpl_json_varchar.test
new file mode 100644
index 00000000000..9464f670919
--- /dev/null
+++ b/mysql-test/suite/json/t/rpl_json_varchar.test
@@ -0,0 +1,27 @@
+--source include/master-slave.inc
+
+--echo #
+--echo # Start of 10.5 tests
+--echo #
+
+--echo #
+--echo # MDEV-27018 IF and COALESCE lose "json" property
+--echo #
+
+CREATE TABLE t1 (a VARCHAR(100) CHECK(JSON_VALID(a)));
+
+--sync_slave_with_master
+
+--connection master
+INSERT INTO t1 VALUES (JSON_OBJECT('a','b'));
+--sync_slave_with_master
+SELECT * FROM t1 ORDER BY a;
+
+--connection master
+DROP TABLE t1;
+
+--echo #
+--echo # End of 10.5 tests
+--echo #
+
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/json/t/type_json.test b/mysql-test/suite/json/t/type_json.test
new file mode 100644
index 00000000000..f84bef780c3
--- /dev/null
+++ b/mysql-test/suite/json/t/type_json.test
@@ -0,0 +1,143 @@
+--echo #
+--echo # Start of 10.5 tests
+--echo #
+
+
+--echo #
+--echo # MDEV-27361 Hybrid functions with JSON arguments do not send format metadata
+--echo #
+
+# Mix all columns in the given table tbl to each other and calculate expr.
+
+DELIMITER $$;
+CREATE PROCEDURE p1(tbl TEXT, expr TEXT)
+BEGIN
+  DECLARE t1cols INT DEFAULT (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
+                              WHERE TABLE_NAME=tbl AND TABLE_SCHEMA='test');
+  FOR a IN 0..(t1cols-1) DO
+    FOR b IN 0..(t1cols-1) DO
+    BEGIN
+      DECLARE query TEXT DEFAULT CONCAT('SELECT ', expr, ' FROM ', tbl);
+      SET query= REPLACE(query, 'olt1', a);
+      SET query= REPLACE(query, 'olt2', b);
+      EXECUTE IMMEDIATE query;
+    END;
+    END FOR;
+  END FOR;
+END;
+$$
+DELIMITER ;$$
+
+
+# Mix all columns in table t1 to all columns in table t2 and calculate expr
+
+DELIMITER $$;
+CREATE PROCEDURE p2(expr TEXT)
+BEGIN
+  DECLARE t1cols INT DEFAULT (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
+                              WHERE TABLE_NAME='t1' AND TABLE_SCHEMA='test');
+  DECLARE t2cols INT DEFAULT (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
+                              WHERE TABLE_NAME='t2' AND TABLE_SCHEMA='test');
+  FOR a IN 0..(t1cols-1) DO
+    FOR b IN 0..(t2cols-1) DO
+    BEGIN
+      DECLARE query TEXT DEFAULT CONCAT('SELECT ', expr, ' FROM t1, t2');
+      SET query= REPLACE(query, 'olt1', a);
+      SET query= REPLACE(query, 'olt2', b);
+      EXECUTE IMMEDIATE query;
+    END;
+    END FOR;
+  END FOR;
+END;
+$$
+DELIMITER ;$$
+
+
+
+CREATE TABLE t1
+(
+  c0 CHAR(30)    DEFAULT '1'  CHECK(JSON_VALID(c0)),
+  c1 VARCHAR(30) DEFAULT '1'  CHECK(JSON_VALID(c1)),
+  c2 TINYTEXT    DEFAULT '1'  CHECK(JSON_VALID(c2)),
+  c3 TEXT        DEFAULT '1'  CHECK(JSON_VALID(c3)),
+  c4 MEDIUMTEXT  DEFAULT '1'  CHECK(JSON_VALID(c4)),
+  c5 LONGTEXT    DEFAULT '1'  CHECK(JSON_VALID(c5)),
+# The below data types do not have any special JSON properties.
+# Just checking CHECK(JSON_VALID()) does not give any unexpected surprises.
+  c6 INT         DEFAULT '1'  CHECK(JSON_VALID(c6)),
+  c7 ENUM('1')   DEFAULT '1'  CHECK(JSON_VALID(c7))
+);
+INSERT INTO t1 VALUES ();
+
+
+CREATE TABLE t1c
+(
+  c0 CHAR(30)               DEFAULT '1'  CHECK(JSON_VALID(c0)),
+  c1 VARCHAR(30) COMPRESSED DEFAULT '1'  CHECK(JSON_VALID(c1)),
+  c2 TINYTEXT    COMPRESSED DEFAULT '1'  CHECK(JSON_VALID(c2)),
+  c3 TEXT        COMPRESSED DEFAULT '1'  CHECK(JSON_VALID(c3)),
+  c4 MEDIUMTEXT  COMPRESSED DEFAULT '1'  CHECK(JSON_VALID(c4)),
+  c5 LONGTEXT    COMPRESSED DEFAULT '1'  CHECK(JSON_VALID(c5)),
+# The below data types do not have any special JSON properties.
+# Just checking CHECK(JSON_VALID()) does not give any unexpected surprises.
+  c6 INT                    DEFAULT '1'  CHECK(JSON_VALID(c6)),
+  c7 ENUM('1')              DEFAULT '1'  CHECK(JSON_VALID(c7))
+);
+INSERT INTO t1c VALUES ();
+
+
+
+CREATE TABLE t2
+(
+  c0 CHAR(30) DEFAULT '1',
+  c1 VARCHAR(30) DEFAULT '1',
+  c2 TINYTEXT DEFAULT '1',
+  c3 TEXT DEFAULT '1',
+  c4 MEDIUMTEXT DEFAULT '1',
+  c5 LONGTEXT DEFAULT '1',
+  c6 INT DEFAULT 1,
+  c7 DOUBLE DEFAULT 1,
+  c8 DECIMAL(10,2) DEFAULT 1.23,
+  c9 TIME DEFAULT '10:20:30',
+  c10 DATE DEFAULT '2001-01-01',
+  c11 DATETIME DEFAULT '2001-01-01 10:20:30',
+  c12 ENUM('1','2') DEFAULT '1'
+);
+INSERT INTO t2 VALUES ();
+
+
+--disable_ps_protocol
+--enable_metadata
+CALL p1('t1', 'COALESCE(colt1, colt2)');
+CALL p1('t1', 'LEAST(colt1, colt2)');
+CALL p1('t1', 'colt1+colt2');
+--disable_metadata
+--disable_ps_protocol
+
+
+--disable_ps_protocol
+--enable_metadata
+CALL p1('t1c', 'COALESCE(colt1, colt2)');
+CALL p1('t1c', 'LEAST(colt1, colt2)');
+CALL p1('t1c', 'colt1+colt2');
+--disable_metadata
+--disable_ps_protocol
+
+
+--disable_ps_protocol
+--enable_metadata
+CALL p2('COALESCE(t1.colt1, t2.colt2)');
+CALL p2('LEAST(t1.colt1, t2.colt2)');
+CALL p2('t1.colt1+t2.colt2');
+--disable_metadata
+--disable_ps_protocol
+
+
+DROP PROCEDURE p1;
+DROP PROCEDURE p2;
+
+DROP TABLE t1, t1c, t2;
+
+--echo #
+--echo # End of 10.5 tests
+--echo #
diff --git a/mysql-test/suite/maria/fulltext2.result b/mysql-test/suite/maria/fulltext2.result
index 1e4e6636ef6..6cffc5cf404 100644
--- a/mysql-test/suite/maria/fulltext2.result
+++ b/mysql-test/suite/maria/fulltext2.result
@@ -84,3 +84,10 @@ select count(*) from t1 where match a against ('aaayyy' in boolean mode);
 count(*)
 0
 drop table t1;
+set names utf8mb4;
+create table t1 (a int, b text, fulltext (b)) charset=utf8mb4 collate=utf8mb4_unicode_ci engine=aria;
+insert t1 values (1000, 'C͓̙̯͔̩ͅͅi̩̘̜̲a̯̲̬̳̜̖̤o͕͓̜͓̺̖̗,̠̬͚ ̺T͇̲h͈̱e ̬̜D̖o̦̖͔̗͖̩̘c̣̼t�͉̫̮̗o͉̫̭r̙͎̗.͓̪̥');
+select a from t1 where match(b) against ('ciao' in boolean mode);
+a
+1000
+drop table t1;
diff --git a/mysql-test/suite/maria/fulltext2.test b/mysql-test/suite/maria/fulltext2.test
index 1fbece4fe95..7ebdff7bd53 100644
--- a/mysql-test/suite/maria/fulltext2.test
+++ b/mysql-test/suite/maria/fulltext2.test
@@ -75,3 +75,12 @@ select count(*) from t1 where match a against ('aaaxxx' in boolean mode);
 select count(*) from t1 where match a against ('aaayyy' in boolean mode);
 
 drop table t1;
+
+#
+# MDEV-11241 Certain combining marks cause MariaDB to crash when doing Full-Text searches
+#
+set names utf8mb4;
+create table t1 (a int, b text, fulltext (b)) charset=utf8mb4 collate=utf8mb4_unicode_ci engine=aria;
+insert t1 values (1000, 'C͓̙̯͔̩ͅͅi̩̘̜̲a̯̲̬̳̜̖̤o͕͓̜͓̺̖̗,̠̬͚ ̺T͇̲h͈̱e ̬̜D̖o̦̖͔̗͖̩̘c̣̼t�͉̫̮̗o͉̫̭r̙͎̗.͓̪̥');
+select a from t1 where match(b) against ('ciao' in boolean mode);
+drop table t1;
diff --git a/mysql-test/suite/mariabackup/create_with_data_directory_during_backup.test b/mysql-test/suite/mariabackup/create_with_data_directory_during_backup.test
index d0cb83d069f..f01028b6494 100644
--- a/mysql-test/suite/mariabackup/create_with_data_directory_during_backup.test
+++ b/mysql-test/suite/mariabackup/create_with_data_directory_during_backup.test
@@ -1,4 +1,5 @@
 --source include/have_debug.inc
+--source include/have_symlink.inc
 let $table_data_dir=$MYSQLTEST_VARDIR/tmp/ddir;
 let $targetdir=$MYSQLTEST_VARDIR/tmp/backup;
 mkdir $table_data_dir;
diff --git a/mysql-test/suite/mariabackup/data_directory.test b/mysql-test/suite/mariabackup/data_directory.test
index 50789a34c78..a89b7bdccc4 100644
--- a/mysql-test/suite/mariabackup/data_directory.test
+++ b/mysql-test/suite/mariabackup/data_directory.test
@@ -1,3 +1,4 @@
+--source include/have_symlink.inc
 let $table_data_dir=$MYSQLTEST_VARDIR/ddir;
 mkdir $table_data_dir;
 --replace_result $table_data_dir table_data_dir
diff --git a/mysql-test/suite/mariabackup/partition_datadir.test b/mysql-test/suite/mariabackup/partition_datadir.test
index c525d34a02c..36520d331bf 100644
--- a/mysql-test/suite/mariabackup/partition_datadir.test
+++ b/mysql-test/suite/mariabackup/partition_datadir.test
@@ -1,4 +1,5 @@
 --source include/have_partition.inc
+--source include/have_symlink.inc
 let $targetdir=$MYSQLTEST_VARDIR/backup;
 mkdir $targetdir;
 mkdir $MYSQLTEST_VARDIR/partitdata;
diff --git a/mysql-test/suite/parts/t/alter_data_directory_innodb.test b/mysql-test/suite/parts/t/alter_data_directory_innodb.test
index ac15e9bec6c..def04e14173 100644
--- a/mysql-test/suite/parts/t/alter_data_directory_innodb.test
+++ b/mysql-test/suite/parts/t/alter_data_directory_innodb.test
@@ -1,5 +1,6 @@
 --source include/have_innodb.inc
 --source include/have_partition.inc
+--source include/have_symlink.inc
 
 --echo #
 --echo # MDEV-15953 Alter InnoDB Partitioned Table Moves Files (which were originally not in the datadir) to the datadir
diff --git a/mysql-test/suite/parts/t/reorganize_partition_innodb.test b/mysql-test/suite/parts/t/reorganize_partition_innodb.test
index db73650c54b..77109c38c96 100644
--- a/mysql-test/suite/parts/t/reorganize_partition_innodb.test
+++ b/mysql-test/suite/parts/t/reorganize_partition_innodb.test
@@ -1,5 +1,6 @@
 --source include/have_innodb.inc
 --source include/have_partition.inc
+--source include/have_symlink.inc
 
 --echo #
 --echo # MDEV-15953 Alter InnoDB Partitioned Table Moves Files (which were originally not in the datadir) to the datadir
diff --git a/mysql-test/suite/perfschema/r/digest_view.result b/mysql-test/suite/perfschema/r/digest_view.result
index 43a8bdb1577..0c9d289e0e3 100644
--- a/mysql-test/suite/perfschema/r/digest_view.result
+++ b/mysql-test/suite/perfschema/r/digest_view.result
@@ -142,3 +142,125 @@ test	SHOW WARNINGS 	10
 test	TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 	1
 DROP VIEW test.v1;
 DROP TABLE test.t1;
+CREATE TABLE test.v1 (a int, b int);
+INSERT INTO test.v1 VALUES (1, 100), (2, 200), (3, 300);
+CREATE TABLE test.t1 (a int, b int);
+INSERT INTO test.t1 VALUES (1, 100), (2, 200), (3, 300);
+TRUNCATE TABLE performance_schema.events_statements_summary_by_digest;
+EXPLAIN SELECT * from test.v1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	v1	ALL	NULL	NULL	NULL	NULL	3	
+EXPLAIN SELECT * from test.v1 where a = 1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	v1	ALL	NULL	NULL	NULL	NULL	3	Using where
+EXPLAIN SELECT * from test.v1 where b > 100;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	v1	ALL	NULL	NULL	NULL	NULL	3	Using where
+EXPLAIN SELECT a, b from test.v1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	v1	ALL	NULL	NULL	NULL	NULL	3	
+EXPLAIN SELECT b, a from test.v1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	v1	ALL	NULL	NULL	NULL	NULL	3	
+SELECT * from test.v1;
+a	b
+1	100
+2	200
+3	300
+SELECT * from test.v1 where a = 1;
+a	b
+1	100
+SELECT * from test.v1 where b > 100;
+a	b
+2	200
+3	300
+SELECT a, b from test.v1;
+a	b
+1	100
+2	200
+3	300
+SELECT b, a from test.v1;
+b	a
+100	1
+200	2
+300	3
+#
+# DIGESTS SEEN ON TABLE
+#
+SELECT SCHEMA_NAME, DIGEST, DIGEST_TEXT, COUNT_STAR
+FROM performance_schema.events_statements_summary_by_digest
+ORDER BY DIGEST_TEXT;
+SCHEMA_NAME	DIGEST	DIGEST_TEXT	COUNT_STAR
+test	883995051deb8c246585802cfd321a22	EXPLAIN SELECT * FROM `test` . `v1` 	1
+test	8e06c8f25266966ced26be5907ceb58f	EXPLAIN SELECT * FROM `test` . `v1` WHERE `a` = ? 	1
+test	873c761bb3401ed8bdfe90d303202341	EXPLAIN SELECT * FROM `test` . `v1` WHERE `b` > ? 	1
+test	58454d2c3bad0c990e97757f8affdff1	EXPLAIN SELECT `a` , `b` FROM `test` . `v1` 	1
+test	5759533b433f70d97df585e57aaeba49	EXPLAIN SELECT `b` , `a` FROM `test` . `v1` 	1
+test	d9abdc3309da734b3be65ee473d046ee	SELECT * FROM `test` . `v1` 	1
+test	93fa57d3b0913e9b91896cdc73e2801d	SELECT * FROM `test` . `v1` WHERE `a` = ? 	1
+test	98852870b265c7ff0cbfa3078163fc4d	SELECT * FROM `test` . `v1` WHERE `b` > ? 	1
+test	ef23ecdedb5da8f4e3a768ef4844f879	SELECT `a` , `b` FROM `test` . `v1` 	1
+test	4fb5c76cec0c3c0e9bae106499c582f9	SELECT `b` , `a` FROM `test` . `v1` 	1
+test	42a222de27801114b6d16e24ff22bc16	TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 	1
+DROP TABLE test.v1;
+CREATE VIEW test.v1 AS SELECT * FROM test.t1;
+EXPLAIN SELECT * from test.v1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	
+EXPLAIN SELECT * from test.v1 where a = 1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	Using where
+EXPLAIN SELECT * from test.v1 where b > 100;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	Using where
+EXPLAIN SELECT a, b from test.v1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	
+EXPLAIN SELECT b, a from test.v1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	
+SELECT * from test.v1;
+a	b
+1	100
+2	200
+3	300
+SELECT * from test.v1 where a = 1;
+a	b
+1	100
+SELECT * from test.v1 where b > 100;
+a	b
+2	200
+3	300
+SELECT a, b from test.v1;
+a	b
+1	100
+2	200
+3	300
+SELECT b, a from test.v1;
+b	a
+100	1
+200	2
+300	3
+#
+# DIGESTS SEEN ON VIEW
+#
+SELECT SCHEMA_NAME, DIGEST, DIGEST_TEXT, COUNT_STAR
+FROM performance_schema.events_statements_summary_by_digest
+ORDER BY DIGEST_TEXT;
+SCHEMA_NAME	DIGEST	DIGEST_TEXT	COUNT_STAR
+test	bc34bb436bf5034c4263b1ad23d90292	CREATE VIEW `test` . `v1` AS SELECT * FROM `test` . `t1` 	1
+test	869235446268944d0168011efd19fc9e	DROP TABLE `test` . `v1` 	1
+test	883995051deb8c246585802cfd321a22	EXPLAIN SELECT * FROM `test` . `v1` 	2
+test	8e06c8f25266966ced26be5907ceb58f	EXPLAIN SELECT * FROM `test` . `v1` WHERE `a` = ? 	2
+test	873c761bb3401ed8bdfe90d303202341	EXPLAIN SELECT * FROM `test` . `v1` WHERE `b` > ? 	2
+test	58454d2c3bad0c990e97757f8affdff1	EXPLAIN SELECT `a` , `b` FROM `test` . `v1` 	2
+test	5759533b433f70d97df585e57aaeba49	EXPLAIN SELECT `b` , `a` FROM `test` . `v1` 	2
+test	d9abdc3309da734b3be65ee473d046ee	SELECT * FROM `test` . `v1` 	2
+test	93fa57d3b0913e9b91896cdc73e2801d	SELECT * FROM `test` . `v1` WHERE `a` = ? 	2
+test	98852870b265c7ff0cbfa3078163fc4d	SELECT * FROM `test` . `v1` WHERE `b` > ? 	2
+test	f06abe99801692e1a4acf36648376626	SELECT SCHEMA_NAME , `DIGEST` , `DIGEST_TEXT` , `COUNT_STAR` FROM `performance_schema` . `events_statements_summary_by_digest` ORDER BY `DIGEST_TEXT` 	1
+test	ef23ecdedb5da8f4e3a768ef4844f879	SELECT `a` , `b` FROM `test` . `v1` 	2
+test	4fb5c76cec0c3c0e9bae106499c582f9	SELECT `b` , `a` FROM `test` . `v1` 	2
+test	42a222de27801114b6d16e24ff22bc16	TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 	1
+DROP VIEW test.v1;
+DROP TABLE test.t1;
diff --git a/mysql-test/suite/perfschema/r/show_sanity.result b/mysql-test/suite/perfschema/r/show_sanity.result
index 71bc92a2c2f..dc326dd7f64 100644
--- a/mysql-test/suite/perfschema/r/show_sanity.result
+++ b/mysql-test/suite/perfschema/r/show_sanity.result
@@ -414,6 +414,8 @@ SHOW_MODE	SOURCE	VARIABLE_NAME
 5.6	I_S.SESSION_VARIABLES	INNODB_STATS_INCLUDE_DELETE_MARKED
 5.6	I_S.SESSION_VARIABLES	KEYRING_OPERATIONS
 5.6	I_S.SESSION_VARIABLES	LOG_STATEMENTS_UNSAFE_FOR_BINLOG
+5.6	I_S.SESSION_VARIABLES	REPLICATION_OPTIMIZE_FOR_STATIC_PLUGIN_CONFIG
+5.6	I_S.SESSION_VARIABLES	REPLICATION_SENDER_OBSERVE_COMMIT_ONLY
 5.6	I_S.SESSION_VARIABLES	TLS_VERSION
 
 ================================================================================
@@ -442,6 +444,8 @@ SHOW_MODE	SOURCE	VARIABLE_NAME
 5.6	I_S.SESSION_VARIABLES	INNODB_STATS_INCLUDE_DELETE_MARKED
 5.6	I_S.SESSION_VARIABLES	KEYRING_OPERATIONS
 5.6	I_S.SESSION_VARIABLES	LOG_STATEMENTS_UNSAFE_FOR_BINLOG
+5.6	I_S.SESSION_VARIABLES	REPLICATION_OPTIMIZE_FOR_STATIC_PLUGIN_CONFIG
+5.6	I_S.SESSION_VARIABLES	REPLICATION_SENDER_OBSERVE_COMMIT_ONLY
 5.6	I_S.SESSION_VARIABLES	TLS_VERSION
 
 ================================================================================
diff --git a/mysql-test/suite/perfschema/t/digest_view.test b/mysql-test/suite/perfschema/t/digest_view.test
index f718d7530e6..dd862aebd52 100644
--- a/mysql-test/suite/perfschema/t/digest_view.test
+++ b/mysql-test/suite/perfschema/t/digest_view.test
@@ -75,3 +75,79 @@ SELECT SCHEMA_NAME, DIGEST_TEXT, COUNT_STAR
 DROP VIEW test.v1;
 DROP TABLE test.t1;
 
+# ----------------------------------------------------
+# Tests for the performance schema statement Digests.
+# ----------------------------------------------------
+
+# Test case to show behavior of statements digest when
+# using a view
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+--source include/no_protocol.inc
+
+CREATE TABLE test.v1 (a int, b int);
+INSERT INTO test.v1 VALUES (1, 100), (2, 200), (3, 300);
+
+CREATE TABLE test.t1 (a int, b int);
+INSERT INTO test.t1 VALUES (1, 100), (2, 200), (3, 300);
+
+
+TRUNCATE TABLE performance_schema.events_statements_summary_by_digest;
+
+#
+# test.v1 is a table.
+# Every query here is different, and should have a different digest.
+#
+
+EXPLAIN SELECT * from test.v1;
+EXPLAIN SELECT * from test.v1 where a = 1;
+EXPLAIN SELECT * from test.v1 where b > 100;
+EXPLAIN SELECT a, b from test.v1;
+EXPLAIN SELECT b, a from test.v1;
+
+SELECT * from test.v1;
+SELECT * from test.v1 where a = 1;
+SELECT * from test.v1 where b > 100;
+SELECT a, b from test.v1;
+SELECT b, a from test.v1;
+
+--echo #
+--echo # DIGESTS SEEN ON TABLE
+--echo #
+
+SELECT SCHEMA_NAME, DIGEST, DIGEST_TEXT, COUNT_STAR
+  FROM performance_schema.events_statements_summary_by_digest
+  ORDER BY DIGEST_TEXT;
+
+DROP TABLE test.v1;
+CREATE VIEW test.v1 AS SELECT * FROM test.t1;
+
+#
+# test.v1 is now a view.
+# the query digests should be unchanged.
+#
+
+EXPLAIN SELECT * from test.v1;
+EXPLAIN SELECT * from test.v1 where a = 1;
+EXPLAIN SELECT * from test.v1 where b > 100;
+EXPLAIN SELECT a, b from test.v1;
+EXPLAIN SELECT b, a from test.v1;
+
+SELECT * from test.v1;
+SELECT * from test.v1 where a = 1;
+SELECT * from test.v1 where b > 100;
+SELECT a, b from test.v1;
+SELECT b, a from test.v1;
+
+--echo #
+--echo # DIGESTS SEEN ON VIEW
+--echo #
+
+SELECT SCHEMA_NAME, DIGEST, DIGEST_TEXT, COUNT_STAR
+  FROM performance_schema.events_statements_summary_by_digest
+  ORDER BY DIGEST_TEXT;
+
+DROP VIEW test.v1;
+DROP TABLE test.t1;
+
diff --git a/mysql-test/suite/plugins/r/locales.result b/mysql-test/suite/plugins/r/locales.result
index 106bf22923c..2ea88493705 100644
--- a/mysql-test/suite/plugins/r/locales.result
+++ b/mysql-test/suite/plugins/r/locales.result
@@ -17,7 +17,7 @@ ID	NAME	DESCRIPTION	MAX_MONTH_NAME_LENGTH	MAX_DAY_NAME_LENGTH	DECIMAL_POINT	THOU
 14	cs_CZ	Czech - Czech Republic	8	7	,	 	czech
 15	da_DK	Danish - Denmark	9	7	,	.	danish
 16	de_AT	German - Austria	9	10	,		german
-17	es_ES	Spanish - Spain	10	9	,		spanish
+17	es_ES	Spanish - Spain	10	9	,	.	spanish
 18	et_EE	Estonian - Estonia	9	9	,	 	estonian
 19	eu_ES	Basque - Basque	9	10	,		english
 20	fi_FI	Finnish - Finland	9	11	,	 	english
@@ -82,24 +82,24 @@ ID	NAME	DESCRIPTION	MAX_MONTH_NAME_LENGTH	MAX_DAY_NAME_LENGTH	DECIMAL_POINT	THOU
 79	en_ZA	English - South Africa	9	9	.	,	english
 80	en_ZW	English - Zimbabwe	9	9	.	,	english
 81	es_AR	Spanish - Argentina	10	9	,	.	spanish
-82	es_BO	Spanish - Bolivia	10	9	,		spanish
-83	es_CL	Spanish - Chile	10	9	,		spanish
-84	es_CO	Spanish - Columbia	10	9	,		spanish
-85	es_CR	Spanish - Costa Rica	10	9	.		spanish
-86	es_DO	Spanish - Dominican Republic	10	9	.		spanish
-87	es_EC	Spanish - Ecuador	10	9	,		spanish
-88	es_GT	Spanish - Guatemala	10	9	.		spanish
-89	es_HN	Spanish - Honduras	10	9	.		spanish
-90	es_MX	Spanish - Mexico	10	9	.		spanish
-91	es_NI	Spanish - Nicaragua	10	9	.		spanish
-92	es_PA	Spanish - Panama	10	9	.		spanish
-93	es_PE	Spanish - Peru	10	9	.		spanish
-94	es_PR	Spanish - Puerto Rico	10	9	.		spanish
-95	es_PY	Spanish - Paraguay	10	9	,		spanish
-96	es_SV	Spanish - El Salvador	10	9	.		spanish
+82	es_BO	Spanish - Bolivia	10	9	,	.	spanish
+83	es_CL	Spanish - Chile	10	9	,	.	spanish
+84	es_CO	Spanish - Columbia	10	9	,	.	spanish
+85	es_CR	Spanish - Costa Rica	10	9	,	 	spanish
+86	es_DO	Spanish - Dominican Republic	10	9	.	,	spanish
+87	es_EC	Spanish - Ecuador	10	9	,	.	spanish
+88	es_GT	Spanish - Guatemala	10	9	.	,	spanish
+89	es_HN	Spanish - Honduras	10	9	.	,	spanish
+90	es_MX	Spanish - Mexico	10	9	.	,	spanish
+91	es_NI	Spanish - Nicaragua	10	9	.	,	spanish
+92	es_PA	Spanish - Panama	10	9	.	,	spanish
+93	es_PE	Spanish - Peru	10	9	.	,	spanish
+94	es_PR	Spanish - Puerto Rico	10	9	.	,	spanish
+95	es_PY	Spanish - Paraguay	10	9	,	.	spanish
+96	es_SV	Spanish - El Salvador	10	9	.	,	spanish
 97	es_US	Spanish - United States	10	9	.	,	spanish
-98	es_UY	Spanish - Uruguay	10	9	,		spanish
-99	es_VE	Spanish - Venezuela	10	9	,		spanish
+98	es_UY	Spanish - Uruguay	10	9	,	.	spanish
+99	es_VE	Spanish - Venezuela	10	9	,	.	spanish
 100	fr_BE	French - Belgium	9	8	,	.	french
 101	fr_CA	French - Canada	9	8	,	 	french
 102	fr_CH	French - Switzerland	9	8	,		french
diff --git a/mysql-test/suite/plugins/r/pam.result b/mysql-test/suite/plugins/r/pam.result
index 40075245d0c..b8588916169 100644
--- a/mysql-test/suite/plugins/r/pam.result
+++ b/mysql-test/suite/plugins/r/pam.result
@@ -40,6 +40,35 @@ test_pam@localhost	pam_test@%	test
 #
 Now, the magic number!
 PIN: 9212
+#
+# MDEV-26339 Account specifics to be handled before proxying
+#
+alter user pam_test account lock;
+alter user pam_test require subject 'foobar';
+alter user pam_test password expire;
+Now, the magic number!
+PIN: 9212
+select user(), current_user(), database();
+user()	current_user()	database()
+test_pam@localhost	pam_test@%	test
+alter user pam_test account unlock;
+alter user pam_test require none;
+alter user pam_test identified by '';
+show create user pam_test;
+CREATE USER for pam_test@%
+CREATE USER `pam_test`@`%`
+alter user test_pam account lock;
+Now, the magic number!
+PIN: 9212
+alter user test_pam account unlock;
+alter user test_pam require subject 'foobar';
+Now, the magic number!
+PIN: 9212
+alter user test_pam require none;
+alter user test_pam password expire;
+Now, the magic number!
+PIN: 9212
+select user(), current_user(), database();
 drop user test_pam;
 drop user pam_test;
 create user PAM_TEST identified via pam using 'mariadb_mtr';
@@ -62,4 +91,21 @@ select user(), current_user(), database();
 user()	current_user()	database()
 PAM_TEST@localhost	PAM_TEST@%	test
 drop user PAM_TEST;
+#
+# MDEV-27341 Use SET PASSWORD to change PAM service
+#
+create user pam_test identified via pam using 'mariadb_mtr';
+Challenge input first.
+Enter: *************************
+Now, the magic number!
+PIN: 9225
+select user(), current_user(), database();
+user()	current_user()	database()
+pam_test@localhost	pam_test@%	test
+set password='foo';
+ERROR HY000: SET PASSWORD is ignored for users authenticating via pam plugin
+show create user;
+CREATE USER for pam_test@%
+CREATE USER `pam_test`@`%` IDENTIFIED VIA pam USING 'mariadb_mtr'
+drop user pam_test;
 uninstall plugin pam;
diff --git a/mysql-test/suite/plugins/r/qc_info.result b/mysql-test/suite/plugins/r/qc_info.result
index 41073359e93..afab7671b5c 100644
--- a/mysql-test/suite/plugins/r/qc_info.result
+++ b/mysql-test/suite/plugins/r/qc_info.result
@@ -27,9 +27,9 @@ set time_zone=@new_time_zone,default_week_format=4,character_set_client='binary'
 select * from t1;
 set time_zone= @time_zone, default_week_format= @default_week_format, character_set_client= @character_set_client,character_set_results= @character_set_results, sql_mode= @sql_mode, div_precision_increment= @div_precision_increment, lc_time_names= @lc_time_names, autocommit= @autocommit, group_concat_max_len= @group_concat_max_len, max_sort_length= @max_sort_length;
 select * from information_schema.query_cache_info;
-STATEMENT_SCHEMA	STATEMENT_TEXT	RESULT_BLOCKS_COUNT	RESULT_BLOCKS_SIZE	RESULT_BLOCKS_SIZE_USED	LIMIT	MAX_SORT_LENGTH	GROUP_CONCAT_MAX_LENGTH	CHARACTER_SET_CLIENT	CHARACTER_SET_RESULT	COLLATION	TIMEZONE	DEFAULT_WEEK_FORMAT	DIV_PRECISION_INCREMENT	SQL_MODE	LC_TIME_NAMES	CLIENT_LONG_FLAG	CLIENT_PROTOCOL_41	PROTOCOL_TYPE	MORE_RESULTS_EXISTS	IN_TRANS	AUTOCOMMIT	PACKET_NUMBER	HITS
-test	select * from t1	1	512	#	-1	1011	513	binary	utf32	utf32_bin	Europe/Moscow	4	7	STRICT_ALL_TABLES	ar_SD	1	1	#	0	0	0	#	0
-test	select * from t1	1	512	#	-1	1024	1048576	latin1	latin1	latin1_swedish_ci	SYSTEM	0	4	STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	en_US	1	1	#	0	0	1	#	0
+STATEMENT_SCHEMA	STATEMENT_TEXT	RESULT_BLOCKS_COUNT	RESULT_BLOCKS_SIZE	RESULT_BLOCKS_SIZE_USED	LIMIT	MAX_SORT_LENGTH	GROUP_CONCAT_MAX_LENGTH	CHARACTER_SET_CLIENT	CHARACTER_SET_RESULT	COLLATION	TIMEZONE	DEFAULT_WEEK_FORMAT	DIV_PRECISION_INCREMENT	SQL_MODE	LC_TIME_NAMES	CLIENT_LONG_FLAG	CLIENT_PROTOCOL_41	CLIENT_EXTENDED_METADATA	PROTOCOL_TYPE	MORE_RESULTS_EXISTS	IN_TRANS	AUTOCOMMIT	PACKET_NUMBER	HITS
+test	select * from t1	1	512	#	-1	1011	513	binary	utf32	utf32_bin	Europe/Moscow	4	7	STRICT_ALL_TABLES	ar_SD	1	1	1	#	0	0	0	#	0
+test	select * from t1	1	512	#	-1	1024	1048576	latin1	latin1	latin1_swedish_ci	SYSTEM	0	4	STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	en_US	1	1	1	#	0	0	1	#	0
 reset query cache;
 select * from t1;
 a
@@ -49,7 +49,7 @@ select statement_schema, statement_text, result_blocks_count, result_blocks_size
 statement_schema	statement_text	result_blocks_count	result_blocks_size
 set global query_cache_size = 0;
 select * from information_schema.query_cache_info;
-STATEMENT_SCHEMA	STATEMENT_TEXT	RESULT_BLOCKS_COUNT	RESULT_BLOCKS_SIZE	RESULT_BLOCKS_SIZE_USED	LIMIT	MAX_SORT_LENGTH	GROUP_CONCAT_MAX_LENGTH	CHARACTER_SET_CLIENT	CHARACTER_SET_RESULT	COLLATION	TIMEZONE	DEFAULT_WEEK_FORMAT	DIV_PRECISION_INCREMENT	SQL_MODE	LC_TIME_NAMES	CLIENT_LONG_FLAG	CLIENT_PROTOCOL_41	PROTOCOL_TYPE	MORE_RESULTS_EXISTS	IN_TRANS	AUTOCOMMIT	PACKET_NUMBER	HITS
+STATEMENT_SCHEMA	STATEMENT_TEXT	RESULT_BLOCKS_COUNT	RESULT_BLOCKS_SIZE	RESULT_BLOCKS_SIZE_USED	LIMIT	MAX_SORT_LENGTH	GROUP_CONCAT_MAX_LENGTH	CHARACTER_SET_CLIENT	CHARACTER_SET_RESULT	COLLATION	TIMEZONE	DEFAULT_WEEK_FORMAT	DIV_PRECISION_INCREMENT	SQL_MODE	LC_TIME_NAMES	CLIENT_LONG_FLAG	CLIENT_PROTOCOL_41	CLIENT_EXTENDED_METADATA	PROTOCOL_TYPE	MORE_RESULTS_EXISTS	IN_TRANS	AUTOCOMMIT	PACKET_NUMBER	HITS
 set global query_cache_size= default;
 set global query_cache_type=default;
 show query_cache_info;
diff --git a/mysql-test/suite/plugins/r/qc_info_priv.result b/mysql-test/suite/plugins/r/qc_info_priv.result
index 78ea78a33b8..9aa15885563 100644
--- a/mysql-test/suite/plugins/r/qc_info_priv.result
+++ b/mysql-test/suite/plugins/r/qc_info_priv.result
@@ -27,9 +27,9 @@ set time_zone=@new_time_zone,default_week_format=4,character_set_client='binary'
 select * from t1;
 set time_zone= @time_zone, default_week_format= @default_week_format, character_set_client= @character_set_client,character_set_results= @character_set_results, sql_mode= @sql_mode, div_precision_increment= @div_precision_increment, lc_time_names= @lc_time_names, autocommit= @autocommit, group_concat_max_len= @group_concat_max_len, max_sort_length= @max_sort_length;
 select * from information_schema.query_cache_info;
-STATEMENT_SCHEMA	STATEMENT_TEXT	RESULT_BLOCKS_COUNT	RESULT_BLOCKS_SIZE	RESULT_BLOCKS_SIZE_USED	LIMIT	MAX_SORT_LENGTH	GROUP_CONCAT_MAX_LENGTH	CHARACTER_SET_CLIENT	CHARACTER_SET_RESULT	COLLATION	TIMEZONE	DEFAULT_WEEK_FORMAT	DIV_PRECISION_INCREMENT	SQL_MODE	LC_TIME_NAMES	CLIENT_LONG_FLAG	CLIENT_PROTOCOL_41	PROTOCOL_TYPE	MORE_RESULTS_EXISTS	IN_TRANS	AUTOCOMMIT	PACKET_NUMBER	HITS
-test	select * from t1	1	512	#	-1	1011	513	binary	utf32	utf32_bin	Europe/Moscow	4	7	STRICT_ALL_TABLES	ar_SD	1	1	#	0	0	0	#	0
-test	select * from t1	1	512	#	-1	1024	1048576	latin1	latin1	latin1_swedish_ci	SYSTEM	0	4	STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	en_US	1	1	#	0	0	1	#	0
+STATEMENT_SCHEMA	STATEMENT_TEXT	RESULT_BLOCKS_COUNT	RESULT_BLOCKS_SIZE	RESULT_BLOCKS_SIZE_USED	LIMIT	MAX_SORT_LENGTH	GROUP_CONCAT_MAX_LENGTH	CHARACTER_SET_CLIENT	CHARACTER_SET_RESULT	COLLATION	TIMEZONE	DEFAULT_WEEK_FORMAT	DIV_PRECISION_INCREMENT	SQL_MODE	LC_TIME_NAMES	CLIENT_LONG_FLAG	CLIENT_PROTOCOL_41	CLIENT_EXTENDED_METADATA	PROTOCOL_TYPE	MORE_RESULTS_EXISTS	IN_TRANS	AUTOCOMMIT	PACKET_NUMBER	HITS
+test	select * from t1	1	512	#	-1	1011	513	binary	utf32	utf32_bin	Europe/Moscow	4	7	STRICT_ALL_TABLES	ar_SD	1	1	1	#	0	0	0	#	0
+test	select * from t1	1	512	#	-1	1024	1048576	latin1	latin1	latin1_swedish_ci	SYSTEM	0	4	STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	en_US	1	1	1	#	0	0	1	#	0
 create user mysqltest;
 connect  conn1,localhost,mysqltest,,;
 connection conn1;
diff --git a/mysql-test/suite/plugins/t/pam.test b/mysql-test/suite/plugins/t/pam.test
index 2611f25ee63..dbe108d1efa 100644
--- a/mysql-test/suite/plugins/t/pam.test
+++ b/mysql-test/suite/plugins/t/pam.test
@@ -45,7 +45,6 @@ EOF
 --echo #
 --echo # athentication is successful
 --echo #
---error 0
 --exec $MYSQL_TEST -u test_pam -pgoodpassword < $MYSQLTEST_VARDIR/tmp/pam_good2.txt
 
 --echo #
@@ -54,6 +53,36 @@ EOF
 --error 1
 --exec $MYSQL_TEST -u test_pam -pbadpassword < $MYSQLTEST_VARDIR/tmp/pam_good2.txt
 
+--echo #
+--echo # MDEV-26339 Account specifics to be handled before proxying
+--echo #
+
+# one can connect if the proxy account is locked
+alter user pam_test account lock;
+alter user pam_test require subject 'foobar';
+alter user pam_test password expire;
+--error 0
+--exec $MYSQL_TEST -u test_pam -pgoodpassword < $MYSQLTEST_VARDIR/tmp/pam_good2.txt
+alter user pam_test account unlock;
+alter user pam_test require none;
+alter user pam_test identified by '';
+show create user pam_test;
+
+#one cannot connect if the proxied account is locked
+alter user test_pam account lock;
+--error 1
+--exec $MYSQL_TEST -u test_pam -pgoodpassword < $MYSQLTEST_VARDIR/tmp/pam_good2.txt
+alter user test_pam account unlock;
+
+alter user test_pam require subject 'foobar';
+--error 1
+--exec $MYSQL_TEST -u test_pam -pgoodpassword < $MYSQLTEST_VARDIR/tmp/pam_good2.txt
+alter user test_pam require none;
+
+alter user test_pam password expire;
+--error 1
+--exec $MYSQL_TEST -u test_pam -pgoodpassword < $MYSQLTEST_VARDIR/tmp/pam_good2.txt
+
 drop user test_pam;
 drop user pam_test;
 create user PAM_TEST identified via pam using 'mariadb_mtr';
@@ -76,6 +105,22 @@ set global pam_winbind_workaround=1;
 --remove_file $MYSQLTEST_VARDIR/tmp/pam_ugly.txt
 drop user PAM_TEST;
 
+--echo #
+--echo # MDEV-27341 Use SET PASSWORD to change PAM service
+--echo #
+create user pam_test identified via pam using 'mariadb_mtr';
+--write_file $MYSQLTEST_VARDIR/tmp/setpwd.txt
+not very secret challenge
+9225
+select user(), current_user(), database();
+error ER_SET_PASSWORD_AUTH_PLUGIN;
+set password='foo';
+show create user;
+EOF
+--exec $MYSQL_TEST -u pam_test < $MYSQLTEST_VARDIR/tmp/setpwd.txt
+--remove_file $MYSQLTEST_VARDIR/tmp/setpwd.txt
+drop user pam_test;
+
 let $count_sessions= 1;
 --source include/wait_until_count_sessions.inc
 uninstall plugin pam;
diff --git a/mysql-test/suite/plugins/t/qc_info_init.inc b/mysql-test/suite/plugins/t/qc_info_init.inc
index c3f700f08d0..ad93e5c1547 100644
--- a/mysql-test/suite/plugins/t/qc_info_init.inc
+++ b/mysql-test/suite/plugins/t/qc_info_init.inc
@@ -30,5 +30,5 @@ select * from t1;
 set time_zone= @time_zone, default_week_format= @default_week_format, character_set_client= @character_set_client,character_set_results= @character_set_results, sql_mode= @sql_mode, div_precision_increment= @div_precision_increment, lc_time_names= @lc_time_names, autocommit= @autocommit, group_concat_max_len= @group_concat_max_len, max_sort_length= @max_sort_length;
 
 --sorted_result
---replace_column 5 # 19 # 23 #
+--replace_column 5 # 20 # 24 #
 select * from information_schema.query_cache_info;
diff --git a/mysql-test/suite/rpl/r/rpl_empty_string_is_null.result b/mysql-test/suite/rpl/r/rpl_empty_string_is_null.result
new file mode 100644
index 00000000000..15b75bccb5d
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_empty_string_is_null.result
@@ -0,0 +1,16 @@
+include/master-slave.inc
+[connection master]
+#
+# MDEV-18918 SQL mode EMPTY_STRING_IS_NULL breaks RBR upon CREATE TABLE .. SELECT
+#
+SET SQL_MODE= 'EMPTY_STRING_IS_NULL';
+CREATE TABLE t1 AS SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE 1 = 0;
+connection slave;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `TABLE_NAME` varchar(64) CHARACTER SET utf8mb3 NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+connection master;
+DROP TABLE t1;
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_seconds_behind_master_spike.result b/mysql-test/suite/rpl/r/rpl_seconds_behind_master_spike.result
new file mode 100644
index 00000000000..be18f95c2c0
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_seconds_behind_master_spike.result
@@ -0,0 +1,40 @@
+include/master-slave.inc
+[connection master]
+connection slave;
+include/stop_slave.inc
+SET @save_dbug= @@GLOBAL.debug_dbug;
+SET @@global.debug_dbug="+d,pause_sql_thread_on_fde";
+include/start_slave.inc
+# Future events must be logged at least 2 seconds after
+# the slave starts
+connection master;
+# Write events to ensure slave will be consistent with master
+create table t1 (a int);
+insert into t1 values (1);
+# Flush logs on master forces slave to generate a Format description
+# event in its relay log
+flush logs;
+connection slave;
+# Ignore FDEs that happen before the CREATE/INSERT commands
+SET DEBUG_SYNC='now WAIT_FOR paused_on_fde';
+SET DEBUG_SYNC='now SIGNAL sql_thread_continue';
+SET DEBUG_SYNC='now WAIT_FOR paused_on_fde';
+SET DEBUG_SYNC='now SIGNAL sql_thread_continue';
+# On the next FDE, the slave should have the master CREATE/INSERT events
+SET DEBUG_SYNC='now WAIT_FOR paused_on_fde';
+select count(*)=1 from t1;
+count(*)=1
+1
+# The relay log FDE has been processed - here we check to ensure it was
+# not considered in Seconds_Behind_Master calculation
+connection slave1;
+# Safely resume slave SQL thread
+SET @@global.debug_dbug='';
+SET DEBUG_SYNC='pause_sql_thread_on_fde CLEAR';
+SET DEBUG_SYNC='now SIGNAL sql_thread_continue';
+SET DEBUG_SYNC='RESET';
+connection master;
+DROP TABLE t1;
+connection slave;
+SET @@global.debug_dbug=$save_dbug;
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result b/mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result
index 24d7d6cebf7..b9c636fa582 100644
--- a/mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result
+++ b/mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result
@@ -26,7 +26,8 @@ connection slave;
 include/rpl_reset.inc
 connection master;
 CREATE TABLE t1 (a int) engine=innodb;
-CREATE TABLE t2 ( i1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (i1) );
+CREATE TABLE t2 ( i1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (i1) )
+engine=innodb;
 CREATE TABLE t3 ( i1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (i1) );
 CREATE TRIGGER tr1 AFTER DELETE ON t2 FOR EACH ROW INSERT INTO t3 () VALUES ();
 CREATE TEMPORARY TABLE t1_tmp (i1 int);
@@ -59,6 +60,7 @@ slave-bin.000001	#	Gtid	#	#	GTID #-#-#
 slave-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a int) engine=innodb
 slave-bin.000001	#	Gtid	#	#	GTID #-#-#
 slave-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t2 ( i1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (i1) )
+engine=innodb
 slave-bin.000001	#	Gtid	#	#	GTID #-#-#
 slave-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t3 ( i1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (i1) )
 slave-bin.000001	#	Gtid	#	#	GTID #-#-#
@@ -74,7 +76,7 @@ slave-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
 slave-bin.000001	#	Annotate_rows	#	#	INSERT INTO t2 (i1) select * from t1
 slave-bin.000001	#	Table_map	#	#	table_id: # (test.t2)
 slave-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
-slave-bin.000001	#	Query	#	#	COMMIT
+slave-bin.000001	#	Xid	#	#	COMMIT /* XID */
 slave-bin.000001	#	Gtid	#	#	GTID #-#-#
 slave-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`t1_tmp` /* generated by server */
 slave-bin.000001	#	Gtid	#	#	GTID #-#-#
diff --git a/mysql-test/suite/rpl/t/rpl_empty_string_is_null.test b/mysql-test/suite/rpl/t/rpl_empty_string_is_null.test
new file mode 100644
index 00000000000..a0fecbb54ac
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_empty_string_is_null.test
@@ -0,0 +1,15 @@
+--source include/master-slave.inc
+--source include/have_binlog_format_row.inc
+
+--echo #
+--echo # MDEV-18918 SQL mode EMPTY_STRING_IS_NULL breaks RBR upon CREATE TABLE .. SELECT
+--echo #
+
+SET SQL_MODE= 'EMPTY_STRING_IS_NULL';
+CREATE TABLE t1 AS SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE 1 = 0;
+--sync_slave_with_master
+SHOW CREATE TABLE t1;
+--connection master
+DROP TABLE t1;
+
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_seconds_behind_master_spike.test b/mysql-test/suite/rpl/t/rpl_seconds_behind_master_spike.test
new file mode 100644
index 00000000000..029625a09ad
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_seconds_behind_master_spike.test
@@ -0,0 +1,88 @@
+#
+# Purpose:
+#   This test validates that a slave's relay log format description event is
+# not used to calculate the Seconds_Behind_Master time displayed by
+# SHOW SLAVE STATUS.
+#
+# Methodology:
+#   Ensure that a slave's reported Seconds_Behind_Master does not point before
+# a time in which we can prove that it has progressed beyond. The slave's
+# relay log events are created using the timestamp at which the IO thread was
+# created. Therefore, after starting the slave's IO thread, we sleep so any
+# proceeding events are forced to have later timestamps. After sleeping, we run
+# MDL statements on the master and save the time at which they are binlogged.
+# Once the slave executes these MDL commands, we have proven that the slave has
+# caught up to this saved timestamp. At this point, if the value of
+# Seconds_Behind_Master points before the time in which the MDL events were
+# logged, it is invalid.
+#
+# References:
+#   MDEV-16091: Seconds_Behind_Master spikes to millions of seconds
+#
+--source include/have_debug.inc
+--source include/have_innodb.inc
+--source include/master-slave.inc
+
+--connection slave
+--source include/stop_slave.inc
+SET @save_dbug= @@GLOBAL.debug_dbug;
+SET @@global.debug_dbug="+d,pause_sql_thread_on_fde";
+--source include/start_slave.inc
+
+--let $sleep_time=2
+--echo # Future events must be logged at least $sleep_time seconds after
+--echo # the slave starts
+--sleep $sleep_time
+
+--connection master
+--echo # Write events to ensure slave will be consistent with master
+create table t1 (a int);
+insert into t1 values (1);
+--let $t_master_events_logged= `SELECT UNIX_TIMESTAMP()`
+
+--echo # Flush logs on master forces slave to generate a Format description
+--echo # event in its relay log
+flush logs;
+
+--connection slave
+--echo # Ignore FDEs that happen before the CREATE/INSERT commands
+SET DEBUG_SYNC='now WAIT_FOR paused_on_fde';
+SET DEBUG_SYNC='now SIGNAL sql_thread_continue';
+SET DEBUG_SYNC='now WAIT_FOR paused_on_fde';
+SET DEBUG_SYNC='now SIGNAL sql_thread_continue';
+
+--echo # On the next FDE, the slave should have the master CREATE/INSERT events
+SET DEBUG_SYNC='now WAIT_FOR paused_on_fde';
+select count(*)=1 from t1;
+
+--echo # The relay log FDE has been processed - here we check to ensure it was
+--echo # not considered in Seconds_Behind_Master calculation
+--connection slave1
+let $sbm= query_get_value(SHOW SLAVE STATUS, Seconds_Behind_Master, 1);
+--let $t_now= `SELECT UNIX_TIMESTAMP()`
+
+# Ensure Seconds_Behind_Master does not point beyond when we have proven the
+# events we have proven to have executed. The extra second is needed as a
+# buffer because the recorded times are not exact with when the events were
+# recorded on the master.
+if(`select $sbm > $t_now - $t_master_events_logged + 1`)
+{
+    die "A relay log event was incorrectly used to set Seconds_Behind_Master";
+}
+
+--echo # Safely resume slave SQL thread
+SET @@global.debug_dbug='';
+SET DEBUG_SYNC='pause_sql_thread_on_fde CLEAR';
+SET DEBUG_SYNC='now SIGNAL sql_thread_continue';
+
+# Reset last sql_thread_continue signal
+SET DEBUG_SYNC='RESET';
+
+# Cleanup
+--connection master
+DROP TABLE t1;
+
+--connection slave
+SET @@global.debug_dbug=$save_dbug;
+
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_temp_table_mix_row.test b/mysql-test/suite/rpl/t/rpl_temp_table_mix_row.test
index cbbf4c5ffa7..d864e615f7a 100644
--- a/mysql-test/suite/rpl/t/rpl_temp_table_mix_row.test
+++ b/mysql-test/suite/rpl/t/rpl_temp_table_mix_row.test
@@ -91,7 +91,8 @@ sync_slave_with_master;
 
 # action: setup environment
 CREATE TABLE t1 (a int) engine=innodb;
-CREATE TABLE t2 ( i1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (i1) );
+CREATE TABLE t2 ( i1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (i1) )
+  engine=innodb;
 CREATE TABLE t3 ( i1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (i1) );
 CREATE TRIGGER tr1 AFTER DELETE ON t2 FOR EACH ROW INSERT INTO t3 () VALUES ();
 
diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb.result b/mysql-test/suite/sys_vars/r/sysvars_innodb.result
index 221a6de049a..b2e680e16bc 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_innodb.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_innodb.result
@@ -195,7 +195,7 @@ DEFAULT_VALUE	134217728
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BIGINT UNSIGNED
 VARIABLE_COMMENT	The size of the memory buffer InnoDB uses to cache data and indexes of its tables.
-NUMERIC_MIN_VALUE	5242880
+NUMERIC_MIN_VALUE	2097152
 NUMERIC_MAX_VALUE	9223372036854775807
 NUMERIC_BLOCK_SIZE	1048576
 ENUM_VALUE_LIST	NULL
diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff b/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff
index 6da30c14c7e..a6bf0fb606a 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff
+++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff
@@ -1,5 +1,3 @@
---- ../../mysql-test/suite/sys_vars/r/sysvars_server_embedded.result	2021-05-11 19:44:57.048781628 +0530
-+++ ../../mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.reject	2021-05-12 15:26:31.616449925 +0530
 @@ -34,7 +34,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	ARIA_BLOCK_SIZE
diff --git a/mysql-test/suite/sysschema/r/v_innodb_lock_waits.result b/mysql-test/suite/sysschema/r/v_innodb_lock_waits.result
index 29cf21d50a3..7e44c334283 100644
--- a/mysql-test/suite/sysschema/r/v_innodb_lock_waits.result
+++ b/mysql-test/suite/sysschema/r/v_innodb_lock_waits.result
@@ -3,27 +3,27 @@ Field	Type	Null	Key	Default	Extra
 wait_started	datetime	YES		NULL	
 wait_age	time /* mariadb-5.3 */	YES		NULL	
 wait_age_secs	bigint(21)	YES		NULL	
-locked_table	varchar(1024)	NO			
+locked_table	varchar(1024)	NO		NULL	
 locked_index	varchar(1024)	YES		NULL	
 locked_type	enum('RECORD','TABLE')	NO		NULL	
-waiting_trx_id	bigint(21) unsigned	NO		0	
-waiting_trx_started	datetime	NO		0000-00-00 00:00:00	
+waiting_trx_id	bigint(21) unsigned	NO		NULL	
+waiting_trx_started	datetime	NO		NULL	
 waiting_trx_age	time /* mariadb-5.3 */	YES		NULL	
-waiting_trx_rows_locked	bigint(21) unsigned	NO		0	
-waiting_trx_rows_modified	bigint(21) unsigned	NO		0	
-waiting_pid	bigint(21) unsigned	NO		0	
+waiting_trx_rows_locked	bigint(21) unsigned	NO		NULL	
+waiting_trx_rows_modified	bigint(21) unsigned	NO		NULL	
+waiting_pid	bigint(21) unsigned	NO		NULL	
 waiting_query	longtext	YES		NULL	
-waiting_lock_id	varchar(81)	NO			
+waiting_lock_id	varchar(81)	NO		NULL	
 waiting_lock_mode	enum('S','S,GAP','X','X,GAP','IS','IS,GAP','IX','IX,GAP','AUTO_INC')	NO		NULL	
-blocking_trx_id	bigint(21) unsigned	NO		0	
-blocking_pid	bigint(21) unsigned	NO		0	
+blocking_trx_id	bigint(21) unsigned	NO		NULL	
+blocking_pid	bigint(21) unsigned	NO		NULL	
 blocking_query	longtext	YES		NULL	
-blocking_lock_id	varchar(81)	NO			
+blocking_lock_id	varchar(81)	NO		NULL	
 blocking_lock_mode	enum('S','S,GAP','X','X,GAP','IS','IS,GAP','IX','IX,GAP','AUTO_INC')	NO		NULL	
-blocking_trx_started	datetime	NO		0000-00-00 00:00:00	
+blocking_trx_started	datetime	NO		NULL	
 blocking_trx_age	time /* mariadb-5.3 */	YES		NULL	
-blocking_trx_rows_locked	bigint(21) unsigned	NO		0	
-blocking_trx_rows_modified	bigint(21) unsigned	NO		0	
+blocking_trx_rows_locked	bigint(21) unsigned	NO		NULL	
+blocking_trx_rows_modified	bigint(21) unsigned	NO		NULL	
 sql_kill_blocking_query	varchar(32)	YES		NULL	
 sql_kill_blocking_connection	varchar(26)	YES		NULL	
 SELECT * FROM sys.innodb_lock_waits;
@@ -32,27 +32,27 @@ Field	Type	Null	Key	Default	Extra
 wait_started	datetime	YES		NULL	
 wait_age	time /* mariadb-5.3 */	YES		NULL	
 wait_age_secs	bigint(21)	YES		NULL	
-locked_table	varchar(1024)	NO			
+locked_table	varchar(1024)	NO		NULL	
 locked_index	varchar(1024)	YES		NULL	
 locked_type	enum('RECORD','TABLE')	NO		NULL	
-waiting_trx_id	bigint(21) unsigned	NO		0	
-waiting_trx_started	datetime	NO		0000-00-00 00:00:00	
+waiting_trx_id	bigint(21) unsigned	NO		NULL	
+waiting_trx_started	datetime	NO		NULL	
 waiting_trx_age	time /* mariadb-5.3 */	YES		NULL	
-waiting_trx_rows_locked	bigint(21) unsigned	NO		0	
-waiting_trx_rows_modified	bigint(21) unsigned	NO		0	
-waiting_pid	bigint(21) unsigned	NO		0	
+waiting_trx_rows_locked	bigint(21) unsigned	NO		NULL	
+waiting_trx_rows_modified	bigint(21) unsigned	NO		NULL	
+waiting_pid	bigint(21) unsigned	NO		NULL	
 waiting_query	varchar(1024)	YES		NULL	
-waiting_lock_id	varchar(81)	NO			
+waiting_lock_id	varchar(81)	NO		NULL	
 waiting_lock_mode	enum('S','S,GAP','X','X,GAP','IS','IS,GAP','IX','IX,GAP','AUTO_INC')	NO		NULL	
-blocking_trx_id	bigint(21) unsigned	NO		0	
-blocking_pid	bigint(21) unsigned	NO		0	
+blocking_trx_id	bigint(21) unsigned	NO		NULL	
+blocking_pid	bigint(21) unsigned	NO		NULL	
 blocking_query	varchar(1024)	YES		NULL	
-blocking_lock_id	varchar(81)	NO			
+blocking_lock_id	varchar(81)	NO		NULL	
 blocking_lock_mode	enum('S','S,GAP','X','X,GAP','IS','IS,GAP','IX','IX,GAP','AUTO_INC')	NO		NULL	
-blocking_trx_started	datetime	NO		0000-00-00 00:00:00	
+blocking_trx_started	datetime	NO		NULL	
 blocking_trx_age	time /* mariadb-5.3 */	YES		NULL	
-blocking_trx_rows_locked	bigint(21) unsigned	NO		0	
-blocking_trx_rows_modified	bigint(21) unsigned	NO		0	
+blocking_trx_rows_locked	bigint(21) unsigned	NO		NULL	
+blocking_trx_rows_modified	bigint(21) unsigned	NO		NULL	
 sql_kill_blocking_query	varchar(32)	YES		NULL	
 sql_kill_blocking_connection	varchar(26)	YES		NULL	
 SELECT * FROM sys.x$innodb_lock_waits;
diff --git a/mysql-test/suite/sysschema/r/v_schema_auto_increment_columns.result b/mysql-test/suite/sysschema/r/v_schema_auto_increment_columns.result
index 5eb259d3e8d..ef2ad76b600 100644
--- a/mysql-test/suite/sysschema/r/v_schema_auto_increment_columns.result
+++ b/mysql-test/suite/sysschema/r/v_schema_auto_increment_columns.result
@@ -1,10 +1,10 @@
 DESC sys.schema_auto_increment_columns;
 Field	Type	Null	Key	Default	Extra
-table_schema	varchar(64)	NO			
-table_name	varchar(64)	NO			
-column_name	varchar(64)	NO			
-data_type	varchar(64)	NO			
-column_type	longtext	NO			
+table_schema	varchar(64)	NO		NULL	
+table_name	varchar(64)	NO		NULL	
+column_name	varchar(64)	NO		NULL	
+data_type	varchar(64)	NO		NULL	
+column_type	longtext	NO		NULL	
 is_signed	int(1)	NO		0	
 is_unsigned	int(1)	NO		0	
 max_value	bigint(21) unsigned	YES		NULL	
diff --git a/mysql-test/suite/sysschema/r/v_schema_redundant_indexes.result b/mysql-test/suite/sysschema/r/v_schema_redundant_indexes.result
index 10c04ffb69c..2199c959cd0 100644
--- a/mysql-test/suite/sysschema/r/v_schema_redundant_indexes.result
+++ b/mysql-test/suite/sysschema/r/v_schema_redundant_indexes.result
@@ -1,11 +1,11 @@
 DESC sys.schema_redundant_indexes;
 Field	Type	Null	Key	Default	Extra
-table_schema	varchar(64)	NO			
-table_name	varchar(64)	NO			
-redundant_index_name	varchar(64)	NO			
+table_schema	varchar(64)	NO		NULL	
+table_name	varchar(64)	NO		NULL	
+redundant_index_name	varchar(64)	NO		NULL	
 redundant_index_columns	mediumtext	YES		NULL	
 redundant_index_non_unique	bigint(1)	YES		NULL	
-dominant_index_name	varchar(64)	NO			
+dominant_index_name	varchar(64)	NO		NULL	
 dominant_index_columns	mediumtext	YES		NULL	
 dominant_index_non_unique	bigint(1)	YES		NULL	
 subpart_exists	int(1)	YES		NULL	
@@ -13,9 +13,9 @@ sql_drop_index	varchar(223)	YES		NULL
 SELECT * FROM sys.schema_redundant_indexes;
 DESC sys.x$schema_flattened_keys;
 Field	Type	Null	Key	Default	Extra
-table_schema	varchar(64)	NO			
-table_name	varchar(64)	NO			
-index_name	varchar(64)	NO			
+table_schema	varchar(64)	NO		NULL	
+table_name	varchar(64)	NO		NULL	
+index_name	varchar(64)	NO		NULL	
 non_unique	bigint(1)	YES		NULL	
 subpart_exists	bigint(1)	YES		NULL	
 index_columns	mediumtext	YES		NULL	
diff --git a/mysql-test/suite/vcol/r/not_supported.result b/mysql-test/suite/vcol/r/not_supported.result
index c804cf220d2..d8703f755da 100644
--- a/mysql-test/suite/vcol/r/not_supported.result
+++ b/mysql-test/suite/vcol/r/not_supported.result
@@ -34,3 +34,11 @@ select * from t8;
 a	b	v
 1234567890	2	2009-02-14 00:31:30
 drop table t1, t3_ok, t8;
+#
+# Bug#33141966 - INCONSISTENT BEHAVIOR IF A COLUMN OF TYPE SERIAL IS SET AS GENERATED
+#
+create table t1 (a int, b serial as (a+1));
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'as (a+1))' at line 1
+#
+# End of 10.2 tests
+#
diff --git a/mysql-test/suite/vcol/t/not_supported.test b/mysql-test/suite/vcol/t/not_supported.test
index 1ea7970523a..2b5baf4ff4b 100644
--- a/mysql-test/suite/vcol/t/not_supported.test
+++ b/mysql-test/suite/vcol/t/not_supported.test
@@ -39,3 +39,13 @@ select * from t1;
 select * from t8;
 
 drop table t1, t3_ok, t8;
+
+--echo #
+--echo # Bug#33141966 - INCONSISTENT BEHAVIOR IF A COLUMN OF TYPE SERIAL IS SET AS GENERATED
+--echo #
+--error ER_PARSE_ERROR
+create table t1 (a int, b serial as (a+1));
+
+--echo #
+--echo # End of 10.2 tests
+--echo #
diff --git a/mysql-test/suite/versioning/r/create.result b/mysql-test/suite/versioning/r/create.result
index cd0551abf98..caed619cbf5 100644
--- a/mysql-test/suite/versioning/r/create.result
+++ b/mysql-test/suite/versioning/r/create.result
@@ -631,8 +631,32 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `x` int(11) DEFAULT NULL WITHOUT SYSTEM VERSIONING,
   `y` int(11) DEFAULT NULL,
-  `row_start` timestamp(6) GENERATED ALWAYS AS ROW START WITHOUT SYSTEM VERSIONING,
-  `row_end` timestamp(6) GENERATED ALWAYS AS ROW END WITHOUT SYSTEM VERSIONING,
+  `row_start` timestamp(6) GENERATED ALWAYS AS ROW START,
+  `row_end` timestamp(6) GENERATED ALWAYS AS ROW END,
   PERIOD FOR SYSTEM_TIME (`row_start`, `row_end`)
 ) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING
 drop table t1;
+#
+# MDEV-27452 TIMESTAMP(0) system field is allowed for certain creation of system-versioned table
+#
+create or replace table t (
+a int,
+s timestamp as row start,
+e timestamp as row end,
+period for system_time (s, e))
+with system versioning;
+ERROR HY000: `s` must be of type TIMESTAMP(6) for system-versioned table `t`
+create or replace table t (
+a int with system versioning,
+s timestamp as row start,
+e timestamp as row end,
+period for system_time (s, e));
+ERROR HY000: `s` must be of type TIMESTAMP(6) for system-versioned table `t`
+create or replace table t (
+a int with system versioning,
+b int with system versioning,
+s timestamp(6) as row start,
+e timestamp(6) as row end,
+period for system_time (s, e));
+insert into t () values (),();
+drop table t;
diff --git a/mysql-test/suite/versioning/r/truncate_privilege.result b/mysql-test/suite/versioning/r/not_embedded.result
index e2b48c494be..f17ab18349c 100644
--- a/mysql-test/suite/versioning/r/truncate_privilege.result
+++ b/mysql-test/suite/versioning/r/not_embedded.result
@@ -1,3 +1,39 @@
+# 
+# SYSTEM_VERSIONING_ASOF sysvar
+#
+create table t (a int) with system versioning;
+set @before= UNIX_TIMESTAMP(now(6));
+insert into t values (1);
+set @after= UNIX_TIMESTAMP(now(6));
+update t set a= 2;
+set global system_versioning_asof= FROM_UNIXTIME(@after);
+set system_versioning_asof= FROM_UNIXTIME(@after);
+select * from t as nonempty;
+a
+1
+connect  subcon,127.0.0.1,root,,,$SERVER_MYPORT_1;
+connection subcon;
+select * from t as nonempty;
+a
+1
+disconnect subcon;
+connection default;
+set global system_versioning_asof= FROM_UNIXTIME(@before);
+select * from t as nonempty;
+a
+1
+connect  subcon,127.0.0.1,root,,,$SERVER_MYPORT_1;
+connection subcon;
+select * from t as empty;
+a
+disconnect subcon;
+connection default;
+drop table t;
+set global system_versioning_asof= DEFAULT;
+set system_versioning_asof= DEFAULT;
+#
+# DELETE HISTORY and privileges
+#
 connect  root,localhost,root,,test;
 connection root;
 create database mysqltest;
@@ -31,3 +67,6 @@ GRANT DELETE HISTORY ON `mysqltest`.* TO `mysqltest_1`@`localhost`
 GRANT DELETE HISTORY ON `mysqltest`.`t` TO `mysqltest_1`@`localhost`
 drop user mysqltest_1@localhost;
 drop database mysqltest;
+disconnect user1;
+disconnect root;
+connection default;
diff --git a/mysql-test/suite/versioning/r/partition.result b/mysql-test/suite/versioning/r/partition.result
index ab56b31706e..12807577346 100644
--- a/mysql-test/suite/versioning/r/partition.result
+++ b/mysql-test/suite/versioning/r/partition.result
@@ -914,6 +914,18 @@ t1	CREATE TABLE `t1` (
  PARTITION `ver_pn` CURRENT ENGINE = DEFAULT_ENGINE)
 set timestamp= default;
 #
+# MDEV-18794 Assertion `!m_innodb' failed in ha_partition::cmp_ref upon SELECT from partitioned table
+#
+create or replace table t1 (pk int auto_increment, i int, c char(1), primary key (pk), key(i))
+engine=innodb with system versioning partition by key() partitions 2;
+insert into t1 (i, c) values (1, 'a'), (2, 'b'), (null, 'c'), (null, 'b');
+alter table t1 drop system versioning;
+replace into t1 select * from t1;
+select * from t1 where i > 0 or pk = 1000 limit 1;
+pk	i	c
+1	1	a
+drop table t1;
+#
 # MDEV-19175 Server crashes in ha_partition::vers_can_native upon INSERT DELAYED into versioned partitioned table
 #
 create or replace table t1 (f int) with system versioning partition by hash(f);
@@ -1150,6 +1162,38 @@ alter table t1 add x serial;
 alter table t1 add partition (partition p1 history);
 alter table t1 add partition (partition p2 history);
 drop table t1;
+#
+# MDEV-27217 DELETE partition selection doesn't work for history partitions
+#
+create table t1 (f char) with system versioning
+partition by system_time limit 10 (
+partition p0 history,
+partition p1 history,
+partition p2 history,
+partition pn current);
+delete from t1 partition (p1);
+ERROR HY000: Not allowed for system-versioned table `test`.`t1`
+delete from t1 partition (p0, pn);
+ERROR HY000: Not allowed for system-versioned table `test`.`t1`
+delete from t1 partition (p0, p1);
+ERROR HY000: Not allowed for system-versioned table `test`.`t1`
+delete from t1 partition (p0, p1, pn);
+ERROR HY000: Not allowed for system-versioned table `test`.`t1`
+drop table t1;
+set timestamp=unix_timestamp('2000-01-01 00:00:00');
+create or replace table t1 (i int) with system versioning
+partition by system_time interval 1 day (
+partition p0 history,
+partition p1 history,
+partition pn current);
+set timestamp=unix_timestamp('2000-01-02 00:00:00');
+insert t1 values (1);
+delete from t1 partition (p0, pn);
+ERROR HY000: Not allowed for system-versioned table `test`.`t1`
+delete from t1 partition (p0, p1, pn);
+ERROR HY000: Not allowed for system-versioned table `test`.`t1`
+drop table t1;
+set timestamp= default;
 # End of 10.3 tests
 #
 # MDEV-22283 Server crashes in key_copy or unexpected error 156: The table already existed in the storage engine
diff --git a/mysql-test/suite/versioning/r/sysvars-notembedded.result b/mysql-test/suite/versioning/r/sysvars-notembedded.result
deleted file mode 100644
index 8b1ad6cfc58..00000000000
--- a/mysql-test/suite/versioning/r/sysvars-notembedded.result
+++ /dev/null
@@ -1,30 +0,0 @@
-create table t (a int) with system versioning;
-set @before= UNIX_TIMESTAMP(now(6));
-insert into t values (1);
-set @after= UNIX_TIMESTAMP(now(6));
-update t set a= 2;
-set global system_versioning_asof= FROM_UNIXTIME(@after);
-set system_versioning_asof= FROM_UNIXTIME(@after);
-select * from t as nonempty;
-a
-1
-connect  subcon,127.0.0.1,root,,,$SERVER_MYPORT_1;
-connection subcon;
-select * from t as nonempty;
-a
-1
-disconnect subcon;
-connection default;
-set global system_versioning_asof= FROM_UNIXTIME(@before);
-select * from t as nonempty;
-a
-1
-connect  subcon,127.0.0.1,root,,,$SERVER_MYPORT_1;
-connection subcon;
-select * from t as empty;
-a
-disconnect subcon;
-connection default;
-drop table t;
-set global system_versioning_asof= DEFAULT;
-set system_versioning_asof= DEFAULT;
diff --git a/mysql-test/suite/versioning/r/trx_id.result b/mysql-test/suite/versioning/r/trx_id.result
index 1b59fc8b3fc..6c337863790 100644
--- a/mysql-test/suite/versioning/r/trx_id.result
+++ b/mysql-test/suite/versioning/r/trx_id.result
@@ -182,7 +182,78 @@ select x, row_start <  row_end from t1 for system_time all;
 x	row_start <  row_end
 4	1
 2	1
+#
+# MDEV-15951 system versioning by trx id doesn't work with partitioning
+# currently trx_id does not support partitioning by system_time
+#
+create or replace table t1(
+i int,
+row_start bigint unsigned generated always as row start,
+row_end bigint unsigned generated always as row end,
+period for system_time(row_start, row_end)
+) engine=InnoDB with system versioning partition by system_time (
+partition p0 history,
+partition pn current
+);
+ERROR HY000: `row_start` must be of type TIMESTAMP(6) for system-versioned table `t1`
+create or replace table t1(
+i int,
+row_start bigint unsigned generated always as row start,
+row_end bigint unsigned generated always as row end,
+period for system_time(row_start, row_end)
+) engine=InnoDB with system versioning;
+alter table t1  partition by system_time (
+partition p0 history,
+partition pn current
+);
+ERROR HY000: `row_start` must be of type TIMESTAMP(6) for system-versioned table `t1`
+drop table t1;
+create or replace table t (
+a int primary key,
+row_start bigint unsigned as row start invisible,
+row_end bigint unsigned as row end invisible,
+period for system_time(row_start, row_end)
+) engine=innodb with system versioning
+partition by key() (
+partition p1,
+partition p2
+);
+ERROR HY000: Transaction-precise system-versioned tables do not support partitioning by ROW START or ROW END
+create or replace table t (
+a int primary key,
+row_start bigint unsigned as row start invisible,
+row_end bigint unsigned as row end invisible,
+period for system_time(row_start, row_end)
+) engine=innodb with system versioning
+partition by key(a, row_start) (
+partition p1,
+partition p2
+);
+ERROR HY000: Transaction-precise system-versioned tables do not support partitioning by ROW START or ROW END
+create or replace table t (
+a int primary key,
+row_start bigint unsigned as row start invisible,
+row_end bigint unsigned as row end invisible,
+period for system_time(row_start, row_end)
+) engine=innodb with system versioning
+partition by hash(a + row_end * 2) (
+partition p1,
+partition p2
+);
+ERROR HY000: Transaction-precise system-versioned tables do not support partitioning by ROW START or ROW END
+create or replace table t (
+a int primary key,
+row_start bigint unsigned as row start invisible,
+row_end bigint unsigned as row end invisible,
+period for system_time(row_start, row_end)
+) engine=innodb with system versioning
+partition by range columns (a, row_start) (
+partition p1 values less than (100, 100)
+);
+ERROR HY000: Transaction-precise system-versioned tables do not support partitioning by ROW START or ROW END
+#
 # MDEV-16010 Too many rows with AS OF point_in_the_past_or_NULL
+#
 create or replace table t1 (
 x int,
 row_start bigint unsigned as row start invisible,
@@ -512,3 +583,31 @@ drop table t;
 uninstall plugin test_versioning;
 select trt_begin_ts(0);
 ERROR 42000: FUNCTION test.trt_begin_ts does not exist
+#
+# MDEV-21650 Non-empty statement transaction on global rollback after TRT update error
+#
+create table t1 (s date, e date, period for app(s,e)) engine=innodb;
+alter table t1
+add row_start bigint unsigned as row start,
+add row_end bigint unsigned as row end,
+add period for system_time(row_start,row_end),
+with system versioning,
+add period if not exists for app(x,y);
+Warnings:
+Note	1060	Duplicate column name 'app'
+set transaction isolation level serializable;
+start transaction;
+insert into t1 (s,e) values ('2021-07-04','2024-08-18');
+connect  con1,localhost,root,,test;
+start transaction;
+insert into t1 (s,e) values ('2018-06-01','2021-09-15');
+connection default;
+select * from t1 for system_time as of now();
+ERROR HY000: TRX_ID ... not found in `mysql.transaction_registry`
+connection con1;
+set innodb_lock_wait_timeout= 1, lock_wait_timeout= 1;
+alter table xx;
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
+disconnect con1;
+connection default;
+drop table t1;
diff --git a/mysql-test/suite/versioning/r/update.result b/mysql-test/suite/versioning/r/update.result
index 41058969801..b899969d1d1 100644
--- a/mysql-test/suite/versioning/r/update.result
+++ b/mysql-test/suite/versioning/r/update.result
@@ -399,8 +399,19 @@ a	check_row(row_start, row_end)
 1	CURRENT ROW
 drop tables t1, t2, t3;
 #
+# MDEV-26778 row_start is not updated in current row for InnoDB
+#
+create or replace table t1 (x int) with system versioning;
+insert t1 values (1);
+update t1 set x= 1;
+select row_start into @r from t1;
+select check_row_ts(row_start, row_end) from t1 for system_time all where row_start = @r;
+check_row_ts(row_start, row_end)
+CURRENT ROW
+drop table t1;
+#
 # MDEV-24522 Assertion `inited==NONE' fails upon UPDATE on versioned table with unique blob
-
+#
 create table t1 (a int, b int, c text, unique(c), key (b)) engine=myisam with system versioning;
 insert into t1 values (1, 1, 'foo'), (2, 11, 'bar');
 update t1 set a = 3 where b <= 9;
diff --git a/mysql-test/suite/versioning/t/create.test b/mysql-test/suite/versioning/t/create.test
index 6a4228d7099..87cafdc7d32 100644
--- a/mysql-test/suite/versioning/t/create.test
+++ b/mysql-test/suite/versioning/t/create.test
@@ -471,3 +471,32 @@ create or replace table t1 (
 show create table t1;
 
 drop table t1;
+
+--echo #
+--echo # MDEV-27452 TIMESTAMP(0) system field is allowed for certain creation of system-versioned table
+--echo #
+--error ER_VERS_FIELD_WRONG_TYPE
+create or replace table t (
+  a int,
+  s timestamp as row start,
+  e timestamp as row end,
+  period for system_time (s, e))
+with system versioning;
+
+--error ER_VERS_FIELD_WRONG_TYPE
+create or replace table t (
+  a int with system versioning,
+  s timestamp as row start,
+  e timestamp as row end,
+  period for system_time (s, e));
+
+create or replace table t (
+  a int with system versioning,
+  b int with system versioning,
+  s timestamp(6) as row start,
+  e timestamp(6) as row end,
+  period for system_time (s, e));
+insert into t () values (),();
+ 
+# cleanup
+drop table t;
diff --git a/mysql-test/suite/versioning/t/not_embedded.test b/mysql-test/suite/versioning/t/not_embedded.test
new file mode 100644
index 00000000000..2afae013e70
--- /dev/null
+++ b/mysql-test/suite/versioning/t/not_embedded.test
@@ -0,0 +1,79 @@
+--source include/not_embedded.inc
+--source include/have_innodb.inc
+
+--echo # 
+--echo # SYSTEM_VERSIONING_ASOF sysvar
+--echo #
+create table t (a int) with system versioning;
+set @before= UNIX_TIMESTAMP(now(6));
+insert into t values (1);
+set @after= UNIX_TIMESTAMP(now(6));
+update t set a= 2;
+
+set global system_versioning_asof= FROM_UNIXTIME(@after);
+set system_versioning_asof= FROM_UNIXTIME(@after);
+select * from t as nonempty;
+
+--connect (subcon,127.0.0.1,root,,,$SERVER_MYPORT_1)
+--connection subcon
+select * from t as nonempty;
+--disconnect subcon
+--connection default
+
+set global system_versioning_asof= FROM_UNIXTIME(@before);
+select * from t as nonempty;
+
+--connect (subcon,127.0.0.1,root,,,$SERVER_MYPORT_1)
+--connection subcon
+select * from t as empty;
+--disconnect subcon
+--connection default
+
+drop table t;
+
+set global system_versioning_asof= DEFAULT;
+set system_versioning_asof= DEFAULT;
+
+--echo #
+--echo # DELETE HISTORY and privileges
+--echo #
+
+# Save the initial number of concurrent sessions
+--source include/count_sessions.inc
+
+connect (root,localhost,root,,test);
+connection root;
+
+--disable_warnings
+create database mysqltest;
+--enable_warnings
+
+create user mysqltest_1@localhost;
+connect (user1,localhost,mysqltest_1,,test);
+connection user1;
+
+connection root;
+create table mysqltest.t (a int) with system versioning;
+
+connection user1;
+show grants;
+--error ER_TABLEACCESS_DENIED_ERROR
+delete history from mysqltest.t before system_time now();
+
+connection root;
+grant delete history on mysqltest.* to mysqltest_1@localhost;
+grant delete history on mysqltest.t to mysqltest_1@localhost;
+
+connection user1;
+show grants;
+delete history from mysqltest.t before system_time now();
+
+connection root;
+grant all on *.* to mysqltest_1@localhost;
+show grants for mysqltest_1@localhost;
+
+drop user mysqltest_1@localhost;
+drop database mysqltest;
+--disconnect user1
+--disconnect root
+--connection default
diff --git a/mysql-test/suite/versioning/t/partition.test b/mysql-test/suite/versioning/t/partition.test
index 75280c4ebaa..823394e827d 100644
--- a/mysql-test/suite/versioning/t/partition.test
+++ b/mysql-test/suite/versioning/t/partition.test
@@ -777,6 +777,17 @@ show create table t1;
 set timestamp= default;
 
 --echo #
+--echo # MDEV-18794 Assertion `!m_innodb' failed in ha_partition::cmp_ref upon SELECT from partitioned table
+--echo #
+create or replace table t1 (pk int auto_increment, i int, c char(1), primary key (pk), key(i))
+engine=innodb with system versioning partition by key() partitions 2;
+insert into t1 (i, c) values (1, 'a'), (2, 'b'), (null, 'c'), (null, 'b');
+alter table t1 drop system versioning;
+replace into t1 select * from t1;
+select * from t1 where i > 0 or pk = 1000 limit 1;
+drop table t1;
+
+--echo #
 --echo # MDEV-19175 Server crashes in ha_partition::vers_can_native upon INSERT DELAYED into versioned partitioned table
 --echo #
 create or replace table t1 (f int) with system versioning partition by hash(f);
@@ -1029,6 +1040,40 @@ alter table t1 add partition (partition p1 history);
 alter table t1 add partition (partition p2 history);
 drop table t1;
 
+--echo #
+--echo # MDEV-27217 DELETE partition selection doesn't work for history partitions
+--echo #
+create table t1 (f char) with system versioning
+partition by system_time limit 10 (
+  partition p0 history,
+  partition p1 history,
+  partition p2 history,
+  partition pn current);
+
+--error ER_VERS_NOT_ALLOWED
+delete from t1 partition (p1);
+--error ER_VERS_NOT_ALLOWED
+delete from t1 partition (p0, pn);
+--error ER_VERS_NOT_ALLOWED
+delete from t1 partition (p0, p1);
+--error ER_VERS_NOT_ALLOWED
+delete from t1 partition (p0, p1, pn);
+drop table t1;
+
+set timestamp=unix_timestamp('2000-01-01 00:00:00');
+create or replace table t1 (i int) with system versioning
+partition by system_time interval 1 day (
+  partition p0 history,
+  partition p1 history,
+  partition pn current);
+set timestamp=unix_timestamp('2000-01-02 00:00:00');
+insert t1 values (1);
+--error ER_VERS_NOT_ALLOWED
+delete from t1 partition (p0, pn);
+--error ER_VERS_NOT_ALLOWED
+delete from t1 partition (p0, p1, pn);
+drop table t1;
+set timestamp= default;
 --echo # End of 10.3 tests
 
 --echo #
diff --git a/mysql-test/suite/versioning/t/sysvars-notembedded.test b/mysql-test/suite/versioning/t/sysvars-notembedded.test
deleted file mode 100644
index 314972bc375..00000000000
--- a/mysql-test/suite/versioning/t/sysvars-notembedded.test
+++ /dev/null
@@ -1,31 +0,0 @@
-source include/not_embedded.inc;
-
-create table t (a int) with system versioning;
-set @before= UNIX_TIMESTAMP(now(6));
-insert into t values (1);
-set @after= UNIX_TIMESTAMP(now(6));
-update t set a= 2;
-
-set global system_versioning_asof= FROM_UNIXTIME(@after);
-set system_versioning_asof= FROM_UNIXTIME(@after);
-select * from t as nonempty;
-
---connect (subcon,127.0.0.1,root,,,$SERVER_MYPORT_1)
---connection subcon
-select * from t as nonempty;
---disconnect subcon
---connection default
-
-set global system_versioning_asof= FROM_UNIXTIME(@before);
-select * from t as nonempty;
-
---connect (subcon,127.0.0.1,root,,,$SERVER_MYPORT_1)
---connection subcon
-select * from t as empty;
---disconnect subcon
---connection default
-
-drop table t;
-
-set global system_versioning_asof= DEFAULT;
-set system_versioning_asof= DEFAULT;
diff --git a/mysql-test/suite/versioning/t/truncate_privilege.test b/mysql-test/suite/versioning/t/truncate_privilege.test
deleted file mode 100644
index dcdad59039a..00000000000
--- a/mysql-test/suite/versioning/t/truncate_privilege.test
+++ /dev/null
@@ -1,41 +0,0 @@
-# Can't test with embedded server
--- source include/not_embedded.inc
-
---source include/have_innodb.inc
-
-# Save the initial number of concurrent sessions
---source include/count_sessions.inc
-
-connect (root,localhost,root,,test);
-connection root;
-
---disable_warnings
-create database mysqltest;
---enable_warnings
-
-create user mysqltest_1@localhost;
-connect (user1,localhost,mysqltest_1,,test);
-connection user1;
-
-connection root;
-create table mysqltest.t (a int) with system versioning;
-
-connection user1;
-show grants;
---error ER_TABLEACCESS_DENIED_ERROR
-delete history from mysqltest.t before system_time now();
-
-connection root;
-grant delete history on mysqltest.* to mysqltest_1@localhost;
-grant delete history on mysqltest.t to mysqltest_1@localhost;
-
-connection user1;
-show grants;
-delete history from mysqltest.t before system_time now();
-
-connection root;
-grant all on *.* to mysqltest_1@localhost;
-show grants for mysqltest_1@localhost;
-
-drop user mysqltest_1@localhost;
-drop database mysqltest;
diff --git a/mysql-test/suite/versioning/t/trx_id.test b/mysql-test/suite/versioning/t/trx_id.test
index 4728ce9b2d0..60836279f52 100644
--- a/mysql-test/suite/versioning/t/trx_id.test
+++ b/mysql-test/suite/versioning/t/trx_id.test
@@ -3,6 +3,7 @@ if (!$TEST_VERSIONING_SO)
   --skip needs test_versioning plugin
 }
 --source include/have_innodb.inc
+--source include/have_partition.inc
 --source include/default_charset.inc
 
 --disable_query_log
@@ -161,7 +162,87 @@ update t1 set x= 4;
 commit;
 select x, row_start <  row_end from t1 for system_time all;
 
+--echo #
+--echo # MDEV-15951 system versioning by trx id doesn't work with partitioning
+--echo # currently trx_id does not support partitioning by system_time
+--echo #
+--error ER_VERS_FIELD_WRONG_TYPE
+create or replace table t1(
+  i int,
+  row_start bigint unsigned generated always as row start,
+  row_end bigint unsigned generated always as row end,
+  period for system_time(row_start, row_end)
+) engine=InnoDB with system versioning partition by system_time (
+  partition p0 history,
+  partition pn current
+);
+
+create or replace table t1(
+  i int,
+  row_start bigint unsigned generated always as row start,
+  row_end bigint unsigned generated always as row end,
+  period for system_time(row_start, row_end)
+) engine=InnoDB with system versioning;
+
+--replace_regex /#sql-[0-9a-f_]*/#sql-temporary/
+--error ER_VERS_FIELD_WRONG_TYPE
+alter table t1  partition by system_time (
+  partition p0 history,
+  partition pn current
+);
+
+drop table t1;
+
+--error ER_VERS_TRX_PART_HISTORIC_ROW_NOT_SUPPORTED
+create or replace table t (
+  a int primary key,
+  row_start bigint unsigned as row start invisible,
+  row_end bigint unsigned as row end invisible,
+  period for system_time(row_start, row_end)
+) engine=innodb with system versioning
+partition by key() (
+  partition p1,
+  partition p2
+);
+
+--error ER_VERS_TRX_PART_HISTORIC_ROW_NOT_SUPPORTED
+create or replace table t (
+  a int primary key,
+  row_start bigint unsigned as row start invisible,
+  row_end bigint unsigned as row end invisible,
+  period for system_time(row_start, row_end)
+) engine=innodb with system versioning
+partition by key(a, row_start) (
+  partition p1,
+  partition p2
+);
+
+--error ER_VERS_TRX_PART_HISTORIC_ROW_NOT_SUPPORTED
+create or replace table t (
+  a int primary key,
+  row_start bigint unsigned as row start invisible,
+  row_end bigint unsigned as row end invisible,
+  period for system_time(row_start, row_end)
+) engine=innodb with system versioning
+partition by hash(a + row_end * 2) (
+  partition p1,
+  partition p2
+);
+
+--error ER_VERS_TRX_PART_HISTORIC_ROW_NOT_SUPPORTED
+create or replace table t (
+  a int primary key,
+  row_start bigint unsigned as row start invisible,
+  row_end bigint unsigned as row end invisible,
+  period for system_time(row_start, row_end)
+) engine=innodb with system versioning
+partition by range columns (a, row_start) (
+  partition p1 values less than (100, 100)
+);
+
+--echo #
 --echo # MDEV-16010 Too many rows with AS OF point_in_the_past_or_NULL
+--echo #
 create or replace table t1 (
   x int,
   row_start bigint unsigned as row start invisible,
@@ -515,3 +596,38 @@ uninstall plugin test_versioning;
 select trt_begin_ts(0);
 
 --disable_prepare_warnings
+
+--echo #
+--echo # MDEV-21650 Non-empty statement transaction on global rollback after TRT update error
+--echo #
+create table t1 (s date, e date, period for app(s,e)) engine=innodb;
+alter table t1
+    add row_start bigint unsigned as row start,
+    add row_end bigint unsigned as row end,
+    add period for system_time(row_start,row_end),
+    with system versioning,
+    add period if not exists for app(x,y);
+
+set transaction isolation level serializable;
+start transaction;
+insert into t1 (s,e) values ('2021-07-04','2024-08-18');
+
+--connect (con1,localhost,root,,test)
+start transaction;
+insert into t1 (s,e) values ('2018-06-01','2021-09-15');
+
+--connection default
+--replace_regex /TRX_ID \d+/TRX_ID .../
+--error ER_VERS_NO_TRX_ID
+select * from t1 for system_time as of now();
+
+--connection con1
+set innodb_lock_wait_timeout= 1, lock_wait_timeout= 1;
+# can be existing or non-existing table, does not matter
+--error ER_LOCK_WAIT_TIMEOUT
+alter table xx;
+
+# cleanup
+--disconnect con1
+--connection default
+drop table t1;
diff --git a/mysql-test/suite/versioning/t/update.test b/mysql-test/suite/versioning/t/update.test
index df07cec33cb..a80a8a7b714 100644
--- a/mysql-test/suite/versioning/t/update.test
+++ b/mysql-test/suite/versioning/t/update.test
@@ -329,8 +329,18 @@ select *, check_row(row_start, row_end) from t2 for system_time all order by row
 drop tables t1, t2, t3;
 
 --echo #
+--echo # MDEV-26778 row_start is not updated in current row for InnoDB
+--echo #
+create or replace table t1 (x int) with system versioning;
+insert t1 values (1);
+update t1 set x= 1;
+select row_start into @r from t1;
+select check_row_ts(row_start, row_end) from t1 for system_time all where row_start = @r;
+drop table t1;
+
+--echo #
 --echo # MDEV-24522 Assertion `inited==NONE' fails upon UPDATE on versioned table with unique blob
---echo
+--echo #
 create table t1 (a int, b int, c text, unique(c), key (b)) engine=myisam with system versioning;
 insert into t1 values (1, 1, 'foo'), (2, 11, 'bar');
 
diff --git a/mysql-test/suite/wsrep/r/mysql_tzinfo_to_sql_symlink.result b/mysql-test/suite/wsrep/r/mysql_tzinfo_to_sql_symlink.result
index 262c75f862e..aaeabff9663 100644
--- a/mysql-test/suite/wsrep/r/mysql_tzinfo_to_sql_symlink.result
+++ b/mysql-test/suite/wsrep/r/mysql_tzinfo_to_sql_symlink.result
@@ -9,13 +9,18 @@ ALTER TABLE time_zone ENGINE=InnoDB;
 ALTER TABLE time_zone_name ENGINE=InnoDB;
 ALTER TABLE time_zone_transition ENGINE=InnoDB;
 ALTER TABLE time_zone_transition_type ENGINE=InnoDB;
-END IF|
-\d ;
 TRUNCATE TABLE time_zone;
 TRUNCATE TABLE time_zone_name;
 TRUNCATE TABLE time_zone_transition;
 TRUNCATE TABLE time_zone_transition_type;
 START TRANSACTION;
+ELSE
+TRUNCATE TABLE time_zone;
+TRUNCATE TABLE time_zone_name;
+TRUNCATE TABLE time_zone_transition;
+TRUNCATE TABLE time_zone_transition_type;
+END IF|
+\d ;
 INSERT INTO time_zone (Use_leap_seconds) VALUES ('N');
 SET @time_zone_id= LAST_INSERT_ID();
 INSERT INTO time_zone_name (Name, Time_zone_id) VALUES ('GMT', @time_zone_id);
@@ -33,6 +38,7 @@ INSERT INTO time_zone_transition_type (Time_zone_id, Transition_type_id, `Offset
 Warning: Unable to load 'MYSQLTEST_VARDIR/zoneinfo/posix/garbage' as time zone. Skipping it.
 Warning: Unable to load 'MYSQLTEST_VARDIR/zoneinfo/posix/ignored.tab' as time zone. Skipping it.
 Warning: Skipping directory 'MYSQLTEST_VARDIR/zoneinfo/posix/posix': to avoid infinite symlink recursion.
+UNLOCK TABLES;
 COMMIT;
 ALTER TABLE time_zone_transition ORDER BY Time_zone_id, Transition_time;
 ALTER TABLE time_zone_transition_type ORDER BY Time_zone_id, Transition_type_id;
@@ -41,8 +47,8 @@ IF (select count(*) from information_schema.global_variables where
 variable_name='wsrep_on' and variable_value='ON') = 1 THEN
 ALTER TABLE time_zone ENGINE=Aria;
 ALTER TABLE time_zone_name ENGINE=Aria;
-ALTER TABLE time_zone_transition ENGINE=Aria;
-ALTER TABLE time_zone_transition_type ENGINE=Aria;
+ALTER TABLE time_zone_transition ENGINE=Aria, ORDER BY Time_zone_id, Transition_time;
+ALTER TABLE time_zone_transition_type ENGINE=Aria, ORDER BY Time_zone_id, Transition_type_id;
 END IF|
 \d ;
 # Silent run
@@ -53,13 +59,18 @@ ALTER TABLE time_zone ENGINE=InnoDB;
 ALTER TABLE time_zone_name ENGINE=InnoDB;
 ALTER TABLE time_zone_transition ENGINE=InnoDB;
 ALTER TABLE time_zone_transition_type ENGINE=InnoDB;
-END IF|
-\d ;
 TRUNCATE TABLE time_zone;
 TRUNCATE TABLE time_zone_name;
 TRUNCATE TABLE time_zone_transition;
 TRUNCATE TABLE time_zone_transition_type;
 START TRANSACTION;
+ELSE
+TRUNCATE TABLE time_zone;
+TRUNCATE TABLE time_zone_name;
+TRUNCATE TABLE time_zone_transition;
+TRUNCATE TABLE time_zone_transition_type;
+END IF|
+\d ;
 INSERT INTO time_zone (Use_leap_seconds) VALUES ('N');
 SET @time_zone_id= LAST_INSERT_ID();
 INSERT INTO time_zone_name (Name, Time_zone_id) VALUES ('GMT', @time_zone_id);
@@ -74,6 +85,7 @@ INSERT INTO time_zone_transition_type (Time_zone_id, Transition_type_id, `Offset
  (@time_zone_id, 0, 0, 0, 'GMT')
 ;
 Warning: Unable to load 'MYSQLTEST_VARDIR/zoneinfo/posix/garbage' as time zone. Skipping it.
+UNLOCK TABLES;
 COMMIT;
 ALTER TABLE time_zone_transition ORDER BY Time_zone_id, Transition_time;
 ALTER TABLE time_zone_transition_type ORDER BY Time_zone_id, Transition_type_id;
@@ -82,8 +94,8 @@ IF (select count(*) from information_schema.global_variables where
 variable_name='wsrep_on' and variable_value='ON') = 1 THEN
 ALTER TABLE time_zone ENGINE=Aria;
 ALTER TABLE time_zone_name ENGINE=Aria;
-ALTER TABLE time_zone_transition ENGINE=Aria;
-ALTER TABLE time_zone_transition_type ENGINE=Aria;
+ALTER TABLE time_zone_transition ENGINE=Aria, ORDER BY Time_zone_id, Transition_time;
+ALTER TABLE time_zone_transition_type ENGINE=Aria, ORDER BY Time_zone_id, Transition_type_id;
 END IF|
 \d ;
 #
@@ -96,6 +108,10 @@ ALTER TABLE time_zone ENGINE=InnoDB;
 ALTER TABLE time_zone_name ENGINE=InnoDB;
 ALTER TABLE time_zone_transition ENGINE=InnoDB;
 ALTER TABLE time_zone_transition_type ENGINE=InnoDB;
+SELECT 'skip truncate tables';
+START TRANSACTION;
+ELSE
+SELECT 'skip truncate tables';
 END IF|
 \d ;
 INSERT INTO time_zone (Use_leap_seconds) VALUES ('N');
@@ -104,13 +120,15 @@ INSERT INTO time_zone_name (Name, Time_zone_id) VALUES ('XXX', @time_zone_id);
 INSERT INTO time_zone_transition_type (Time_zone_id, Transition_type_id, `Offset`, Is_DST, Abbreviation) VALUES
  (@time_zone_id, 0, 0, 0, 'GMT')
 ;
+UNLOCK TABLES;
+COMMIT;
 \d |
 IF (select count(*) from information_schema.global_variables where
 variable_name='wsrep_on' and variable_value='ON') = 1 THEN
 ALTER TABLE time_zone ENGINE=Aria;
 ALTER TABLE time_zone_name ENGINE=Aria;
-ALTER TABLE time_zone_transition ENGINE=Aria;
-ALTER TABLE time_zone_transition_type ENGINE=Aria;
+ALTER TABLE time_zone_transition ENGINE=Aria, ORDER BY Time_zone_id, Transition_time;
+ALTER TABLE time_zone_transition_type ENGINE=Aria, ORDER BY Time_zone_id, Transition_type_id;
 END IF|
 \d ;
 #
@@ -123,6 +141,10 @@ ALTER TABLE time_zone ENGINE=InnoDB;
 ALTER TABLE time_zone_name ENGINE=InnoDB;
 ALTER TABLE time_zone_transition ENGINE=InnoDB;
 ALTER TABLE time_zone_transition_type ENGINE=InnoDB;
+SELECT 'skip truncate tables';
+START TRANSACTION;
+ELSE
+SELECT 'skip truncate tables';
 END IF|
 \d ;
 \d |
@@ -139,12 +161,14 @@ ALTER TABLE time_zone_leap_second ENGINE=Aria;
 END IF|
 \d ;
 ALTER TABLE time_zone_leap_second ORDER BY Transition_time;
+UNLOCK TABLES;
+COMMIT;
 \d |
 IF (select count(*) from information_schema.global_variables where
 variable_name='wsrep_on' and variable_value='ON') = 1 THEN
 ALTER TABLE time_zone ENGINE=Aria;
 ALTER TABLE time_zone_name ENGINE=Aria;
-ALTER TABLE time_zone_transition ENGINE=Aria;
-ALTER TABLE time_zone_transition_type ENGINE=Aria;
+ALTER TABLE time_zone_transition ENGINE=Aria, ORDER BY Time_zone_id, Transition_time;
+ALTER TABLE time_zone_transition_type ENGINE=Aria, ORDER BY Time_zone_id, Transition_type_id;
 END IF|
 \d ;
diff --git a/mysql-test/suite/wsrep/r/mysql_tzinfo_to_sql_symlink_skip.result b/mysql-test/suite/wsrep/r/mysql_tzinfo_to_sql_symlink_skip.result
index e77afe0df75..1b1785347f3 100644
--- a/mysql-test/suite/wsrep/r/mysql_tzinfo_to_sql_symlink_skip.result
+++ b/mysql-test/suite/wsrep/r/mysql_tzinfo_to_sql_symlink_skip.result
@@ -9,7 +9,11 @@ TRUNCATE TABLE time_zone;
 TRUNCATE TABLE time_zone_name;
 TRUNCATE TABLE time_zone_transition;
 TRUNCATE TABLE time_zone_transition_type;
-START TRANSACTION;
+LOCK TABLES time_zone WRITE,
+  time_zone_leap_second WRITE,
+  time_zone_name WRITE,
+  time_zone_transition WRITE,
+  time_zone_transition_type WRITE;
 INSERT INTO time_zone (Use_leap_seconds) VALUES ('N');
 SET @time_zone_id= LAST_INSERT_ID();
 INSERT INTO time_zone_name (Name, Time_zone_id) VALUES ('GMT', @time_zone_id);
@@ -27,6 +31,7 @@ INSERT INTO time_zone_transition_type (Time_zone_id, Transition_type_id, `Offset
 Warning: Unable to load 'MYSQLTEST_VARDIR/zoneinfo/posix/garbage' as time zone. Skipping it.
 Warning: Unable to load 'MYSQLTEST_VARDIR/zoneinfo/posix/ignored.tab' as time zone. Skipping it.
 Warning: Skipping directory 'MYSQLTEST_VARDIR/zoneinfo/posix/posix': to avoid infinite symlink recursion.
+UNLOCK TABLES;
 COMMIT;
 ALTER TABLE time_zone_transition ORDER BY Time_zone_id, Transition_time;
 ALTER TABLE time_zone_transition_type ORDER BY Time_zone_id, Transition_type_id;
@@ -38,7 +43,11 @@ TRUNCATE TABLE time_zone;
 TRUNCATE TABLE time_zone_name;
 TRUNCATE TABLE time_zone_transition;
 TRUNCATE TABLE time_zone_transition_type;
-START TRANSACTION;
+LOCK TABLES time_zone WRITE,
+  time_zone_leap_second WRITE,
+  time_zone_name WRITE,
+  time_zone_transition WRITE,
+  time_zone_transition_type WRITE;
 INSERT INTO time_zone (Use_leap_seconds) VALUES ('N');
 SET @time_zone_id= LAST_INSERT_ID();
 INSERT INTO time_zone_name (Name, Time_zone_id) VALUES ('GMT', @time_zone_id);
@@ -53,6 +62,7 @@ INSERT INTO time_zone_transition_type (Time_zone_id, Transition_type_id, `Offset
  (@time_zone_id, 0, 0, 0, 'GMT')
 ;
 Warning: Unable to load 'MYSQLTEST_VARDIR/zoneinfo/posix/garbage' as time zone. Skipping it.
+UNLOCK TABLES;
 COMMIT;
 ALTER TABLE time_zone_transition ORDER BY Time_zone_id, Transition_time;
 ALTER TABLE time_zone_transition_type ORDER BY Time_zone_id, Transition_type_id;
@@ -62,17 +72,33 @@ ALTER TABLE time_zone_transition_type ORDER BY Time_zone_id, Transition_type_id;
 set @prep1=if((select count(*) from information_schema.global_variables where variable_name='wsrep_on' and variable_value='ON'), 'SET SESSION SQL_LOG_BIN=?, WSREP_ON=OFF;', 'do ?');
 prepare set_wsrep_write_binlog from @prep1;
 set @toggle=0; execute set_wsrep_write_binlog using @toggle;
+SELECT 'skip truncate tables';
+LOCK TABLES time_zone WRITE,
+  time_zone_leap_second WRITE,
+  time_zone_name WRITE,
+  time_zone_transition WRITE,
+  time_zone_transition_type WRITE;
 INSERT INTO time_zone (Use_leap_seconds) VALUES ('N');
 SET @time_zone_id= LAST_INSERT_ID();
 INSERT INTO time_zone_name (Name, Time_zone_id) VALUES ('XXX', @time_zone_id);
 INSERT INTO time_zone_transition_type (Time_zone_id, Transition_type_id, `Offset`, Is_DST, Abbreviation) VALUES
  (@time_zone_id, 0, 0, 0, 'GMT')
 ;
+UNLOCK TABLES;
+COMMIT;
 #
 # Testing --leap
 #
 set @prep1=if((select count(*) from information_schema.global_variables where variable_name='wsrep_on' and variable_value='ON'), 'SET SESSION SQL_LOG_BIN=?, WSREP_ON=OFF;', 'do ?');
 prepare set_wsrep_write_binlog from @prep1;
 set @toggle=0; execute set_wsrep_write_binlog using @toggle;
+SELECT 'skip truncate tables';
+LOCK TABLES time_zone WRITE,
+  time_zone_leap_second WRITE,
+  time_zone_name WRITE,
+  time_zone_transition WRITE,
+  time_zone_transition_type WRITE;
 TRUNCATE TABLE time_zone_leap_second;
 ALTER TABLE time_zone_leap_second ORDER BY Transition_time;
+UNLOCK TABLES;
+COMMIT;