diff --git a/mysql-test/main/information_schema.result b/mysql-test/main/information_schema.result
index 5f720a2aa663a..820c6c488efa8 100644
--- a/mysql-test/main/information_schema.result
+++ b/mysql-test/main/information_schema.result
@@ -1341,7 +1341,7 @@ table_schema='information_schema' and
 group by column_type order by num;
 column_type	group_concat(table_schema, '.', table_name)	num
 varchar(7)	information_schema.ROUTINES,information_schema.VIEWS,information_schema.SLAVE_STATUS	3
-varchar(20)	information_schema.ALL_PLUGINS,information_schema.ALL_PLUGINS,information_schema.ALL_PLUGINS,information_schema.FILES,information_schema.FILES,information_schema.PLUGINS,information_schema.PLUGINS,information_schema.PLUGINS,information_schema.PROFILING,information_schema.SLAVE_STATUS	10
+varchar(20)	information_schema.ALL_PLUGINS,information_schema.ALL_PLUGINS,information_schema.ALL_PLUGINS,information_schema.FILES,information_schema.FILES,information_schema.PLUGINS,information_schema.PLUGINS,information_schema.PLUGINS,information_schema.PROFILING	9
 create table t1(f1 char(1) not null, f2 char(9) not null)
 default character set utf8;
 select CHARACTER_MAXIMUM_LENGTH, CHARACTER_OCTET_LENGTH from
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 e5c938c1e480c..48635a34e91ff 100644
--- a/mysql-test/suite/funcs_1/r/is_columns_is.result
+++ b/mysql-test/suite/funcs_1/r/is_columns_is.result
@@ -392,21 +392,21 @@ def	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	2	NULL	NO	varchar	4096	1
 def	information_schema	SLAVE_STATUS	Connection_name	1	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL	NO	NO
 def	information_schema	SLAVE_STATUS	Connect_Retry	7	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10)			select		NEVER	NULL	NO	NO
 def	information_schema	SLAVE_STATUS	Executed_log_entries	59	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10) unsigned			select		NEVER	NULL	NO	NO
-def	information_schema	SLAVE_STATUS	Exec_Master_Log_Pos	24	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(10) unsigned			select		NEVER	NULL	NO	NO
-def	information_schema	SLAVE_STATUS	Gtid_IO_Pos	46	NULL	NO	varchar	1024	3072	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(1024)			select		NEVER	NULL	NO	NO
-def	information_schema	SLAVE_STATUS	Gtid_Slave_Pos	62	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL	NO	NO
-def	information_schema	SLAVE_STATUS	Last_Errno	21	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(4)			select		NEVER	NULL	NO	NO
-def	information_schema	SLAVE_STATUS	Last_Error	22	NULL	YES	varchar	20	60	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(20)			select		NEVER	NULL	NO	NO
-def	information_schema	SLAVE_STATUS	Last_IO_Errno	37	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(4)			select		NEVER	NULL	NO	NO
-def	information_schema	SLAVE_STATUS	Last_IO_Error	38	NULL	YES	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL	NO	NO
-def	information_schema	SLAVE_STATUS	Last_SQL_Errno	39	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(4)			select		NEVER	NULL	NO	NO
-def	information_schema	SLAVE_STATUS	Last_SQL_Error	40	NULL	YES	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL	NO	NO
+def	information_schema	SLAVE_STATUS	Exec_Master_Log_Pos	24	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select		NEVER	NULL	NO	NO
+def	information_schema	SLAVE_STATUS	Gtid_IO_Pos	46	NULL	NO	varchar	21844	65532	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(21844)			select		NEVER	NULL	NO	NO
+def	information_schema	SLAVE_STATUS	Gtid_Slave_Pos	62	NULL	NO	varchar	21844	65532	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(21844)			select		NEVER	NULL	NO	NO
+def	information_schema	SLAVE_STATUS	Last_Errno	21	NULL	NO	smallint	NULL	NULL	5	0	NULL	NULL	NULL	smallint(4) unsigned			select		NEVER	NULL	NO	NO
+def	information_schema	SLAVE_STATUS	Last_Error	22	NULL	YES	varchar	1024	3072	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(1024)			select		NEVER	NULL	NO	NO
+def	information_schema	SLAVE_STATUS	Last_IO_Errno	37	NULL	NO	smallint	NULL	NULL	5	0	NULL	NULL	NULL	smallint(4) unsigned			select		NEVER	NULL	NO	NO
+def	information_schema	SLAVE_STATUS	Last_IO_Error	38	NULL	YES	varchar	1024	3072	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(1024)			select		NEVER	NULL	NO	NO
+def	information_schema	SLAVE_STATUS	Last_SQL_Errno	39	NULL	NO	smallint	NULL	NULL	5	0	NULL	NULL	NULL	smallint(4) unsigned			select		NEVER	NULL	NO	NO
+def	information_schema	SLAVE_STATUS	Last_SQL_Error	40	NULL	YES	varchar	1024	3072	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(1024)			select		NEVER	NULL	NO	NO
 def	information_schema	SLAVE_STATUS	Master_Host	4	NULL	YES	varchar	255	765	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(255)			select		NEVER	NULL	NO	NO
 def	information_schema	SLAVE_STATUS	Master_last_event_time	63	NULL	YES	datetime	NULL	NULL	NULL	NULL	0	NULL	NULL	datetime			select		NEVER	NULL	NO	NO
 def	information_schema	SLAVE_STATUS	Master_Log_File	8	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL	NO	NO
-def	information_schema	SLAVE_STATUS	Master_Port	6	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(7) unsigned			select		NEVER	NULL	NO	NO
+def	information_schema	SLAVE_STATUS	Master_Port	6	NULL	NO	smallint	NULL	NULL	5	0	NULL	NULL	NULL	smallint(5) unsigned			select		NEVER	NULL	NO	NO
 def	information_schema	SLAVE_STATUS	Master_Server_Id	42	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10) unsigned			select		NEVER	NULL	NO	NO
-def	information_schema	SLAVE_STATUS	Master_Slave_time_diff	65	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(10)			select		NEVER	NULL	NO	NO
+def	information_schema	SLAVE_STATUS	Master_Slave_time_diff	65	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10)			select		NEVER	NULL	NO	NO
 def	information_schema	SLAVE_STATUS	Master_SSL_Allowed	29	NULL	YES	varchar	7	21	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(7)			select		NEVER	NULL	NO	NO
 def	information_schema	SLAVE_STATUS	Master_SSL_CA_File	30	NULL	YES	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL	NO	NO
 def	information_schema	SLAVE_STATUS	Master_SSL_CA_Path	31	NULL	YES	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL	NO	NO
@@ -417,25 +417,25 @@ def	information_schema	SLAVE_STATUS	Master_SSL_Crlpath	44	NULL	YES	varchar	512	1
 def	information_schema	SLAVE_STATUS	Master_SSL_Key	34	NULL	YES	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL	NO	NO
 def	information_schema	SLAVE_STATUS	Master_SSL_Verify_Server_Cert	36	NULL	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)			select		NEVER	NULL	NO	NO
 def	information_schema	SLAVE_STATUS	Master_User	5	NULL	YES	varchar	384	1152	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(384)			select		NEVER	NULL	NO	NO
-def	information_schema	SLAVE_STATUS	Max_relay_log_size	58	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(10) unsigned			select		NEVER	NULL	NO	NO
-def	information_schema	SLAVE_STATUS	Parallel_Mode	49	NULL	NO	varchar	15	45	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(15)			select		NEVER	NULL	NO	NO
-def	information_schema	SLAVE_STATUS	Read_Master_Log_Pos	9	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(10) unsigned			select		NEVER	NULL	NO	NO
+def	information_schema	SLAVE_STATUS	Max_relay_log_size	58	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10) unsigned			select		NEVER	NULL	NO	NO
+def	information_schema	SLAVE_STATUS	Parallel_Mode	49	NULL	NO	varchar	12	36	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(12)			select		NEVER	NULL	NO	NO
+def	information_schema	SLAVE_STATUS	Read_Master_Log_Pos	9	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select		NEVER	NULL	NO	NO
 def	information_schema	SLAVE_STATUS	Relay_Log_File	10	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL	NO	NO
-def	information_schema	SLAVE_STATUS	Relay_Log_Pos	11	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(10) unsigned			select		NEVER	NULL	NO	NO
-def	information_schema	SLAVE_STATUS	Relay_Log_Space	25	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(10) unsigned			select		NEVER	NULL	NO	NO
+def	information_schema	SLAVE_STATUS	Relay_Log_Pos	11	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select		NEVER	NULL	NO	NO
+def	information_schema	SLAVE_STATUS	Relay_Log_Space	25	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select		NEVER	NULL	NO	NO
 def	information_schema	SLAVE_STATUS	Relay_Master_Log_File	12	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL	NO	NO
-def	information_schema	SLAVE_STATUS	Replicate_Do_DB	15	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL	NO	NO
-def	information_schema	SLAVE_STATUS	Replicate_Do_Domain_Ids	47	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL	NO	NO
-def	information_schema	SLAVE_STATUS	Replicate_Do_Table	17	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL	NO	NO
-def	information_schema	SLAVE_STATUS	Replicate_Ignore_DB	16	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL	NO	NO
-def	information_schema	SLAVE_STATUS	Replicate_Ignore_Domain_Ids	48	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL	NO	NO
-def	information_schema	SLAVE_STATUS	Replicate_Ignore_Server_Ids	41	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL	NO	NO
-def	information_schema	SLAVE_STATUS	Replicate_Ignore_Table	18	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL	NO	NO
-def	information_schema	SLAVE_STATUS	Replicate_Rewrite_DB	56	NULL	NO	varchar	1024	3072	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(1024)			select		NEVER	NULL	NO	NO
-def	information_schema	SLAVE_STATUS	Replicate_Wild_Do_Table	19	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL	NO	NO
-def	information_schema	SLAVE_STATUS	Replicate_Wild_Ignore_Table	20	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL	NO	NO
+def	information_schema	SLAVE_STATUS	Replicate_Do_DB	15	NULL	NO	varchar	21844	65532	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(21844)			select		NEVER	NULL	NO	NO
+def	information_schema	SLAVE_STATUS	Replicate_Do_Domain_Ids	47	NULL	NO	varchar	21844	65532	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(21844)			select		NEVER	NULL	NO	NO
+def	information_schema	SLAVE_STATUS	Replicate_Do_Table	17	NULL	NO	varchar	21844	65532	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(21844)			select		NEVER	NULL	NO	NO
+def	information_schema	SLAVE_STATUS	Replicate_Ignore_DB	16	NULL	NO	varchar	21844	65532	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(21844)			select		NEVER	NULL	NO	NO
+def	information_schema	SLAVE_STATUS	Replicate_Ignore_Domain_Ids	48	NULL	NO	varchar	21844	65532	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(21844)			select		NEVER	NULL	NO	NO
+def	information_schema	SLAVE_STATUS	Replicate_Ignore_Server_Ids	41	NULL	NO	varchar	21844	65532	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(21844)			select		NEVER	NULL	NO	NO
+def	information_schema	SLAVE_STATUS	Replicate_Ignore_Table	18	NULL	NO	varchar	21844	65532	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(21844)			select		NEVER	NULL	NO	NO
+def	information_schema	SLAVE_STATUS	Replicate_Rewrite_DB	56	NULL	NO	varchar	21844	65532	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(21844)			select		NEVER	NULL	NO	NO
+def	information_schema	SLAVE_STATUS	Replicate_Wild_Do_Table	19	NULL	NO	varchar	21844	65532	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(21844)			select		NEVER	NULL	NO	NO
+def	information_schema	SLAVE_STATUS	Replicate_Wild_Ignore_Table	20	NULL	NO	varchar	21844	65532	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(21844)			select		NEVER	NULL	NO	NO
 def	information_schema	SLAVE_STATUS	Retried_transactions	57	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10) unsigned			select		NEVER	NULL	NO	NO
-def	information_schema	SLAVE_STATUS	Seconds_Behind_Master	35	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(10)			select		NEVER	NULL	NO	NO
+def	information_schema	SLAVE_STATUS	Seconds_Behind_Master	35	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select		NEVER	NULL	NO	NO
 def	information_schema	SLAVE_STATUS	Skip_Counter	23	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10) unsigned			select		NEVER	NULL	NO	NO
 def	information_schema	SLAVE_STATUS	Slave_DDL_Groups	53	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select		NEVER	NULL	NO	NO
 def	information_schema	SLAVE_STATUS	Slave_heartbeat_period	61	NULL	NO	float	NULL	NULL	9	3	NULL	NULL	NULL	float(9,3)			select		NEVER	NULL	NO	NO
@@ -445,15 +445,15 @@ def	information_schema	SLAVE_STATUS	Slave_last_event_time	64	NULL	YES	datetime	N
 def	information_schema	SLAVE_STATUS	Slave_Non_Transactional_Groups	54	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select		NEVER	NULL	NO	NO
 def	information_schema	SLAVE_STATUS	Slave_received_heartbeats	60	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10) unsigned			select		NEVER	NULL	NO	NO
 def	information_schema	SLAVE_STATUS	Slave_SQL_Running	14	NULL	NO	varchar	3	9	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(3)			select		NEVER	NULL	NO	NO
-def	information_schema	SLAVE_STATUS	Slave_SQL_Running_State	52	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL	NO	NO
+def	information_schema	SLAVE_STATUS	Slave_SQL_Running_State	52	NULL	YES	varchar	21844	65532	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(21844)			select		NEVER	NULL	NO	NO
 def	information_schema	SLAVE_STATUS	Slave_SQL_State	2	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(64)			select		NEVER	NULL	NO	NO
 def	information_schema	SLAVE_STATUS	Slave_Transactional_Groups	55	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select		NEVER	NULL	NO	NO
 def	information_schema	SLAVE_STATUS	SQL_Delay	50	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10) unsigned			select		NEVER	NULL	NO	NO
 def	information_schema	SLAVE_STATUS	SQL_Remaining_Delay	51	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10) unsigned			select		NEVER	NULL	NO	NO
 def	information_schema	SLAVE_STATUS	Until_Condition	26	NULL	NO	varchar	6	18	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(6)			select		NEVER	NULL	NO	NO
 def	information_schema	SLAVE_STATUS	Until_Log_File	27	NULL	YES	varchar	512	1536	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(512)			select		NEVER	NULL	NO	NO
-def	information_schema	SLAVE_STATUS	Until_Log_Pos	28	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(10) unsigned			select		NEVER	NULL	NO	NO
-def	information_schema	SLAVE_STATUS	Using_Gtid	45	NULL	YES	varchar	15	45	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(15)			select		NEVER	NULL	NO	NO
+def	information_schema	SLAVE_STATUS	Until_Log_Pos	28	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select		NEVER	NULL	NO	NO
+def	information_schema	SLAVE_STATUS	Using_Gtid	45	NULL	YES	varchar	11	33	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(11)			select		NEVER	NULL	NO	NO
 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	NO	NO
 def	information_schema	SPATIAL_REF_SYS	AUTH_SRID	3	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(5)			select		NEVER	NULL	NO	NO
 def	information_schema	SPATIAL_REF_SYS	SRID	1	NULL	NO	smallint	NULL	NULL	5	0	NULL	NULL	NULL	smallint(5)			select		NEVER	NULL	NO	NO
@@ -1069,66 +1069,66 @@ NULL	information_schema	SEQUENCES	INCREMENT	bigint	NULL	NULL	NULL	NULL	bigint(21
 3.0000	information_schema	SLAVE_STATUS	Slave_IO_State	varchar	64	192	utf8mb3	utf8mb3_general_ci	varchar(64)
 3.0000	information_schema	SLAVE_STATUS	Master_Host	varchar	255	765	utf8mb3	utf8mb3_general_ci	varchar(255)
 3.0000	information_schema	SLAVE_STATUS	Master_User	varchar	384	1152	utf8mb3	utf8mb3_general_ci	varchar(384)
-NULL	information_schema	SLAVE_STATUS	Master_Port	int	NULL	NULL	NULL	NULL	int(7) unsigned
+NULL	information_schema	SLAVE_STATUS	Master_Port	smallint	NULL	NULL	NULL	NULL	smallint(5) unsigned
 NULL	information_schema	SLAVE_STATUS	Connect_Retry	int	NULL	NULL	NULL	NULL	int(10)
 3.0000	information_schema	SLAVE_STATUS	Master_Log_File	varchar	512	1536	utf8mb3	utf8mb3_general_ci	varchar(512)
-NULL	information_schema	SLAVE_STATUS	Read_Master_Log_Pos	bigint	NULL	NULL	NULL	NULL	bigint(10) unsigned
+NULL	information_schema	SLAVE_STATUS	Read_Master_Log_Pos	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
 3.0000	information_schema	SLAVE_STATUS	Relay_Log_File	varchar	512	1536	utf8mb3	utf8mb3_general_ci	varchar(512)
-NULL	information_schema	SLAVE_STATUS	Relay_Log_Pos	bigint	NULL	NULL	NULL	NULL	bigint(10) unsigned
+NULL	information_schema	SLAVE_STATUS	Relay_Log_Pos	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
 3.0000	information_schema	SLAVE_STATUS	Relay_Master_Log_File	varchar	512	1536	utf8mb3	utf8mb3_general_ci	varchar(512)
 3.0000	information_schema	SLAVE_STATUS	Slave_IO_Running	varchar	10	30	utf8mb3	utf8mb3_general_ci	varchar(10)
 3.0000	information_schema	SLAVE_STATUS	Slave_SQL_Running	varchar	3	9	utf8mb3	utf8mb3_general_ci	varchar(3)
-3.0000	information_schema	SLAVE_STATUS	Replicate_Do_DB	varchar	64	192	utf8mb3	utf8mb3_general_ci	varchar(64)
-3.0000	information_schema	SLAVE_STATUS	Replicate_Ignore_DB	varchar	64	192	utf8mb3	utf8mb3_general_ci	varchar(64)
-3.0000	information_schema	SLAVE_STATUS	Replicate_Do_Table	varchar	64	192	utf8mb3	utf8mb3_general_ci	varchar(64)
-3.0000	information_schema	SLAVE_STATUS	Replicate_Ignore_Table	varchar	64	192	utf8mb3	utf8mb3_general_ci	varchar(64)
-3.0000	information_schema	SLAVE_STATUS	Replicate_Wild_Do_Table	varchar	64	192	utf8mb3	utf8mb3_general_ci	varchar(64)
-3.0000	information_schema	SLAVE_STATUS	Replicate_Wild_Ignore_Table	varchar	64	192	utf8mb3	utf8mb3_general_ci	varchar(64)
-NULL	information_schema	SLAVE_STATUS	Last_Errno	int	NULL	NULL	NULL	NULL	int(4)
-3.0000	information_schema	SLAVE_STATUS	Last_Error	varchar	20	60	utf8mb3	utf8mb3_general_ci	varchar(20)
+3.0000	information_schema	SLAVE_STATUS	Replicate_Do_DB	varchar	21844	65532	utf8mb3	utf8mb3_general_ci	varchar(21844)
+3.0000	information_schema	SLAVE_STATUS	Replicate_Ignore_DB	varchar	21844	65532	utf8mb3	utf8mb3_general_ci	varchar(21844)
+3.0000	information_schema	SLAVE_STATUS	Replicate_Do_Table	varchar	21844	65532	utf8mb3	utf8mb3_general_ci	varchar(21844)
+3.0000	information_schema	SLAVE_STATUS	Replicate_Ignore_Table	varchar	21844	65532	utf8mb3	utf8mb3_general_ci	varchar(21844)
+3.0000	information_schema	SLAVE_STATUS	Replicate_Wild_Do_Table	varchar	21844	65532	utf8mb3	utf8mb3_general_ci	varchar(21844)
+3.0000	information_schema	SLAVE_STATUS	Replicate_Wild_Ignore_Table	varchar	21844	65532	utf8mb3	utf8mb3_general_ci	varchar(21844)
+NULL	information_schema	SLAVE_STATUS	Last_Errno	smallint	NULL	NULL	NULL	NULL	smallint(4) unsigned
+3.0000	information_schema	SLAVE_STATUS	Last_Error	varchar	1024	3072	utf8mb3	utf8mb3_general_ci	varchar(1024)
 NULL	information_schema	SLAVE_STATUS	Skip_Counter	int	NULL	NULL	NULL	NULL	int(10) unsigned
-NULL	information_schema	SLAVE_STATUS	Exec_Master_Log_Pos	bigint	NULL	NULL	NULL	NULL	bigint(10) unsigned
-NULL	information_schema	SLAVE_STATUS	Relay_Log_Space	bigint	NULL	NULL	NULL	NULL	bigint(10) unsigned
+NULL	information_schema	SLAVE_STATUS	Exec_Master_Log_Pos	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
+NULL	information_schema	SLAVE_STATUS	Relay_Log_Space	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
 3.0000	information_schema	SLAVE_STATUS	Until_Condition	varchar	6	18	utf8mb3	utf8mb3_general_ci	varchar(6)
 3.0000	information_schema	SLAVE_STATUS	Until_Log_File	varchar	512	1536	utf8mb3	utf8mb3_general_ci	varchar(512)
-NULL	information_schema	SLAVE_STATUS	Until_Log_Pos	bigint	NULL	NULL	NULL	NULL	bigint(10) unsigned
+NULL	information_schema	SLAVE_STATUS	Until_Log_Pos	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
 3.0000	information_schema	SLAVE_STATUS	Master_SSL_Allowed	varchar	7	21	utf8mb3	utf8mb3_general_ci	varchar(7)
 3.0000	information_schema	SLAVE_STATUS	Master_SSL_CA_File	varchar	512	1536	utf8mb3	utf8mb3_general_ci	varchar(512)
 3.0000	information_schema	SLAVE_STATUS	Master_SSL_CA_Path	varchar	512	1536	utf8mb3	utf8mb3_general_ci	varchar(512)
 3.0000	information_schema	SLAVE_STATUS	Master_SSL_Cert	varchar	512	1536	utf8mb3	utf8mb3_general_ci	varchar(512)
 3.0000	information_schema	SLAVE_STATUS	Master_SSL_Cipher	varchar	512	1536	utf8mb3	utf8mb3_general_ci	varchar(512)
 3.0000	information_schema	SLAVE_STATUS	Master_SSL_Key	varchar	512	1536	utf8mb3	utf8mb3_general_ci	varchar(512)
-NULL	information_schema	SLAVE_STATUS	Seconds_Behind_Master	bigint	NULL	NULL	NULL	NULL	bigint(10)
+NULL	information_schema	SLAVE_STATUS	Seconds_Behind_Master	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
 3.0000	information_schema	SLAVE_STATUS	Master_SSL_Verify_Server_Cert	varchar	3	9	utf8mb3	utf8mb3_general_ci	varchar(3)
-NULL	information_schema	SLAVE_STATUS	Last_IO_Errno	int	NULL	NULL	NULL	NULL	int(4)
-3.0000	information_schema	SLAVE_STATUS	Last_IO_Error	varchar	512	1536	utf8mb3	utf8mb3_general_ci	varchar(512)
-NULL	information_schema	SLAVE_STATUS	Last_SQL_Errno	int	NULL	NULL	NULL	NULL	int(4)
-3.0000	information_schema	SLAVE_STATUS	Last_SQL_Error	varchar	512	1536	utf8mb3	utf8mb3_general_ci	varchar(512)
-3.0000	information_schema	SLAVE_STATUS	Replicate_Ignore_Server_Ids	varchar	512	1536	utf8mb3	utf8mb3_general_ci	varchar(512)
+NULL	information_schema	SLAVE_STATUS	Last_IO_Errno	smallint	NULL	NULL	NULL	NULL	smallint(4) unsigned
+3.0000	information_schema	SLAVE_STATUS	Last_IO_Error	varchar	1024	3072	utf8mb3	utf8mb3_general_ci	varchar(1024)
+NULL	information_schema	SLAVE_STATUS	Last_SQL_Errno	smallint	NULL	NULL	NULL	NULL	smallint(4) unsigned
+3.0000	information_schema	SLAVE_STATUS	Last_SQL_Error	varchar	1024	3072	utf8mb3	utf8mb3_general_ci	varchar(1024)
+3.0000	information_schema	SLAVE_STATUS	Replicate_Ignore_Server_Ids	varchar	21844	65532	utf8mb3	utf8mb3_general_ci	varchar(21844)
 NULL	information_schema	SLAVE_STATUS	Master_Server_Id	int	NULL	NULL	NULL	NULL	int(10) unsigned
 3.0000	information_schema	SLAVE_STATUS	Master_SSL_Crl	varchar	512	1536	utf8mb3	utf8mb3_general_ci	varchar(512)
 3.0000	information_schema	SLAVE_STATUS	Master_SSL_Crlpath	varchar	512	1536	utf8mb3	utf8mb3_general_ci	varchar(512)
-3.0000	information_schema	SLAVE_STATUS	Using_Gtid	varchar	15	45	utf8mb3	utf8mb3_general_ci	varchar(15)
-3.0000	information_schema	SLAVE_STATUS	Gtid_IO_Pos	varchar	1024	3072	utf8mb3	utf8mb3_general_ci	varchar(1024)
-3.0000	information_schema	SLAVE_STATUS	Replicate_Do_Domain_Ids	varchar	512	1536	utf8mb3	utf8mb3_general_ci	varchar(512)
-3.0000	information_schema	SLAVE_STATUS	Replicate_Ignore_Domain_Ids	varchar	512	1536	utf8mb3	utf8mb3_general_ci	varchar(512)
-3.0000	information_schema	SLAVE_STATUS	Parallel_Mode	varchar	15	45	utf8mb3	utf8mb3_general_ci	varchar(15)
+3.0000	information_schema	SLAVE_STATUS	Using_Gtid	varchar	11	33	utf8mb3	utf8mb3_general_ci	varchar(11)
+3.0000	information_schema	SLAVE_STATUS	Gtid_IO_Pos	varchar	21844	65532	utf8mb3	utf8mb3_general_ci	varchar(21844)
+3.0000	information_schema	SLAVE_STATUS	Replicate_Do_Domain_Ids	varchar	21844	65532	utf8mb3	utf8mb3_general_ci	varchar(21844)
+3.0000	information_schema	SLAVE_STATUS	Replicate_Ignore_Domain_Ids	varchar	21844	65532	utf8mb3	utf8mb3_general_ci	varchar(21844)
+3.0000	information_schema	SLAVE_STATUS	Parallel_Mode	varchar	12	36	utf8mb3	utf8mb3_general_ci	varchar(12)
 NULL	information_schema	SLAVE_STATUS	SQL_Delay	int	NULL	NULL	NULL	NULL	int(10) unsigned
 NULL	information_schema	SLAVE_STATUS	SQL_Remaining_Delay	int	NULL	NULL	NULL	NULL	int(10) unsigned
-3.0000	information_schema	SLAVE_STATUS	Slave_SQL_Running_State	varchar	64	192	utf8mb3	utf8mb3_general_ci	varchar(64)
+3.0000	information_schema	SLAVE_STATUS	Slave_SQL_Running_State	varchar	21844	65532	utf8mb3	utf8mb3_general_ci	varchar(21844)
 NULL	information_schema	SLAVE_STATUS	Slave_DDL_Groups	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
 NULL	information_schema	SLAVE_STATUS	Slave_Non_Transactional_Groups	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
 NULL	information_schema	SLAVE_STATUS	Slave_Transactional_Groups	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
-3.0000	information_schema	SLAVE_STATUS	Replicate_Rewrite_DB	varchar	1024	3072	utf8mb3	utf8mb3_general_ci	varchar(1024)
+3.0000	information_schema	SLAVE_STATUS	Replicate_Rewrite_DB	varchar	21844	65532	utf8mb3	utf8mb3_general_ci	varchar(21844)
 NULL	information_schema	SLAVE_STATUS	Retried_transactions	int	NULL	NULL	NULL	NULL	int(10) unsigned
-NULL	information_schema	SLAVE_STATUS	Max_relay_log_size	bigint	NULL	NULL	NULL	NULL	bigint(10) unsigned
+NULL	information_schema	SLAVE_STATUS	Max_relay_log_size	int	NULL	NULL	NULL	NULL	int(10) unsigned
 NULL	information_schema	SLAVE_STATUS	Executed_log_entries	int	NULL	NULL	NULL	NULL	int(10) unsigned
 NULL	information_schema	SLAVE_STATUS	Slave_received_heartbeats	int	NULL	NULL	NULL	NULL	int(10) unsigned
 NULL	information_schema	SLAVE_STATUS	Slave_heartbeat_period	float	NULL	NULL	NULL	NULL	float(9,3)
-3.0000	information_schema	SLAVE_STATUS	Gtid_Slave_Pos	varchar	512	1536	utf8mb3	utf8mb3_general_ci	varchar(512)
+3.0000	information_schema	SLAVE_STATUS	Gtid_Slave_Pos	varchar	21844	65532	utf8mb3	utf8mb3_general_ci	varchar(21844)
 NULL	information_schema	SLAVE_STATUS	Master_last_event_time	datetime	NULL	NULL	NULL	NULL	datetime
 NULL	information_schema	SLAVE_STATUS	Slave_last_event_time	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	information_schema	SLAVE_STATUS	Master_Slave_time_diff	bigint	NULL	NULL	NULL	NULL	bigint(10)
+NULL	information_schema	SLAVE_STATUS	Master_Slave_time_diff	int	NULL	NULL	NULL	NULL	int(10)
 NULL	information_schema	SPATIAL_REF_SYS	SRID	smallint	NULL	NULL	NULL	NULL	smallint(5)
 3.0000	information_schema	SPATIAL_REF_SYS	AUTH_NAME	varchar	512	1536	utf8mb3	utf8mb3_general_ci	varchar(512)
 NULL	information_schema	SPATIAL_REF_SYS	AUTH_SRID	int	NULL	NULL	NULL	NULL	int(5)
diff --git a/mysql-test/suite/sys_vars/r/replicate_do_db_basic.result b/mysql-test/suite/sys_vars/r/replicate_do_db_basic.result
index 54adf8359625b..26489a833449c 100644
--- a/mysql-test/suite/sys_vars/r/replicate_do_db_basic.result
+++ b/mysql-test/suite/sys_vars/r/replicate_do_db_basic.result
@@ -1,3 +1,4 @@
+CHANGE MASTER TO master_host='127.0.0.1', master_user='root', master_ssl_verify_server_cert=0;
 #
 # Basic testing of replicate_do_db.
 #
@@ -17,6 +18,20 @@ SET @@GLOBAL.replicate_do_db=1.1;
 ERROR 42000: Incorrect argument type to variable 'replicate_do_db'
 SET @@GLOBAL.replicate_do_db=1e1;
 ERROR 42000: Incorrect argument type to variable 'replicate_do_db'
+# Argument size acceptance.
+SELECT GROUP_CONCAT(CONCAT("database_name_", seq) SEPARATOR ",")
+INTO @name FROM seq_1_to_8;
+SELECT LENGTH(@name);
+LENGTH(@name)
+127
+SET @@GLOBAL.replicate_do_db= @name;
+SELECT @@GLOBAL.replicate_do_db;
+@@GLOBAL.replicate_do_db
+database_name_1,database_name_2,database_name_3,database_name_4,database_name_5,database_name_6,database_name_7,database_name_8
+SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='replicate_do_db';
+VARIABLE_VALUE
+database_name_1,database_name_2,database_name_3,database_name_4,database_name_5,database_name_6,database_name_7,database_name_8
+Replicate_Do_DB = 'database_name_1,database_name_2,database_name_3,database_name_4,database_name_5,database_name_6,database_name_7,database_name_8'
 # Argument syntax.
 SET @@GLOBAL.replicate_do_db="db1,,,,,db3";
 SELECT @@GLOBAL.replicate_do_db;
@@ -25,6 +40,7 @@ db1,db3
 SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='replicate_do_db';
 VARIABLE_NAME	VARIABLE_VALUE
 REPLICATE_DO_DB	db1,db3
+Replicate_Do_DB = 'db1,db3'
 SET @@GLOBAL.replicate_do_db="db1,,,db2,,,db3";
 SELECT @@GLOBAL.replicate_do_db;
 @@GLOBAL.replicate_do_db
diff --git a/mysql-test/suite/sys_vars/r/replicate_do_table_basic.result b/mysql-test/suite/sys_vars/r/replicate_do_table_basic.result
index e67b1eeca0162..85aff814e3a11 100644
--- a/mysql-test/suite/sys_vars/r/replicate_do_table_basic.result
+++ b/mysql-test/suite/sys_vars/r/replicate_do_table_basic.result
@@ -1,3 +1,4 @@
+CHANGE MASTER TO master_host='127.0.0.1', master_user='root', master_ssl_verify_server_cert=0;
 #
 # Basic testing of replicate_do_table.
 #
@@ -24,6 +25,20 @@ SET @@GLOBAL.replicate_do_table="test.t1, t2";
 ERROR HY000: Incorrect arguments to SET
 SET @@GLOBAL.replicate_do_table="test.,t1";
 ERROR HY000: Incorrect arguments to SET
+# Argument size acceptance.
+SELECT GROUP_CONCAT(CONCAT("database_name.long_table_name_", seq) SEPARATOR ",")
+INTO @name FROM seq_1_to_8;
+SELECT LENGTH(@name);
+LENGTH(@name)
+255
+SET @@GLOBAL.replicate_do_table= @name;
+SELECT @@GLOBAL.replicate_do_table;
+@@GLOBAL.replicate_do_table
+database_name.long_table_name_5,database_name.long_table_name_1,database_name.long_table_name_6,database_name.long_table_name_2,database_name.long_table_name_7,database_name.long_table_name_3,database_name.long_table_name_8,database_name.long_table_name_4
+SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='replicate_do_table';
+VARIABLE_VALUE
+database_name.long_table_name_5,database_name.long_table_name_1,database_name.long_table_name_6,database_name.long_table_name_2,database_name.long_table_name_7,database_name.long_table_name_3,database_name.long_table_name_8,database_name.long_table_name_4
+Replicate_Do_Table = 'database_name.long_table_name_5,database_name.long_table_name_1,database_name.long_table_name_6,database_name.long_table_name_2,database_name.long_table_name_7,database_name.long_table_name_3,database_name.long_table_name_8,database_name.long_table_name_4'
 # Argument syntax.
 SET @@GLOBAL.replicate_do_table="test.t1,,,,,test.t3";
 SELECT @@GLOBAL.replicate_do_table;
@@ -32,6 +47,7 @@ test.t3,test.t1
 SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='replicate_do_table';
 VARIABLE_NAME	VARIABLE_VALUE
 REPLICATE_DO_TABLE	test.t3,test.t1
+Replicate_Do_Table = 'test.t3,test.t1'
 SET @@GLOBAL.replicate_do_table="test.t1,,,test2.t2,,,test.t3";
 SELECT @@GLOBAL.replicate_do_table;
 @@GLOBAL.replicate_do_table
diff --git a/mysql-test/suite/sys_vars/r/replicate_ignore_db_basic.result b/mysql-test/suite/sys_vars/r/replicate_ignore_db_basic.result
index c7ff697b34f8a..219bee0649d35 100644
--- a/mysql-test/suite/sys_vars/r/replicate_ignore_db_basic.result
+++ b/mysql-test/suite/sys_vars/r/replicate_ignore_db_basic.result
@@ -1,3 +1,4 @@
+CHANGE MASTER TO master_host='127.0.0.1', master_user='root', master_ssl_verify_server_cert=0;
 #
 # Basic testing of replicate_ignore_db.
 #
@@ -17,6 +18,20 @@ SET @@GLOBAL.replicate_ignore_db=1.1;
 ERROR 42000: Incorrect argument type to variable 'replicate_ignore_db'
 SET @@GLOBAL.replicate_ignore_db=1e1;
 ERROR 42000: Incorrect argument type to variable 'replicate_ignore_db'
+# Argument size acceptance.
+SELECT GROUP_CONCAT(CONCAT("database_name_", seq) SEPARATOR ",")
+INTO @name FROM seq_1_to_8;
+SELECT LENGTH(@name);
+LENGTH(@name)
+127
+SET @@GLOBAL.replicate_ignore_db= @name;
+SELECT @@GLOBAL.replicate_ignore_db;
+@@GLOBAL.replicate_ignore_db
+database_name_1,database_name_2,database_name_3,database_name_4,database_name_5,database_name_6,database_name_7,database_name_8
+SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='replicate_ignore_db';
+VARIABLE_VALUE
+database_name_1,database_name_2,database_name_3,database_name_4,database_name_5,database_name_6,database_name_7,database_name_8
+Replicate_Ignore_DB = 'database_name_1,database_name_2,database_name_3,database_name_4,database_name_5,database_name_6,database_name_7,database_name_8'
 # Argument syntax.
 SET @@GLOBAL.replicate_ignore_db="db1,,,,,db3";
 SELECT @@GLOBAL.replicate_ignore_db;
@@ -25,6 +40,7 @@ db1,db3
 SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='replicate_ignore_db';
 VARIABLE_NAME	VARIABLE_VALUE
 REPLICATE_IGNORE_DB	db1,db3
+Replicate_Ignore_DB = 'db1,db3'
 SET @@GLOBAL.replicate_ignore_db="db1,,,db2,,,db3";
 SELECT @@GLOBAL.replicate_ignore_db;
 @@GLOBAL.replicate_ignore_db
diff --git a/mysql-test/suite/sys_vars/r/replicate_ignore_table_basic.result b/mysql-test/suite/sys_vars/r/replicate_ignore_table_basic.result
index a1701635f0e1f..44743223e8f38 100644
--- a/mysql-test/suite/sys_vars/r/replicate_ignore_table_basic.result
+++ b/mysql-test/suite/sys_vars/r/replicate_ignore_table_basic.result
@@ -1,3 +1,4 @@
+CHANGE MASTER TO master_host='127.0.0.1', master_user='root', master_ssl_verify_server_cert=0;
 #
 # Basic testing of replicate_ignore_table.
 #
@@ -24,6 +25,20 @@ SET @@GLOBAL.replicate_ignore_table="test.t1, t2";
 ERROR HY000: Incorrect arguments to SET
 SET @@GLOBAL.replicate_ignore_table="test.,t1";
 ERROR HY000: Incorrect arguments to SET
+# Argument size acceptance.
+SELECT GROUP_CONCAT(CONCAT("database_name.long_table_name_", seq) SEPARATOR ",")
+INTO @name FROM seq_1_to_8;
+SELECT LENGTH(@name);
+LENGTH(@name)
+255
+SET @@GLOBAL.replicate_ignore_table= @name;
+SELECT @@GLOBAL.replicate_ignore_table;
+@@GLOBAL.replicate_ignore_table
+database_name.long_table_name_5,database_name.long_table_name_1,database_name.long_table_name_6,database_name.long_table_name_2,database_name.long_table_name_7,database_name.long_table_name_3,database_name.long_table_name_8,database_name.long_table_name_4
+SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='replicate_ignore_table';
+VARIABLE_VALUE
+database_name.long_table_name_5,database_name.long_table_name_1,database_name.long_table_name_6,database_name.long_table_name_2,database_name.long_table_name_7,database_name.long_table_name_3,database_name.long_table_name_8,database_name.long_table_name_4
+Replicate_Ignore_Table = 'database_name.long_table_name_5,database_name.long_table_name_1,database_name.long_table_name_6,database_name.long_table_name_2,database_name.long_table_name_7,database_name.long_table_name_3,database_name.long_table_name_8,database_name.long_table_name_4'
 # Argument syntax.
 SET @@GLOBAL.replicate_ignore_table="test.t1,,,,,test.t3";
 SELECT @@GLOBAL.replicate_ignore_table;
@@ -32,6 +47,7 @@ test.t3,test.t1
 SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='replicate_ignore_table';
 VARIABLE_NAME	VARIABLE_VALUE
 REPLICATE_IGNORE_TABLE	test.t3,test.t1
+Replicate_Ignore_Table = 'test.t3,test.t1'
 SET @@GLOBAL.replicate_ignore_table="test.t1,,,test2.t2,,,test.t3";
 SELECT @@GLOBAL.replicate_ignore_table;
 @@GLOBAL.replicate_ignore_table
diff --git a/mysql-test/suite/sys_vars/r/replicate_wild_do_table_basic.result b/mysql-test/suite/sys_vars/r/replicate_wild_do_table_basic.result
index 8c55103080f52..ecec3cc03a316 100644
--- a/mysql-test/suite/sys_vars/r/replicate_wild_do_table_basic.result
+++ b/mysql-test/suite/sys_vars/r/replicate_wild_do_table_basic.result
@@ -1,3 +1,4 @@
+CHANGE MASTER TO master_host='127.0.0.1', master_user='root', master_ssl_verify_server_cert=0;
 #
 # Basic testing of replicate_wild_do_table.
 #
@@ -24,6 +25,20 @@ SET @@GLOBAL.replicate_wild_do_table="test.t, t2";
 ERROR HY000: Incorrect arguments to SET
 SET @@GLOBAL.replicate_wild_do_table="test.,t1";
 ERROR HY000: Incorrect arguments to SET
+# Argument size acceptance.
+SELECT GROUP_CONCAT(CONCAT("database_name.long_table_name_", seq) SEPARATOR ",")
+INTO @name FROM seq_1_to_8;
+SELECT LENGTH(@name);
+LENGTH(@name)
+255
+SET @@GLOBAL.replicate_wild_do_table= @name;
+SELECT @@GLOBAL.replicate_wild_do_table;
+@@GLOBAL.replicate_wild_do_table
+database_name.long_table_name_1,database_name.long_table_name_2,database_name.long_table_name_3,database_name.long_table_name_4,database_name.long_table_name_5,database_name.long_table_name_6,database_name.long_table_name_7,database_name.long_table_name_8
+SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='replicate_wild_do_table';
+VARIABLE_VALUE
+database_name.long_table_name_1,database_name.long_table_name_2,database_name.long_table_name_3,database_name.long_table_name_4,database_name.long_table_name_5,database_name.long_table_name_6,database_name.long_table_name_7,database_name.long_table_name_8
+Replicate_Wild_Do_Table = 'database_name.long_table_name_1,database_name.long_table_name_2,database_name.long_table_name_3,database_name.long_table_name_4,database_name.long_table_name_5,database_name.long_table_name_6,database_name.long_table_name_7,database_name.long_table_name_8'
 # Argument syntax.
 SET @@GLOBAL.replicate_wild_do_table="test.%,,,,,test.t3";
 SELECT @@GLOBAL.replicate_wild_do_table;
@@ -32,6 +47,7 @@ test.%,test.t3
 SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='replicate_wild_do_table';
 VARIABLE_NAME	VARIABLE_VALUE
 REPLICATE_WILD_DO_TABLE	test.%,test.t3
+Replicate_Wild_Do_Table = 'test.%,test.t3'
 SET @@GLOBAL.replicate_wild_do_table="test.t1,,,test2.%,,,test.t3";
 SELECT @@GLOBAL.replicate_wild_do_table;
 @@GLOBAL.replicate_wild_do_table
diff --git a/mysql-test/suite/sys_vars/r/replicate_wild_ignore_table_basic.result b/mysql-test/suite/sys_vars/r/replicate_wild_ignore_table_basic.result
index 0f46ce3880556..693aa257e4dda 100644
--- a/mysql-test/suite/sys_vars/r/replicate_wild_ignore_table_basic.result
+++ b/mysql-test/suite/sys_vars/r/replicate_wild_ignore_table_basic.result
@@ -1,3 +1,4 @@
+CHANGE MASTER TO master_host='127.0.0.1', master_user='root', master_ssl_verify_server_cert=0;
 #
 # Basic testing of replicate_wild_ignore_table.
 #
@@ -24,6 +25,20 @@ SET @@GLOBAL.replicate_wild_ignore_table="test.t, t2";
 ERROR HY000: Incorrect arguments to SET
 SET @@GLOBAL.replicate_wild_ignore_table="test.,t1";
 ERROR HY000: Incorrect arguments to SET
+# Argument size acceptance.
+SELECT GROUP_CONCAT(CONCAT("database_name.long_table_name_", seq) SEPARATOR ",")
+INTO @name FROM seq_1_to_8;
+SELECT LENGTH(@name);
+LENGTH(@name)
+255
+SET @@GLOBAL.replicate_wild_ignore_table= @name;
+SELECT @@GLOBAL.replicate_wild_ignore_table;
+@@GLOBAL.replicate_wild_ignore_table
+database_name.long_table_name_1,database_name.long_table_name_2,database_name.long_table_name_3,database_name.long_table_name_4,database_name.long_table_name_5,database_name.long_table_name_6,database_name.long_table_name_7,database_name.long_table_name_8
+SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='replicate_wild_ignore_table';
+VARIABLE_VALUE
+database_name.long_table_name_1,database_name.long_table_name_2,database_name.long_table_name_3,database_name.long_table_name_4,database_name.long_table_name_5,database_name.long_table_name_6,database_name.long_table_name_7,database_name.long_table_name_8
+Replicate_Wild_Ignore_Table = 'database_name.long_table_name_1,database_name.long_table_name_2,database_name.long_table_name_3,database_name.long_table_name_4,database_name.long_table_name_5,database_name.long_table_name_6,database_name.long_table_name_7,database_name.long_table_name_8'
 # Argument syntax.
 SET @@GLOBAL.replicate_wild_ignore_table="test.%,,,,,test.t3";
 SELECT @@GLOBAL.replicate_wild_ignore_table;
@@ -32,6 +47,7 @@ test.%,test.t3
 SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='replicate_wild_ignore_table';
 VARIABLE_NAME	VARIABLE_VALUE
 REPLICATE_WILD_IGNORE_TABLE	test.%,test.t3
+Replicate_Wild_Ignore_Table = 'test.%,test.t3'
 SET @@GLOBAL.replicate_wild_ignore_table="test.t1,,,test2.%,,,test.t3";
 SELECT @@GLOBAL.replicate_wild_ignore_table;
 @@GLOBAL.replicate_wild_ignore_table
diff --git a/mysql-test/suite/sys_vars/t/replicate_do_db_basic.test b/mysql-test/suite/sys_vars/t/replicate_do_db_basic.test
index b7004d1938b08..2ff32df8e1582 100644
--- a/mysql-test/suite/sys_vars/t/replicate_do_db_basic.test
+++ b/mysql-test/suite/sys_vars/t/replicate_do_db_basic.test
@@ -1,4 +1,8 @@
+--source include/have_sequence.inc
+# have show_slave_status
 --source include/not_embedded.inc
+CHANGE MASTER TO master_host='127.0.0.1', master_user='root', master_ssl_verify_server_cert=0;
+--let $status_items= Replicate_Do_DB
 
 --echo #
 --echo # Basic testing of replicate_do_db.
@@ -23,11 +27,23 @@ SET @@GLOBAL.replicate_do_db=1.1;
 --error ER_WRONG_TYPE_FOR_VAR
 SET @@GLOBAL.replicate_do_db=1e1;
 
+# MDEV-35693 Replicate_* fields of Show-Slave-Status display truncated
+--echo # Argument size acceptance.
+
+SELECT GROUP_CONCAT(CONCAT("database_name_", seq) SEPARATOR ",")
+  INTO @name FROM seq_1_to_8;
+SELECT LENGTH(@name);
+SET @@GLOBAL.replicate_do_db= @name;
+SELECT @@GLOBAL.replicate_do_db;
+SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='replicate_do_db';
+--source include/show_slave_status.inc
+
 --echo # Argument syntax.
 
 SET @@GLOBAL.replicate_do_db="db1,,,,,db3";
 SELECT @@GLOBAL.replicate_do_db;
 SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='replicate_do_db';
+--source include/show_slave_status.inc
 
 SET @@GLOBAL.replicate_do_db="db1,,,db2,,,db3";
 SELECT @@GLOBAL.replicate_do_db;
diff --git a/mysql-test/suite/sys_vars/t/replicate_do_table_basic.test b/mysql-test/suite/sys_vars/t/replicate_do_table_basic.test
index 346bdf3b038aa..7715df6c528ec 100644
--- a/mysql-test/suite/sys_vars/t/replicate_do_table_basic.test
+++ b/mysql-test/suite/sys_vars/t/replicate_do_table_basic.test
@@ -1,4 +1,8 @@
+--source include/have_sequence.inc
+# have show_slave_status
 --source include/not_embedded.inc
+CHANGE MASTER TO master_host='127.0.0.1', master_user='root', master_ssl_verify_server_cert=0;
+--let $status_items= Replicate_Do_Table
 
 --echo #
 --echo # Basic testing of replicate_do_table.
@@ -32,11 +36,23 @@ SET @@GLOBAL.replicate_do_table="test.t1, t2";
 --error ER_WRONG_ARGUMENTS
 SET @@GLOBAL.replicate_do_table="test.,t1";
 
+# MDEV-35693 Replicate_* fields of Show-Slave-Status display truncated
+--echo # Argument size acceptance.
+
+SELECT GROUP_CONCAT(CONCAT("database_name.long_table_name_", seq) SEPARATOR ",")
+  INTO @name FROM seq_1_to_8;
+SELECT LENGTH(@name);
+SET @@GLOBAL.replicate_do_table= @name;
+SELECT @@GLOBAL.replicate_do_table;
+SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='replicate_do_table';
+--source include/show_slave_status.inc
+
 --echo # Argument syntax.
 
 SET @@GLOBAL.replicate_do_table="test.t1,,,,,test.t3";
 SELECT @@GLOBAL.replicate_do_table;
 SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='replicate_do_table';
+--source include/show_slave_status.inc
 
 SET @@GLOBAL.replicate_do_table="test.t1,,,test2.t2,,,test.t3";
 SELECT @@GLOBAL.replicate_do_table;
diff --git a/mysql-test/suite/sys_vars/t/replicate_ignore_db_basic.test b/mysql-test/suite/sys_vars/t/replicate_ignore_db_basic.test
index 376397d1635d0..3dbd9f64ef918 100644
--- a/mysql-test/suite/sys_vars/t/replicate_ignore_db_basic.test
+++ b/mysql-test/suite/sys_vars/t/replicate_ignore_db_basic.test
@@ -1,4 +1,8 @@
+--source include/have_sequence.inc
+# have show_slave_status
 --source include/not_embedded.inc
+CHANGE MASTER TO master_host='127.0.0.1', master_user='root', master_ssl_verify_server_cert=0;
+--let $status_items= Replicate_Ignore_DB
 
 --echo #
 --echo # Basic testing of replicate_ignore_db.
@@ -23,11 +27,23 @@ SET @@GLOBAL.replicate_ignore_db=1.1;
 --error ER_WRONG_TYPE_FOR_VAR
 SET @@GLOBAL.replicate_ignore_db=1e1;
 
+# MDEV-35693 Replicate_* fields of Show-Slave-Status display truncated
+--echo # Argument size acceptance.
+
+SELECT GROUP_CONCAT(CONCAT("database_name_", seq) SEPARATOR ",")
+  INTO @name FROM seq_1_to_8;
+SELECT LENGTH(@name);
+SET @@GLOBAL.replicate_ignore_db= @name;
+SELECT @@GLOBAL.replicate_ignore_db;
+SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='replicate_ignore_db';
+--source include/show_slave_status.inc
+
 --echo # Argument syntax.
 
 SET @@GLOBAL.replicate_ignore_db="db1,,,,,db3";
 SELECT @@GLOBAL.replicate_ignore_db;
 SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='replicate_ignore_db';
+--source include/show_slave_status.inc
 
 SET @@GLOBAL.replicate_ignore_db="db1,,,db2,,,db3";
 SELECT @@GLOBAL.replicate_ignore_db;
diff --git a/mysql-test/suite/sys_vars/t/replicate_ignore_table_basic.test b/mysql-test/suite/sys_vars/t/replicate_ignore_table_basic.test
index 1cf6f010ecacb..fdce4094c3167 100644
--- a/mysql-test/suite/sys_vars/t/replicate_ignore_table_basic.test
+++ b/mysql-test/suite/sys_vars/t/replicate_ignore_table_basic.test
@@ -1,4 +1,8 @@
+--source include/have_sequence.inc
+# have show_slave_status
 --source include/not_embedded.inc
+CHANGE MASTER TO master_host='127.0.0.1', master_user='root', master_ssl_verify_server_cert=0;
+--let $status_items= Replicate_Ignore_Table
 
 --echo #
 --echo # Basic testing of replicate_ignore_table.
@@ -32,11 +36,23 @@ SET @@GLOBAL.replicate_ignore_table="test.t1, t2";
 --error ER_WRONG_ARGUMENTS
 SET @@GLOBAL.replicate_ignore_table="test.,t1";
 
+# MDEV-35693 Replicate_* fields of Show-Slave-Status display truncated
+--echo # Argument size acceptance.
+
+SELECT GROUP_CONCAT(CONCAT("database_name.long_table_name_", seq) SEPARATOR ",")
+  INTO @name FROM seq_1_to_8;
+SELECT LENGTH(@name);
+SET @@GLOBAL.replicate_ignore_table= @name;
+SELECT @@GLOBAL.replicate_ignore_table;
+SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='replicate_ignore_table';
+--source include/show_slave_status.inc
+
 --echo # Argument syntax.
 
 SET @@GLOBAL.replicate_ignore_table="test.t1,,,,,test.t3";
 SELECT @@GLOBAL.replicate_ignore_table;
 SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='replicate_ignore_table';
+--source include/show_slave_status.inc
 
 SET @@GLOBAL.replicate_ignore_table="test.t1,,,test2.t2,,,test.t3";
 SELECT @@GLOBAL.replicate_ignore_table;
diff --git a/mysql-test/suite/sys_vars/t/replicate_wild_do_table_basic.test b/mysql-test/suite/sys_vars/t/replicate_wild_do_table_basic.test
index 832d3397f893c..e4b5cb90a8f90 100644
--- a/mysql-test/suite/sys_vars/t/replicate_wild_do_table_basic.test
+++ b/mysql-test/suite/sys_vars/t/replicate_wild_do_table_basic.test
@@ -1,4 +1,8 @@
+--source include/have_sequence.inc
+# have show_slave_status
 --source include/not_embedded.inc
+CHANGE MASTER TO master_host='127.0.0.1', master_user='root', master_ssl_verify_server_cert=0;
+--let $status_items= Replicate_Wild_Do_Table
 
 --echo #
 --echo # Basic testing of replicate_wild_do_table.
@@ -32,11 +36,23 @@ SET @@GLOBAL.replicate_wild_do_table="test.t, t2";
 --error ER_WRONG_ARGUMENTS
 SET @@GLOBAL.replicate_wild_do_table="test.,t1";
 
+# MDEV-35693 Replicate_* fields of Show-Slave-Status display truncated
+--echo # Argument size acceptance.
+
+SELECT GROUP_CONCAT(CONCAT("database_name.long_table_name_", seq) SEPARATOR ",")
+  INTO @name FROM seq_1_to_8;
+SELECT LENGTH(@name);
+SET @@GLOBAL.replicate_wild_do_table= @name;
+SELECT @@GLOBAL.replicate_wild_do_table;
+SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='replicate_wild_do_table';
+--source include/show_slave_status.inc
+
 --echo # Argument syntax.
 
 SET @@GLOBAL.replicate_wild_do_table="test.%,,,,,test.t3";
 SELECT @@GLOBAL.replicate_wild_do_table;
 SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='replicate_wild_do_table';
+--source include/show_slave_status.inc
 
 SET @@GLOBAL.replicate_wild_do_table="test.t1,,,test2.%,,,test.t3";
 SELECT @@GLOBAL.replicate_wild_do_table;
diff --git a/mysql-test/suite/sys_vars/t/replicate_wild_ignore_table_basic.test b/mysql-test/suite/sys_vars/t/replicate_wild_ignore_table_basic.test
index 5cb1ff6c82047..004c08065bf17 100644
--- a/mysql-test/suite/sys_vars/t/replicate_wild_ignore_table_basic.test
+++ b/mysql-test/suite/sys_vars/t/replicate_wild_ignore_table_basic.test
@@ -1,4 +1,8 @@
+--source include/have_sequence.inc
+# have show_slave_status
 --source include/not_embedded.inc
+CHANGE MASTER TO master_host='127.0.0.1', master_user='root', master_ssl_verify_server_cert=0;
+--let $status_items= Replicate_Wild_Ignore_Table
 
 --echo #
 --echo # Basic testing of replicate_wild_ignore_table.
@@ -32,11 +36,23 @@ SET @@GLOBAL.replicate_wild_ignore_table="test.t, t2";
 --error ER_WRONG_ARGUMENTS
 SET @@GLOBAL.replicate_wild_ignore_table="test.,t1";
 
+# MDEV-35693 Replicate_* fields of Show-Slave-Status display truncated
+--echo # Argument size acceptance.
+
+SELECT GROUP_CONCAT(CONCAT("database_name.long_table_name_", seq) SEPARATOR ",")
+  INTO @name FROM seq_1_to_8;
+SELECT LENGTH(@name);
+SET @@GLOBAL.replicate_wild_ignore_table= @name;
+SELECT @@GLOBAL.replicate_wild_ignore_table;
+SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='replicate_wild_ignore_table';
+--source include/show_slave_status.inc
+
 --echo # Argument syntax.
 
 SET @@GLOBAL.replicate_wild_ignore_table="test.%,,,,,test.t3";
 SELECT @@GLOBAL.replicate_wild_ignore_table;
 SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='replicate_wild_ignore_table';
+--source include/show_slave_status.inc
 
 SET @@GLOBAL.replicate_wild_ignore_table="test.t1,,,test2.%,,,test.t3";
 SELECT @@GLOBAL.replicate_wild_ignore_table;
diff --git a/sql/sql_i_s.h b/sql/sql_i_s.h
index 12cec39ad71a1..6782d62bd1f7f 100644
--- a/sql/sql_i_s.h
+++ b/sql/sql_i_s.h
@@ -142,8 +142,10 @@ class Varchar: public Type
 public:
   Varchar(uint length) :Type(&type_handler_varchar, length, false)
   {
+    // utf8mb3 Varchars longer than MAX_FIELD_VARCHARLENGTH/3 become Longtexts
     DBUG_ASSERT(length * 3 <= MAX_FIELD_VARCHARLENGTH);
   }
+  Varchar(): Type(&type_handler_varchar, MAX_FIELD_VARCHARLENGTH/3, false) {}
 };
 
 
@@ -245,6 +247,13 @@ class ULong: public Type
 };
 
 
+class UShort: public Type
+{
+public:
+  UShort(uint length): Type(&type_handler_ushort, length, true) {}
+};
+
+
 class SLonglong: public Type
 {
 public:
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 254d9a6b9d428..acb57793e56c0 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -10619,6 +10619,7 @@ ST_FIELD_INFO check_constraints_fields_info[]=
 };
 
 
+#ifdef HAVE_REPLICATION
 ST_FIELD_INFO slave_status_info[]=
 {
   Column("Connection_name", Name(), NOT_NULL),
@@ -10626,72 +10627,70 @@ ST_FIELD_INFO slave_status_info[]=
   Column("Slave_IO_State", Varchar(64), NULLABLE),
   Column("Master_Host", Varchar(HOSTNAME_LENGTH), NULLABLE),
   Column("Master_User", Varchar(USERNAME_LENGTH), NULLABLE),
-  Column("Master_Port", ULong(7), NOT_NULL),
+  Column("Master_Port", UShort(5), NOT_NULL),
   Column("Connect_Retry", SLong(10), NOT_NULL),
   Column("Master_Log_File", Varchar(FN_REFLEN), NOT_NULL),
-  Column("Read_Master_Log_Pos", ULonglong(10), NOT_NULL),
+  Column("Read_Master_Log_Pos", ULonglong(20), NOT_NULL),
   Column("Relay_Log_File", Varchar(FN_REFLEN), NOT_NULL),
-  Column("Relay_Log_Pos", ULonglong(10), NOT_NULL),
+  Column("Relay_Log_Pos", ULonglong(20), NOT_NULL),
   Column("Relay_Master_Log_File", Varchar(FN_REFLEN), NOT_NULL),
   Column("Slave_IO_Running", Varchar(10), NOT_NULL),
   Column("Slave_SQL_Running", Varchar(3), NOT_NULL),
-  Column("Replicate_Do_DB", Name(), NOT_NULL),
-  Column("Replicate_Ignore_DB", Name(), NOT_NULL),
-  Column("Replicate_Do_Table", Name(), NOT_NULL),
-  Column("Replicate_Ignore_Table", Name(), NOT_NULL),
-  Column("Replicate_Wild_Do_Table", Name(), NOT_NULL),
-  Column("Replicate_Wild_Ignore_Table", Name(), NOT_NULL),
-  Column("Last_Errno", SLong(4), NOT_NULL),
-  Column("Last_Error", Varchar(20), NULLABLE),
+  Column("Replicate_Do_DB", Varchar(), NOT_NULL),
+  Column("Replicate_Ignore_DB", Varchar(), NOT_NULL),
+  Column("Replicate_Do_Table", Varchar(), NOT_NULL),
+  Column("Replicate_Ignore_Table", Varchar(), NOT_NULL),
+  Column("Replicate_Wild_Do_Table", Varchar(), NOT_NULL),
+  Column("Replicate_Wild_Ignore_Table", Varchar(), NOT_NULL),
+  Column("Last_Errno", UShort(4), NOT_NULL),
+  Column("Last_Error", Varchar(MAX_SLAVE_ERRMSG), NULLABLE),
   Column("Skip_Counter", ULong(10), NOT_NULL),
-  Column("Exec_Master_Log_Pos", ULonglong(10), NOT_NULL),
-  Column("Relay_Log_Space", ULonglong(10), NOT_NULL),
+  Column("Exec_Master_Log_Pos", ULonglong(20), NOT_NULL),
+  Column("Relay_Log_Space", ULonglong(20), NOT_NULL),
   Column("Until_Condition", Varchar(6), NOT_NULL),
   Column("Until_Log_File", Varchar(FN_REFLEN), NULLABLE),
-  Column("Until_Log_Pos", ULonglong(10), NOT_NULL),
+  Column("Until_Log_Pos", ULonglong(20), NOT_NULL),
   Column("Master_SSL_Allowed", Varchar(7), NULLABLE),
   Column("Master_SSL_CA_File", Varchar(FN_REFLEN), NULLABLE),
   Column("Master_SSL_CA_Path", Varchar(FN_REFLEN), NULLABLE),
   Column("Master_SSL_Cert", Varchar(FN_REFLEN), NULLABLE),
   Column("Master_SSL_Cipher", Varchar(FN_REFLEN), NULLABLE),
   Column("Master_SSL_Key", Varchar(FN_REFLEN), NULLABLE),
-  Column("Seconds_Behind_Master", SLonglong(10), NULLABLE),
+  Column("Seconds_Behind_Master", ULonglong(20), NULLABLE),
   Column("Master_SSL_Verify_Server_Cert", Varchar(3), NOT_NULL),
-  Column("Last_IO_Errno", SLong(4), NOT_NULL),
-  Column("Last_IO_Error", Varchar(MYSQL_ERRMSG_SIZE), NULLABLE),
-  Column("Last_SQL_Errno", SLong(4), NOT_NULL),
-  Column("Last_SQL_Error", Varchar(MYSQL_ERRMSG_SIZE), NULLABLE),
-  Column("Replicate_Ignore_Server_Ids", Varchar(FN_REFLEN), NOT_NULL),
+  Column("Last_IO_Errno", UShort(4), NOT_NULL),
+  Column("Last_IO_Error", Varchar(MAX_SLAVE_ERRMSG), NULLABLE),
+  Column("Last_SQL_Errno", UShort(4), NOT_NULL),
+  Column("Last_SQL_Error", Varchar(MAX_SLAVE_ERRMSG), NULLABLE),
+  Column("Replicate_Ignore_Server_Ids", Varchar(), NOT_NULL),
   Column("Master_Server_Id", ULong(10), NOT_NULL),
   Column("Master_SSL_Crl", Varchar(FN_REFLEN), NULLABLE),
   Column("Master_SSL_Crlpath", Varchar(FN_REFLEN), NULLABLE),
-  Column("Using_Gtid", Varchar(15), NULLABLE),
-  Column("Gtid_IO_Pos", Varchar(1024), NOT_NULL),
-  Column("Replicate_Do_Domain_Ids", Varchar(FN_REFLEN), NOT_NULL),
-  Column("Replicate_Ignore_Domain_Ids", Varchar(FN_REFLEN), NOT_NULL),
-  Column("Parallel_Mode", Varchar(15), NOT_NULL),
+  Column("Using_Gtid", Varchar(11), NULLABLE),
+  Column("Gtid_IO_Pos", Varchar(), NOT_NULL),
+  Column("Replicate_Do_Domain_Ids", Varchar(), NOT_NULL),
+  Column("Replicate_Ignore_Domain_Ids", Varchar(), NOT_NULL),
+  Column("Parallel_Mode", Varchar(12), NOT_NULL),
   Column("SQL_Delay", ULong(10), NOT_NULL),
   Column("SQL_Remaining_Delay", ULong(10), NULLABLE),
-  Column("Slave_SQL_Running_State", Varchar(64), NULLABLE),
+  Column("Slave_SQL_Running_State", Varchar(), NULLABLE),
   Column("Slave_DDL_Groups", ULonglong(20), NOT_NULL),
   Column("Slave_Non_Transactional_Groups", ULonglong(20), NOT_NULL),
   Column("Slave_Transactional_Groups", ULonglong(20), NOT_NULL),
-  Column("Replicate_Rewrite_DB",Varchar(1024), NOT_NULL),
+  Column("Replicate_Rewrite_DB", Varchar(), NOT_NULL),
   Column("Retried_transactions", ULong(10), NOT_NULL),
-  Column("Max_relay_log_size", ULonglong(10), NOT_NULL),
+  Column("Max_relay_log_size", ULong(10), NOT_NULL),
   Column("Executed_log_entries", ULong(10), NOT_NULL),
   Column("Slave_received_heartbeats", ULong(10), NOT_NULL),
   Column("Slave_heartbeat_period", Float(703), NOT_NULL), // 3 decimals
-  Column("Gtid_Slave_Pos", Varchar(FN_REFLEN), NOT_NULL),
+  Column("Gtid_Slave_Pos", Varchar(), NOT_NULL),
   Column("Master_last_event_time", Datetime(0), NULLABLE),
   Column("Slave_last_event_time", Datetime(0), NULLABLE),
-  Column("Master_Slave_time_diff", SLonglong(10), NULLABLE),
+  Column("Master_Slave_time_diff", SLong(10), NULLABLE),
   CEnd()
 };
+#endif
 
-}; // namespace Show
-
-namespace Show {
 
 /** For creating fields of information_schema.OPTIMIZER_TRACE */
 extern ST_FIELD_INFO optimizer_trace_info[];