Skip to content

M
MariaDB
Commit a216672d authored by Sergei Golubchik's avatar Sergei Golubchik
Browse files
Options

MDEV-16341 Wrong length for USER columns in performance_schema tables 

use USERNAME_CHAR_LENGTH and HOSTNAME_LENGTH for perfschema
USER and HOST columns
parent ad9a140d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 44 deletions
include/mysql_com.h
View file @ a216672d
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#define HOSTNAME_LENGTH 60 #define HOSTNAME_LENGTH 60
#define SYSTEM_CHARSET_MBMAXLEN 3 #define SYSTEM_CHARSET_MBMAXLEN 3
#define NAME_CHAR_LEN 64U /* Field/table name length */ #define NAME_CHAR_LEN 64U /* Field/table name length */
#define USERNAME_CHAR_LENGTH 128U #define USERNAME_CHAR_LENGTH 128
#define NAME_LEN (NAME_CHAR_LEN*SYSTEM_CHARSET_MBMAXLEN) #define NAME_LEN (NAME_CHAR_LEN*SYSTEM_CHARSET_MBMAXLEN)
#define USERNAME_LENGTH (USERNAME_CHAR_LENGTH*SYSTEM_CHARSET_MBMAXLEN) #define USERNAME_LENGTH (USERNAME_CHAR_LENGTH*SYSTEM_CHARSET_MBMAXLEN)
#define DEFINER_CHAR_LENGTH (USERNAME_CHAR_LENGTH + HOSTNAME_LENGTH + 1) #define DEFINER_CHAR_LENGTH (USERNAME_CHAR_LENGTH + HOSTNAME_LENGTH + 1)
......
mysql-test/suite/perfschema/r/schema.result
View file @ a216672d
...@@ -62,7 +62,7 @@ users ...@@ -62,7 +62,7 @@ users
show create table accounts; show create table accounts;
Table Create Table Table Create Table
accounts CREATE TABLE `accounts` ( accounts CREATE TABLE `accounts` (
`USER` char(16) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, `USER` char(128) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
`HOST` char(60) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, `HOST` char(60) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
`CURRENT_CONNECTIONS` bigint(20) NOT NULL, `CURRENT_CONNECTIONS` bigint(20) NOT NULL,
`TOTAL_CONNECTIONS` bigint(20) NOT NULL `TOTAL_CONNECTIONS` bigint(20) NOT NULL
...@@ -140,7 +140,7 @@ events_stages_summary_by_thread_by_event_name CREATE TABLE `events_stages_summar ...@@ -140,7 +140,7 @@ events_stages_summary_by_thread_by_event_name CREATE TABLE `events_stages_summar
show create table events_stages_summary_by_user_by_event_name; show create table events_stages_summary_by_user_by_event_name;
Table Create Table Table Create Table
events_stages_summary_by_user_by_event_name CREATE TABLE `events_stages_summary_by_user_by_event_name` ( events_stages_summary_by_user_by_event_name CREATE TABLE `events_stages_summary_by_user_by_event_name` (
`USER` char(16) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, `USER` char(128) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
`EVENT_NAME` varchar(128) NOT NULL, `EVENT_NAME` varchar(128) NOT NULL,
`COUNT_STAR` bigint(20) unsigned NOT NULL, `COUNT_STAR` bigint(20) unsigned NOT NULL,
`SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL, `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL,
...@@ -151,7 +151,7 @@ events_stages_summary_by_user_by_event_name CREATE TABLE `events_stages_summary_ ...@@ -151,7 +151,7 @@ events_stages_summary_by_user_by_event_name CREATE TABLE `events_stages_summary_
show create table events_stages_summary_by_account_by_event_name; show create table events_stages_summary_by_account_by_event_name;
Table Create Table Table Create Table
events_stages_summary_by_account_by_event_name CREATE TABLE `events_stages_summary_by_account_by_event_name` ( events_stages_summary_by_account_by_event_name CREATE TABLE `events_stages_summary_by_account_by_event_name` (
`USER` char(16) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, `USER` char(128) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
`HOST` char(60) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, `HOST` char(60) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
`EVENT_NAME` varchar(128) NOT NULL, `EVENT_NAME` varchar(128) NOT NULL,
`COUNT_STAR` bigint(20) unsigned NOT NULL, `COUNT_STAR` bigint(20) unsigned NOT NULL,
...@@ -398,7 +398,7 @@ events_statements_summary_by_thread_by_event_name CREATE TABLE `events_statement ...@@ -398,7 +398,7 @@ events_statements_summary_by_thread_by_event_name CREATE TABLE `events_statement
show create table events_statements_summary_by_user_by_event_name; show create table events_statements_summary_by_user_by_event_name;
Table Create Table Table Create Table
events_statements_summary_by_user_by_event_name CREATE TABLE `events_statements_summary_by_user_by_event_name` ( events_statements_summary_by_user_by_event_name CREATE TABLE `events_statements_summary_by_user_by_event_name` (
`USER` char(16) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, `USER` char(128) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
`EVENT_NAME` varchar(128) NOT NULL, `EVENT_NAME` varchar(128) NOT NULL,
`COUNT_STAR` bigint(20) unsigned NOT NULL, `COUNT_STAR` bigint(20) unsigned NOT NULL,
`SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL, `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL,
...@@ -428,7 +428,7 @@ events_statements_summary_by_user_by_event_name CREATE TABLE `events_statements_ ...@@ -428,7 +428,7 @@ events_statements_summary_by_user_by_event_name CREATE TABLE `events_statements_
show create table events_statements_summary_by_account_by_event_name; show create table events_statements_summary_by_account_by_event_name;
Table Create Table Table Create Table
events_statements_summary_by_account_by_event_name CREATE TABLE `events_statements_summary_by_account_by_event_name` ( events_statements_summary_by_account_by_event_name CREATE TABLE `events_statements_summary_by_account_by_event_name` (
`USER` char(16) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, `USER` char(128) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
`HOST` char(60) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, `HOST` char(60) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
`EVENT_NAME` varchar(128) NOT NULL, `EVENT_NAME` varchar(128) NOT NULL,
`COUNT_STAR` bigint(20) unsigned NOT NULL, `COUNT_STAR` bigint(20) unsigned NOT NULL,
...@@ -590,7 +590,7 @@ events_waits_summary_by_thread_by_event_name CREATE TABLE `events_waits_summary_ ...@@ -590,7 +590,7 @@ events_waits_summary_by_thread_by_event_name CREATE TABLE `events_waits_summary_
show create table events_waits_summary_by_user_by_event_name; show create table events_waits_summary_by_user_by_event_name;
Table Create Table Table Create Table
events_waits_summary_by_user_by_event_name CREATE TABLE `events_waits_summary_by_user_by_event_name` ( events_waits_summary_by_user_by_event_name CREATE TABLE `events_waits_summary_by_user_by_event_name` (
`USER` char(16) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, `USER` char(128) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
`EVENT_NAME` varchar(128) NOT NULL, `EVENT_NAME` varchar(128) NOT NULL,
`COUNT_STAR` bigint(20) unsigned NOT NULL, `COUNT_STAR` bigint(20) unsigned NOT NULL,
`SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL, `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL,
...@@ -601,7 +601,7 @@ events_waits_summary_by_user_by_event_name CREATE TABLE `events_waits_summary_by ...@@ -601,7 +601,7 @@ events_waits_summary_by_user_by_event_name CREATE TABLE `events_waits_summary_by
show create table events_waits_summary_by_account_by_event_name; show create table events_waits_summary_by_account_by_event_name;
Table Create Table Table Create Table
events_waits_summary_by_account_by_event_name CREATE TABLE `events_waits_summary_by_account_by_event_name` ( events_waits_summary_by_account_by_event_name CREATE TABLE `events_waits_summary_by_account_by_event_name` (
`USER` char(16) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, `USER` char(128) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
`HOST` char(60) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, `HOST` char(60) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
`EVENT_NAME` varchar(128) NOT NULL, `EVENT_NAME` varchar(128) NOT NULL,
`COUNT_STAR` bigint(20) unsigned NOT NULL, `COUNT_STAR` bigint(20) unsigned NOT NULL,
...@@ -762,8 +762,8 @@ show create table setup_actors; ...@@ -762,8 +762,8 @@ show create table setup_actors;
Table Create Table Table Create Table
setup_actors CREATE TABLE `setup_actors` ( setup_actors CREATE TABLE `setup_actors` (
`HOST` char(60) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '%', `HOST` char(60) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '%',
`USER` char(16) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '%', `USER` char(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '%',
`ROLE` char(16) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '%' `ROLE` char(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '%'
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
show create table setup_consumers; show create table setup_consumers;
Table Create Table Table Create Table
...@@ -1028,7 +1028,7 @@ threads CREATE TABLE `threads` ( ...@@ -1028,7 +1028,7 @@ threads CREATE TABLE `threads` (
`NAME` varchar(128) NOT NULL, `NAME` varchar(128) NOT NULL,
`TYPE` varchar(10) NOT NULL, `TYPE` varchar(10) NOT NULL,
`PROCESSLIST_ID` bigint(20) unsigned DEFAULT NULL, `PROCESSLIST_ID` bigint(20) unsigned DEFAULT NULL,
`PROCESSLIST_USER` varchar(16) DEFAULT NULL, `PROCESSLIST_USER` varchar(128) DEFAULT NULL,
`PROCESSLIST_HOST` varchar(60) DEFAULT NULL, `PROCESSLIST_HOST` varchar(60) DEFAULT NULL,
`PROCESSLIST_DB` varchar(64) DEFAULT NULL, `PROCESSLIST_DB` varchar(64) DEFAULT NULL,
`PROCESSLIST_COMMAND` varchar(16) DEFAULT NULL, `PROCESSLIST_COMMAND` varchar(16) DEFAULT NULL,
...@@ -1042,7 +1042,7 @@ threads CREATE TABLE `threads` ( ...@@ -1042,7 +1042,7 @@ threads CREATE TABLE `threads` (
show create table users; show create table users;
Table Create Table Table Create Table
users CREATE TABLE `users` ( users CREATE TABLE `users` (
`USER` char(16) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, `USER` char(128) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
`CURRENT_CONNECTIONS` bigint(20) NOT NULL, `CURRENT_CONNECTIONS` bigint(20) NOT NULL,
`TOTAL_CONNECTIONS` bigint(20) NOT NULL `TOTAL_CONNECTIONS` bigint(20) NOT NULL
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
storage/perfschema/table_accounts.cc
View file @ a216672d
...@@ -43,8 +43,8 @@ table_accounts::m_share= ...@@ -43,8 +43,8 @@ table_accounts::m_share=
sizeof(PFS_simple_index), /* ref length */ sizeof(PFS_simple_index), /* ref length */
&m_table_lock, &m_table_lock,
{ C_STRING_WITH_LEN("CREATE TABLE accounts(" { C_STRING_WITH_LEN("CREATE TABLE accounts("
"USER CHAR(16) collate utf8_bin default null," "USER CHAR(" STRINGIFY_ARG(USERNAME_CHAR_LENGTH) ") collate utf8_bin default null,"
"HOST CHAR(60) collate utf8_bin default null," "HOST CHAR(" STRINGIFY_ARG(HOSTNAME_LENGTH) ") collate utf8_bin default null,"
"CURRENT_CONNECTIONS bigint not null," "CURRENT_CONNECTIONS bigint not null,"
"TOTAL_CONNECTIONS bigint not null)") } "TOTAL_CONNECTIONS bigint not null)") }
}; };
......
storage/perfschema/table_esgs_by_account_by_event_name.cc
View file @ a216672d
...@@ -49,8 +49,8 @@ table_esgs_by_account_by_event_name::m_share= ...@@ -49,8 +49,8 @@ table_esgs_by_account_by_event_name::m_share=
sizeof(pos_esgs_by_account_by_event_name), sizeof(pos_esgs_by_account_by_event_name),
&m_table_lock, &m_table_lock,
{ C_STRING_WITH_LEN("CREATE TABLE events_stages_summary_by_account_by_event_name(" { C_STRING_WITH_LEN("CREATE TABLE events_stages_summary_by_account_by_event_name("
"USER CHAR(16) collate utf8_bin default null," "USER CHAR(" STRINGIFY_ARG(USERNAME_CHAR_LENGTH) ") collate utf8_bin default null,"
"HOST CHAR(60) collate utf8_bin default null," "HOST CHAR(" STRINGIFY_ARG(HOSTNAME_LENGTH) ") collate utf8_bin default null,"
"EVENT_NAME VARCHAR(128) not null," "EVENT_NAME VARCHAR(128) not null,"
"COUNT_STAR BIGINT unsigned not null," "COUNT_STAR BIGINT unsigned not null,"
"SUM_TIMER_WAIT BIGINT unsigned not null," "SUM_TIMER_WAIT BIGINT unsigned not null,"
......
storage/perfschema/table_esgs_by_host_by_event_name.cc
View file @ a216672d
...@@ -50,7 +50,7 @@ table_esgs_by_host_by_event_name::m_share= ...@@ -50,7 +50,7 @@ table_esgs_by_host_by_event_name::m_share=
sizeof(pos_esgs_by_host_by_event_name), sizeof(pos_esgs_by_host_by_event_name),
&m_table_lock, &m_table_lock,
{ C_STRING_WITH_LEN("CREATE TABLE events_stages_summary_by_host_by_event_name(" { C_STRING_WITH_LEN("CREATE TABLE events_stages_summary_by_host_by_event_name("
"HOST CHAR(60) collate utf8_bin default null," "HOST CHAR(" STRINGIFY_ARG(HOSTNAME_LENGTH) ") collate utf8_bin default null,"
"EVENT_NAME VARCHAR(128) not null," "EVENT_NAME VARCHAR(128) not null,"
"COUNT_STAR BIGINT unsigned not null," "COUNT_STAR BIGINT unsigned not null,"
"SUM_TIMER_WAIT BIGINT unsigned not null," "SUM_TIMER_WAIT BIGINT unsigned not null,"
......
storage/perfschema/table_esgs_by_user_by_event_name.cc
View file @ a216672d
...@@ -50,7 +50,7 @@ table_esgs_by_user_by_event_name::m_share= ...@@ -50,7 +50,7 @@ table_esgs_by_user_by_event_name::m_share=
sizeof(pos_esgs_by_user_by_event_name), sizeof(pos_esgs_by_user_by_event_name),
&m_table_lock, &m_table_lock,
{ C_STRING_WITH_LEN("CREATE TABLE events_stages_summary_by_user_by_event_name(" { C_STRING_WITH_LEN("CREATE TABLE events_stages_summary_by_user_by_event_name("
"USER CHAR(16) collate utf8_bin default null," "USER CHAR(" STRINGIFY_ARG(USERNAME_CHAR_LENGTH) ") collate utf8_bin default null,"
"EVENT_NAME VARCHAR(128) not null," "EVENT_NAME VARCHAR(128) not null,"
"COUNT_STAR BIGINT unsigned not null," "COUNT_STAR BIGINT unsigned not null,"
"SUM_TIMER_WAIT BIGINT unsigned not null," "SUM_TIMER_WAIT BIGINT unsigned not null,"
......
storage/perfschema/table_esms_by_account_by_event_name.cc
View file @ a216672d
...@@ -49,8 +49,8 @@ table_esms_by_account_by_event_name::m_share= ...@@ -49,8 +49,8 @@ table_esms_by_account_by_event_name::m_share=
sizeof(pos_esms_by_account_by_event_name), sizeof(pos_esms_by_account_by_event_name),
&m_table_lock, &m_table_lock,
{ C_STRING_WITH_LEN("CREATE TABLE events_statements_summary_by_account_by_event_name(" { C_STRING_WITH_LEN("CREATE TABLE events_statements_summary_by_account_by_event_name("
"USER CHAR(16) collate utf8_bin default null," "USER CHAR(" STRINGIFY_ARG(USERNAME_CHAR_LENGTH) ") collate utf8_bin default null,"
"HOST CHAR(60) collate utf8_bin default null," "HOST CHAR(" STRINGIFY_ARG(HOSTNAME_LENGTH) ") collate utf8_bin default null,"
"EVENT_NAME VARCHAR(128) not null," "EVENT_NAME VARCHAR(128) not null,"
"COUNT_STAR BIGINT unsigned not null," "COUNT_STAR BIGINT unsigned not null,"
"SUM_TIMER_WAIT BIGINT unsigned not null," "SUM_TIMER_WAIT BIGINT unsigned not null,"
......
storage/perfschema/table_esms_by_host_by_event_name.cc
View file @ a216672d
...@@ -50,7 +50,7 @@ table_esms_by_host_by_event_name::m_share= ...@@ -50,7 +50,7 @@ table_esms_by_host_by_event_name::m_share=
sizeof(pos_esms_by_host_by_event_name), sizeof(pos_esms_by_host_by_event_name),
&m_table_lock, &m_table_lock,
{ C_STRING_WITH_LEN("CREATE TABLE events_statements_summary_by_host_by_event_name(" { C_STRING_WITH_LEN("CREATE TABLE events_statements_summary_by_host_by_event_name("
"HOST CHAR(60) collate utf8_bin default null," "HOST CHAR(" STRINGIFY_ARG(HOSTNAME_LENGTH) ") collate utf8_bin default null,"
"EVENT_NAME VARCHAR(128) not null," "EVENT_NAME VARCHAR(128) not null,"
"COUNT_STAR BIGINT unsigned not null," "COUNT_STAR BIGINT unsigned not null,"
"SUM_TIMER_WAIT BIGINT unsigned not null," "SUM_TIMER_WAIT BIGINT unsigned not null,"
......
storage/perfschema/table_esms_by_user_by_event_name.cc
View file @ a216672d
...@@ -50,7 +50,7 @@ table_esms_by_user_by_event_name::m_share= ...@@ -50,7 +50,7 @@ table_esms_by_user_by_event_name::m_share=
sizeof(pos_esms_by_user_by_event_name), sizeof(pos_esms_by_user_by_event_name),
&m_table_lock, &m_table_lock,
{ C_STRING_WITH_LEN("CREATE TABLE events_statements_summary_by_user_by_event_name(" { C_STRING_WITH_LEN("CREATE TABLE events_statements_summary_by_user_by_event_name("
"USER CHAR(16) collate utf8_bin default null," "USER CHAR(" STRINGIFY_ARG(USERNAME_CHAR_LENGTH) ") collate utf8_bin default null,"
"EVENT_NAME VARCHAR(128) not null," "EVENT_NAME VARCHAR(128) not null,"
"COUNT_STAR BIGINT unsigned not null," "COUNT_STAR BIGINT unsigned not null,"
"SUM_TIMER_WAIT BIGINT unsigned not null," "SUM_TIMER_WAIT BIGINT unsigned not null,"
......
storage/perfschema/table_ews_by_account_by_event_name.cc
View file @ a216672d
...@@ -49,8 +49,8 @@ table_ews_by_account_by_event_name::m_share= ...@@ -49,8 +49,8 @@ table_ews_by_account_by_event_name::m_share=
sizeof(pos_ews_by_account_by_event_name), sizeof(pos_ews_by_account_by_event_name),
&m_table_lock, &m_table_lock,
{ C_STRING_WITH_LEN("CREATE TABLE events_waits_summary_by_account_by_event_name(" { C_STRING_WITH_LEN("CREATE TABLE events_waits_summary_by_account_by_event_name("
"USER CHAR(16) collate utf8_bin default null," "USER CHAR(" STRINGIFY_ARG(USERNAME_CHAR_LENGTH) ") collate utf8_bin default null,"
"HOST CHAR(60) collate utf8_bin default null," "HOST CHAR(" STRINGIFY_ARG(HOSTNAME_LENGTH) ") collate utf8_bin default null,"
"EVENT_NAME VARCHAR(128) not null," "EVENT_NAME VARCHAR(128) not null,"
"COUNT_STAR BIGINT unsigned not null," "COUNT_STAR BIGINT unsigned not null,"
"SUM_TIMER_WAIT BIGINT unsigned not null," "SUM_TIMER_WAIT BIGINT unsigned not null,"
......
storage/perfschema/table_ews_by_host_by_event_name.cc
View file @ a216672d
...@@ -50,7 +50,7 @@ table_ews_by_host_by_event_name::m_share= ...@@ -50,7 +50,7 @@ table_ews_by_host_by_event_name::m_share=
sizeof(pos_ews_by_host_by_event_name), sizeof(pos_ews_by_host_by_event_name),
&m_table_lock, &m_table_lock,
{ C_STRING_WITH_LEN("CREATE TABLE events_waits_summary_by_host_by_event_name(" { C_STRING_WITH_LEN("CREATE TABLE events_waits_summary_by_host_by_event_name("
"HOST CHAR(60) collate utf8_bin default null," "HOST CHAR(" STRINGIFY_ARG(HOSTNAME_LENGTH) ") collate utf8_bin default null,"
"EVENT_NAME VARCHAR(128) not null," "EVENT_NAME VARCHAR(128) not null,"
"COUNT_STAR BIGINT unsigned not null," "COUNT_STAR BIGINT unsigned not null,"
"SUM_TIMER_WAIT BIGINT unsigned not null," "SUM_TIMER_WAIT BIGINT unsigned not null,"
......
storage/perfschema/table_ews_by_user_by_event_name.cc
View file @ a216672d
...@@ -50,7 +50,7 @@ table_ews_by_user_by_event_name::m_share= ...@@ -50,7 +50,7 @@ table_ews_by_user_by_event_name::m_share=
sizeof(pos_ews_by_user_by_event_name), sizeof(pos_ews_by_user_by_event_name),
&m_table_lock, &m_table_lock,
{ C_STRING_WITH_LEN("CREATE TABLE events_waits_summary_by_user_by_event_name(" { C_STRING_WITH_LEN("CREATE TABLE events_waits_summary_by_user_by_event_name("
"USER CHAR(16) collate utf8_bin default null," "USER CHAR(" STRINGIFY_ARG(USERNAME_CHAR_LENGTH) ") collate utf8_bin default null,"
"EVENT_NAME VARCHAR(128) not null," "EVENT_NAME VARCHAR(128) not null,"
"COUNT_STAR BIGINT unsigned not null," "COUNT_STAR BIGINT unsigned not null,"
"SUM_TIMER_WAIT BIGINT unsigned not null," "SUM_TIMER_WAIT BIGINT unsigned not null,"
......
storage/perfschema/table_hosts.cc
View file @ a216672d
...@@ -44,7 +44,7 @@ table_hosts::m_share= ...@@ -44,7 +44,7 @@ table_hosts::m_share=
sizeof(PFS_simple_index), /* ref length */ sizeof(PFS_simple_index), /* ref length */
&m_table_lock, &m_table_lock,
{ C_STRING_WITH_LEN("CREATE TABLE hosts(" { C_STRING_WITH_LEN("CREATE TABLE hosts("
"HOST CHAR(60) collate utf8_bin default null," "HOST CHAR(" STRINGIFY_ARG(HOSTNAME_LENGTH) ") collate utf8_bin default null,"
"CURRENT_CONNECTIONS bigint not null," "CURRENT_CONNECTIONS bigint not null,"
"TOTAL_CONNECTIONS bigint not null)") } "TOTAL_CONNECTIONS bigint not null)") }
}; };
......
storage/perfschema/table_setup_actors.cc
View file @ a216672d
...@@ -49,9 +49,9 @@ table_setup_actors::m_share= ...@@ -49,9 +49,9 @@ table_setup_actors::m_share=
sizeof(PFS_simple_index), sizeof(PFS_simple_index),
&m_table_lock, &m_table_lock,
{ C_STRING_WITH_LEN("CREATE TABLE setup_actors(" { C_STRING_WITH_LEN("CREATE TABLE setup_actors("
"HOST CHAR(60) collate utf8_bin default '%' not null," "HOST CHAR(" STRINGIFY_ARG(HOSTNAME_LENGTH) ") collate utf8_bin default '%' not null,"
"USER CHAR(16) collate utf8_bin default '%' not null," "USER CHAR(" STRINGIFY_ARG(USERNAME_CHAR_LENGTH) ") collate utf8_bin default '%' not null,"
"ROLE CHAR(16) collate utf8_bin default '%' not null)") } "ROLE CHAR(" STRINGIFY_ARG(USERNAME_CHAR_LENGTH) ") collate utf8_bin default '%' not null)") }
}; };
PFS_engine_table* table_setup_actors::create() PFS_engine_table* table_setup_actors::create()
......
storage/perfschema/table_threads.cc
View file @ a216672d
...@@ -46,8 +46,8 @@ table_threads::m_share= ...@@ -46,8 +46,8 @@ table_threads::m_share=
"NAME VARCHAR(128) not null," "NAME VARCHAR(128) not null,"
"TYPE VARCHAR(10) not null," "TYPE VARCHAR(10) not null,"
"PROCESSLIST_ID BIGINT unsigned," "PROCESSLIST_ID BIGINT unsigned,"
"PROCESSLIST_USER VARCHAR(16)," "PROCESSLIST_USER VARCHAR(" STRINGIFY_ARG(USERNAME_CHAR_LENGTH) "),"
"PROCESSLIST_HOST VARCHAR(60)," "PROCESSLIST_HOST VARCHAR(" STRINGIFY_ARG(HOSTNAME_LENGTH) "),"
"PROCESSLIST_DB VARCHAR(64)," "PROCESSLIST_DB VARCHAR(64),"
"PROCESSLIST_COMMAND VARCHAR(16)," "PROCESSLIST_COMMAND VARCHAR(16),"
"PROCESSLIST_TIME BIGINT," "PROCESSLIST_TIME BIGINT,"
......
storage/perfschema/table_users.cc
View file @ a216672d
...@@ -44,7 +44,7 @@ table_users::m_share= ...@@ -44,7 +44,7 @@ table_users::m_share=
sizeof(PFS_simple_index), /* ref length */ sizeof(PFS_simple_index), /* ref length */
&m_table_lock, &m_table_lock,
{ C_STRING_WITH_LEN("CREATE TABLE users(" { C_STRING_WITH_LEN("CREATE TABLE users("
"USER CHAR(16) collate utf8_bin default null," "USER CHAR(" STRINGIFY_ARG(USERNAME_CHAR_LENGTH) ") collate utf8_bin default null,"
"CURRENT_CONNECTIONS bigint not null," "CURRENT_CONNECTIONS bigint not null,"
"TOTAL_CONNECTIONS bigint not null)") } "TOTAL_CONNECTIONS bigint not null)") }
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7