1
0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00

MDEV-39318 MTR: fix test failures when running with --ssl

make sure P_S.{global|session}_status and I_S.feedback plugin table
have a column of the same width as I_S.global_status.

Otherwise long status strings (e.g. Ssl_cipher_list) won't fit
and trigger a data truncation warning (an error in the strict mode)
This commit is contained in:
Sergei Golubchik
2026-04-24 21:41:12 +02:00
parent 57fd078bff
commit f34afeaf6b
6 changed files with 7 additions and 7 deletions

View File

@@ -700,7 +700,7 @@ def performance_schema file_summary_by_instance MIN_TIMER_MISC 23 NULL NO bigint
def performance_schema file_summary_by_instance AVG_TIMER_MISC 24 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references Average wait time of all miscellaneous operations that are timed. NEVER NULL
def performance_schema file_summary_by_instance MAX_TIMER_MISC 25 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references Maximum wait time of all miscellaneous operations that are timed. NEVER NULL
def performance_schema global_status VARIABLE_NAME 1 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) select,insert,update,references The global status variable name. NEVER NULL
def performance_schema global_status VARIABLE_VALUE 2 NULL YES varchar 1024 3072 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(1024) select,insert,update,references The global status variable value. NEVER NULL
def performance_schema global_status VARIABLE_VALUE 2 NULL YES varchar 4096 12288 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(4096) select,insert,update,references The global status variable value. NEVER NULL
def performance_schema hosts HOST 1 NULL YES char 255 765 NULL NULL NULL utf8mb3 utf8mb3_bin char(255) select,insert,update,references Host name used by the client to connect, NULL for internal threads or user sessions that failed to authenticate. NEVER NULL
def performance_schema hosts CURRENT_CONNECTIONS 2 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references Current number of the host's connections. NEVER NULL
def performance_schema hosts TOTAL_CONNECTIONS 3 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references Total number of the host's connections NEVER NULL
@@ -909,7 +909,7 @@ def performance_schema session_connect_attrs ATTR_NAME 2 NULL NO varchar 32 96 N
def performance_schema session_connect_attrs ATTR_VALUE 3 NULL YES varchar 1024 3072 NULL NULL NULL utf8mb3 utf8mb3_bin varchar(1024) select,insert,update,references Attribute value. NEVER NULL
def performance_schema session_connect_attrs ORDINAL_POSITION 4 NULL YES int NULL NULL 10 0 NULL NULL NULL int(11) select,insert,update,references Order in which attribute was added to the connection attributes. NEVER NULL
def performance_schema session_status VARIABLE_NAME 1 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) select,insert,update,references The session status variable name. NEVER NULL
def performance_schema session_status VARIABLE_VALUE 2 NULL YES varchar 1024 3072 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(1024) select,insert,update,references The session status variable value. NEVER NULL
def performance_schema session_status VARIABLE_VALUE 2 NULL YES varchar 4096 12288 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(4096) select,insert,update,references The session status variable value. NEVER NULL
def performance_schema setup_actors HOST 1 '%' NO char 255 765 NULL NULL NULL utf8mb3 utf8mb3_bin char(255) select,insert,update,references Host name, either a literal, or the % wildcard representing any host. NEVER NULL
def performance_schema setup_actors USER 2 '%' NO char 128 384 NULL NULL NULL utf8mb3 utf8mb3_bin char(128) select,insert,update,references User name, either a literal or the % wildcard representing any name. NEVER NULL
def performance_schema setup_actors ROLE 3 '%' NO char 128 384 NULL NULL NULL utf8mb3 utf8mb3_bin char(128) select,insert,update,references Unused NEVER NULL

View File

@@ -1,7 +1,7 @@
DESC sys.metrics;
Field Type Null Key Default Extra
Variable_name varchar(193) YES NULL
Variable_value varchar(1024) YES NULL
Variable_value varchar(4096) YES NULL
Type varchar(210) YES NULL
Enabled varchar(3) NO
SELECT * FROM sys.metrics;

View File

@@ -1,5 +1,5 @@
DESC sys.ps_check_lost_instrumentation;
Field Type Null Key Default Extra
variable_name varchar(64) NO NULL
variable_value varchar(1024) YES NULL
variable_value varchar(4096) YES NULL
SELECT * FROM sys.ps_check_lost_instrumentation;

View File

@@ -66,7 +66,7 @@ ST_SCHEMA_TABLE *i_s_feedback; ///< table descriptor for our I_S table
static ST_FIELD_INFO feedback_fields[] =
{
Show::Column("VARIABLE_NAME", Show::Varchar(255), NOT_NULL),
Show::Column("VARIABLE_VALUE", Show::Varchar(1024), NOT_NULL),
Show::Column("VARIABLE_VALUE", Show::Varchar(4096), NOT_NULL),
Show::CEnd()
};

View File

@@ -53,7 +53,7 @@ table_global_status::m_share=
&m_table_lock,
{ C_STRING_WITH_LEN("CREATE TABLE global_status("
"VARIABLE_NAME VARCHAR(64) not null comment 'The global status variable name.',"
"VARIABLE_VALUE VARCHAR(1024) comment 'The global status variable value.')") },
"VARIABLE_VALUE VARCHAR(4096) comment 'The global status variable value.')") },
true, /* m_perpetual */
false, /* m_optional */
&m_share_state

View File

@@ -53,7 +53,7 @@ table_session_status::m_share=
&m_table_lock,
{ C_STRING_WITH_LEN("CREATE TABLE session_status("
"VARIABLE_NAME VARCHAR(64) not null comment 'The session status variable name.',"
"VARIABLE_VALUE VARCHAR(1024) comment 'The session status variable value.')") },
"VARIABLE_VALUE VARCHAR(4096) comment 'The session status variable value.')") },
true, /* m_perpetual */
false, /* m_optional */
&m_share_state