diff --git a/include/mysql/components/services/psi_thread_bits.h b/include/mysql/components/services/psi_thread_bits.h index ccf7e966b3aa..df3b5ec60135 100644 --- a/include/mysql/components/services/psi_thread_bits.h +++ b/include/mysql/components/services/psi_thread_bits.h @@ -283,7 +283,7 @@ typedef void (*get_thread_event_id_v1_t)(unsigned long long *thread_internal_id, unsigned long long *event_id); /* Duplicate definitions to avoid dependency on mysql_com.h */ -#define PSI_USERNAME_LENGTH (32 * 3) +#define PSI_USERNAME_LENGTH (80 * 3) #define PSI_NAME_LEN (64 * 3) #define PSI_HOSTNAME_LENGTH (60) diff --git a/include/mysql/plugin_auth.h.pp b/include/mysql/plugin_auth.h.pp index 1e037d05db82..bc4f21729990 100644 --- a/include/mysql/plugin_auth.h.pp +++ b/include/mysql/plugin_auth.h.pp @@ -153,7 +153,7 @@ unsigned int user_name_length; const char *auth_string; unsigned long auth_string_length; - char authenticated_as[96 + 1]; + char authenticated_as[240 + 1]; char external_user[512]; int password_used; const char *host_or_ip; diff --git a/include/mysql/plugin_auth_common.h b/include/mysql/plugin_auth_common.h index 02e2635fab9e..8ca618bff7ef 100644 --- a/include/mysql/plugin_auth_common.h +++ b/include/mysql/plugin_auth_common.h @@ -35,7 +35,7 @@ #define MYSQL_PLUGIN_AUTH_COMMON_INCLUDED /** the max allowed length for a user name */ -#define MYSQL_USERNAME_LENGTH 96 +#define MYSQL_USERNAME_LENGTH 240 /** return values of the plugin authenticate_user() method. diff --git a/include/mysql/psi/psi_abi_thread_v1.h.pp b/include/mysql/psi/psi_abi_thread_v1.h.pp index 45592ef59d88..721ac142457e 100644 --- a/include/mysql/psi/psi_abi_thread_v1.h.pp +++ b/include/mysql/psi/psi_abi_thread_v1.h.pp @@ -90,7 +90,7 @@ unsigned long m_processlist_id; unsigned long long m_thread_os_id; void *m_user_data; - char m_username[(32 * 3)]; + char m_username[(80 * 3)]; size_t m_username_length; char m_hostname[(60)]; size_t m_hostname_length; diff --git a/include/mysql_com.h b/include/mysql_com.h index 1aea7ff5096f..c6eedb5bfaa7 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -58,8 +58,8 @@ #define PARTITION_EXPR_CHAR_LEN \ 2048 /**< Maximum expression length in chars \ */ -#define USERNAME_CHAR_LENGTH 32 -#define USERNAME_CHAR_LENGTH_STR "32" +#define USERNAME_CHAR_LENGTH 80 +#define USERNAME_CHAR_LENGTH_STR "80" #ifndef NAME_LEN #define NAME_LEN (NAME_CHAR_LEN * SYSTEM_CHARSET_MBMAXLEN) #endif diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result index d577cdb3bc15..301fdf64a8cc 100644 --- a/mysql-test/r/create.result +++ b/mysql-test/r/create.result @@ -1158,7 +1158,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `ID` bigint(21) unsigned NOT NULL DEFAULT '0', - `USER` varchar(32) NOT NULL DEFAULT '', + `USER` varchar(80) NOT NULL DEFAULT '', `HOST` varchar(64) NOT NULL DEFAULT '', `DB` varchar(64) DEFAULT NULL, `COMMAND` varchar(16) NOT NULL DEFAULT '', @@ -1172,7 +1172,7 @@ show create table t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( `ID` bigint(21) unsigned NOT NULL DEFAULT '0', - `USER` varchar(32) NOT NULL DEFAULT '', + `USER` varchar(80) NOT NULL DEFAULT '', `HOST` varchar(64) NOT NULL DEFAULT '', `DB` varchar(64) DEFAULT NULL, `COMMAND` varchar(16) NOT NULL DEFAULT '', diff --git a/mysql-test/r/dd_is_compatibility_cs.result b/mysql-test/r/dd_is_compatibility_cs.result index 8d1a5dabe9e1..3eb794d4e8a7 100644 --- a/mysql-test/r/dd_is_compatibility_cs.result +++ b/mysql-test/r/dd_is_compatibility_cs.result @@ -123,7 +123,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `ID` bigint(21) unsigned NOT NULL DEFAULT '0', - `USER` varchar(32) NOT NULL DEFAULT '', + `USER` varchar(80) NOT NULL DEFAULT '', `HOST` varchar(64) NOT NULL DEFAULT '', `DB` varchar(64) DEFAULT NULL, `COMMAND` varchar(16) NOT NULL DEFAULT '', diff --git a/mysql-test/r/dd_schema_definition_after_upgrade_debug.result b/mysql-test/r/dd_schema_definition_after_upgrade_debug.result index 2d3a7b33eb48..c081dc6fe65b 100644 --- a/mysql-test/r/dd_schema_definition_after_upgrade_debug.result +++ b/mysql-test/r/dd_schema_definition_after_upgrade_debug.result @@ -218,264 +218,6 @@ SET debug = '-d,skip_dd_table_access_check'; # Remove copied files and stop the server. ######################################################################## ######################################################################## -# Unzip a 8.0.11 datadir, start the server against it and prepare a -# file containing the DD table definitions after upgrade. -######################################################################## -######################################################################## -# Copy and unzip the datadir. -######################################################################## -######################################################################## -# Restart the server against the unzipped datadir. -######################################################################## -######################################################################## -# Execute mysql_upgrade. -######################################################################## -mysql.columns_priv OK -mysql.component OK -mysql.db OK -mysql.default_roles OK -mysql.engine_cost OK -mysql.func OK -mysql.general_log OK -mysql.global_grants OK -mysql.gtid_executed OK -mysql.help_category OK -mysql.help_keyword OK -mysql.help_relation OK -mysql.help_topic OK -mysql.innodb_index_stats OK -mysql.innodb_table_stats OK -mysql.password_history OK -mysql.plugin OK -mysql.procs_priv OK -mysql.proxies_priv OK -mysql.role_edges OK -mysql.server_cost OK -mysql.servers OK -mysql.slave_master_info OK -mysql.slave_relay_log_info OK -mysql.slave_worker_info OK -mysql.slow_log OK -mysql.tables_priv OK -mysql.time_zone OK -mysql.time_zone_leap_second OK -mysql.time_zone_name OK -mysql.time_zone_transition OK -mysql.time_zone_transition_type OK -mysql.user OK -mtr.global_suppressions OK -mtr.test_suppressions OK -sys.sys_config OK -######################################################################## -# Target schema ids for an upgrade from 80011 should hold. -######################################################################## -######################################################################## -# Verify the hard coded ids of the mysql schema, the mysql tablespace, -# the dd_properties table, and the innodb_dynamic_metadata table. -######################################################################## -SET debug = '+d,skip_dd_table_access_check'; -######################################################################## -# The id of the mysql schema must be fixed. -######################################################################## -include/assert.inc [The id of the 'mysql' schema is 1.] -######################################################################## -# The ids of the mysql tablespace must be fixed. -######################################################################## -include/assert.inc [The id of the 'mysql' tablespace is 1.] -include/assert.inc [The SE private id of the 'mysql' tablespace is 4294967294.] -######################################################################## -# The ids of the dd_properties table must be fixed. -######################################################################## -include/assert.inc [The id of 'mysql.dd_properties' is 1.] -include/assert.inc [The SE private id of 'mysql.dd_properties' is 1.] -include/assert.inc [The clustering index id of 'mysql.dd_properties' is 1.] -######################################################################## -# The ids of the innodb_dynamic_metadata table must be fixed. -######################################################################## -include/assert.inc [The id of 'mysql.innodb_dynamic_metadata' is 2.] -include/assert.inc [The SE private id of 'mysql.innodb_dynamic_metadata' is 2.] -include/assert.inc [The index id of 'mysql.innodb_dynamic_metadata' is 2.] -SET debug = '-d,skip_dd_table_access_check'; -######################################################################## -# Assert actual schema table names after upgrade. -######################################################################## -######################################################################## -# Verify the existence of the expected DD tables, neither less nor more. -# Fill two help tables with the DD and DDSE table names. -######################################################################## -SET debug = '+d,skip_dd_table_access_check'; -######################################################################## -# The number of hidden DD/DDSE tables must be as expected. -######################################################################## -include/assert.inc [There are 31 hidden DD/DDSE tables.] -include/assert.inc [There are 33 DD/DDSE tables in total.] -######################################################################## -# No unexpected DD tables must be present. -######################################################################## -include/assert.inc [No unexpected DD tables are present.] -######################################################################## -# All expected DD tables must be present. -######################################################################## -include/assert.inc [All expected DD tables are present.] -######################################################################## -# All expected DDSE tables must be present. -######################################################################## -include/assert.inc [All expected DDSE are be present.] -DROP TABLE test.ddse_table_names; -DROP TABLE test.dd_table_names; -SET debug = '-d,skip_dd_table_access_check'; -######################################################################## -# Dump actual DD table definitions after upgrade to file and -# compare to target. -######################################################################## -######################################################################## -# Verify the DD_VERSION and the CREATE TABLE statements of the -# DD tables. -######################################################################## -SET debug = '+d,skip_dd_table_access_check'; -######################################################################## -# The actual DD version stored on disk. -######################################################################## -######################################################################## -# List the CREATE TABLE statements for the DD tables. -# Mask the AUTO INCREMENT counter, which is not -# deterministic when running mtr. Mask collations that -# depend on the lower case table names setting. -######################################################################## -SET debug = '-d,skip_dd_table_access_check'; -######################################################################## -# Remove copied files and stop the server. -######################################################################## -######################################################################## -# Unzip a 8.0.12 datadir, start the server against it and prepare a -# file containing the DD table definitions after upgrade. -######################################################################## -######################################################################## -# Copy and unzip the datadir. -######################################################################## -######################################################################## -# Restart the server against the unzipped datadir. -######################################################################## -######################################################################## -# Execute mysql_upgrade. -######################################################################## -mysql.columns_priv OK -mysql.component OK -mysql.db OK -mysql.default_roles OK -mysql.engine_cost OK -mysql.func OK -mysql.general_log OK -mysql.global_grants OK -mysql.gtid_executed OK -mysql.help_category OK -mysql.help_keyword OK -mysql.help_relation OK -mysql.help_topic OK -mysql.innodb_index_stats OK -mysql.innodb_table_stats OK -mysql.password_history OK -mysql.plugin OK -mysql.procs_priv OK -mysql.proxies_priv OK -mysql.role_edges OK -mysql.server_cost OK -mysql.servers OK -mysql.slave_master_info OK -mysql.slave_relay_log_info OK -mysql.slave_worker_info OK -mysql.slow_log OK -mysql.tables_priv OK -mysql.time_zone OK -mysql.time_zone_leap_second OK -mysql.time_zone_name OK -mysql.time_zone_transition OK -mysql.time_zone_transition_type OK -mysql.user OK -mtr.global_suppressions OK -mtr.test_suppressions OK -sys.sys_config OK -######################################################################## -# Target schema ids for an upgrade from 80012 should hold. -######################################################################## -######################################################################## -# Verify the hard coded ids of the mysql schema, the mysql tablespace, -# the dd_properties table, and the innodb_dynamic_metadata table. -######################################################################## -SET debug = '+d,skip_dd_table_access_check'; -######################################################################## -# The id of the mysql schema must be fixed. -######################################################################## -include/assert.inc [The id of the 'mysql' schema is 1.] -######################################################################## -# The ids of the mysql tablespace must be fixed. -######################################################################## -include/assert.inc [The id of the 'mysql' tablespace is 1.] -include/assert.inc [The SE private id of the 'mysql' tablespace is 4294967294.] -######################################################################## -# The ids of the dd_properties table must be fixed. -######################################################################## -include/assert.inc [The id of 'mysql.dd_properties' is 1.] -include/assert.inc [The SE private id of 'mysql.dd_properties' is 1.] -include/assert.inc [The clustering index id of 'mysql.dd_properties' is 1.] -######################################################################## -# The ids of the innodb_dynamic_metadata table must be fixed. -######################################################################## -include/assert.inc [The id of 'mysql.innodb_dynamic_metadata' is 2.] -include/assert.inc [The SE private id of 'mysql.innodb_dynamic_metadata' is 2.] -include/assert.inc [The index id of 'mysql.innodb_dynamic_metadata' is 2.] -SET debug = '-d,skip_dd_table_access_check'; -######################################################################## -# Assert actual schema table names after upgrade. -######################################################################## -######################################################################## -# Verify the existence of the expected DD tables, neither less nor more. -# Fill two help tables with the DD and DDSE table names. -######################################################################## -SET debug = '+d,skip_dd_table_access_check'; -######################################################################## -# The number of hidden DD/DDSE tables must be as expected. -######################################################################## -include/assert.inc [There are 31 hidden DD/DDSE tables.] -include/assert.inc [There are 33 DD/DDSE tables in total.] -######################################################################## -# No unexpected DD tables must be present. -######################################################################## -include/assert.inc [No unexpected DD tables are present.] -######################################################################## -# All expected DD tables must be present. -######################################################################## -include/assert.inc [All expected DD tables are present.] -######################################################################## -# All expected DDSE tables must be present. -######################################################################## -include/assert.inc [All expected DDSE are be present.] -DROP TABLE test.ddse_table_names; -DROP TABLE test.dd_table_names; -SET debug = '-d,skip_dd_table_access_check'; -######################################################################## -# Dump actual DD table definitions after upgrade to file and -# compare to target. -######################################################################## -######################################################################## -# Verify the DD_VERSION and the CREATE TABLE statements of the -# DD tables. -######################################################################## -SET debug = '+d,skip_dd_table_access_check'; -######################################################################## -# The actual DD version stored on disk. -######################################################################## -######################################################################## -# List the CREATE TABLE statements for the DD tables. -# Mask the AUTO INCREMENT counter, which is not -# deterministic when running mtr. Mask collations that -# depend on the lower case table names setting. -######################################################################## -SET debug = '-d,skip_dd_table_access_check'; -######################################################################## -# Remove copied files and stop the server. -######################################################################## -######################################################################## # Cleanup: Remove definition files and restart with default options. ######################################################################## # restart diff --git a/mysql-test/r/dd_upgrade_test.result b/mysql-test/r/dd_upgrade_test.result index b602bea54f8a..22b7baf6a005 100644 --- a/mysql-test/r/dd_upgrade_test.result +++ b/mysql-test/r/dd_upgrade_test.result @@ -299,7 +299,7 @@ SHOW CREATE TABLE mysql.user; Table Create Table user CREATE TABLE `user` ( `Host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '', - `User` char(32) COLLATE utf8_bin NOT NULL DEFAULT '', + `User` char(80) COLLATE utf8_bin NOT NULL DEFAULT '', `Select_priv` enum('N','Y') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N', `Insert_priv` enum('N','Y') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N', `Update_priv` enum('N','Y') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N', @@ -550,7 +550,7 @@ threads CREATE TABLE `threads` ( `NAME` varchar(128) NOT NULL, `TYPE` varchar(10) NOT NULL, `PROCESSLIST_ID` bigint(20) unsigned DEFAULT NULL, - `PROCESSLIST_USER` varchar(32) DEFAULT NULL, + `PROCESSLIST_USER` varchar(80) DEFAULT NULL, `PROCESSLIST_HOST` varchar(60) DEFAULT NULL, `PROCESSLIST_DB` varchar(64) DEFAULT NULL, `PROCESSLIST_COMMAND` varchar(16) DEFAULT NULL, diff --git a/mysql-test/r/dictionary_tablespace.result b/mysql-test/r/dictionary_tablespace.result index c678d5e8d206..dcca59babb06 100644 --- a/mysql-test/r/dictionary_tablespace.result +++ b/mysql-test/r/dictionary_tablespace.result @@ -155,6 +155,7 @@ call mtr.add_suppression("table is missing or has an incorrect definition"); call mtr.add_suppression("ACL DDLs will not work unless mysql_upgrade is executed"); call mtr.add_suppression(".* Native table .* has the wrong structure"); call mtr.add_suppression("Column count of mysql.* is wrong"); +call mtr.add_suppression("Cannot load from mysql.* The table is probably corrupted!"); call mtr.add_suppression("The privilege system failed to initialize correctly.*"); call mtr.add_suppression(".*Missing system table mysql.global_grants.*"); call mtr.add_suppression("ACL table mysql.[a-z_]* missing. Some operations may fail."); diff --git a/mysql-test/r/func_system.result b/mysql-test/r/func_system.result index b5e02e2014d2..96a244b712b9 100644 --- a/mysql-test/r/func_system.result +++ b/mysql-test/r/func_system.result @@ -54,7 +54,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `database()` varchar(34) CHARACTER SET utf8 DEFAULT NULL, - `user()` varchar(93) CHARACTER SET utf8 NOT NULL DEFAULT '', + `user()` varchar(141) CHARACTER SET utf8 NOT NULL DEFAULT '', `version` char(60) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci drop table t1; diff --git a/mysql-test/r/grant.result b/mysql-test/r/grant.result index 26559c44031c..0f992d95fd64 100644 --- a/mysql-test/r/grant.result +++ b/mysql-test/r/grant.result @@ -523,7 +523,7 @@ SHOW FIELDS FROM mysql.tables_priv; Field Type Null Key Default Extra Host char(60) NO PRI Db char(64) NO PRI -User char(32) NO PRI +User char(80) NO PRI Table_name char(64) NO PRI Grantor char(93) NO MUL Timestamp timestamp NO CURRENT_TIMESTAMP DEFAULT_GENERATED on update CURRENT_TIMESTAMP @@ -964,8 +964,8 @@ DROP DATABASE mysqltest3; REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'mysqltest_1'@'localhost'; DROP USER 'mysqltest_1'@'localhost'; USE test; -create user mysqltest1_thisisreallyreallyreallyreallyreallyireallyreallytoolong; -ERROR HY000: String 'mysqltest1_thisisreallyreallyreallyreallyreallyireallyreallytoolong' is too long for user name (should be no longer than 32) +create user abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890a; +ERROR HY000: String 'abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij' is too long for user name (should be no longer than 80) CREATE DATABASE mysqltest1; CREATE TABLE mysqltest1.t1 ( int_field INTEGER UNSIGNED NOT NULL, @@ -1032,28 +1032,28 @@ ERROR 42000: DROP command denied to user 'mysqltest_1'@'localhost' for table 't1 DROP USER mysqltest_1@localhost; DROP DATABASE mysqltest1; USE test; -GRANT CREATE ON mysqltest.* TO 1234567890abcdefGHIKL1234567890abcdefGHIKL@localhost; -ERROR HY000: String '1234567890abcdefGHIKL1234567890abcdefGHIKL' is too long for user name (should be no longer than 32) +GRANT CREATE ON mysqltest.* TO abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890a@localhost; +ERROR HY000: String 'abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij' is too long for user name (should be no longer than 80) GRANT CREATE ON mysqltest.* TO some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY; ERROR HY000: String '1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY' is too long for host name (should be no longer than 60) -REVOKE CREATE ON mysqltest.* FROM 1234567890abcdefGHIKL1234567890abcdefGHIKL@localhost; -ERROR HY000: String '1234567890abcdefGHIKL1234567890abcdefGHIKL' is too long for user name (should be no longer than 32) +REVOKE CREATE ON mysqltest.* FROM abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890a@localhost; +ERROR HY000: String 'abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij' is too long for user name (should be no longer than 80) REVOKE CREATE ON mysqltest.* FROM some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY; ERROR HY000: String '1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY' is too long for host name (should be no longer than 60) -GRANT CREATE ON t1 TO 1234567890abcdefGHIKL1234567890abcdefGHIKL@localhost; -ERROR HY000: String '1234567890abcdefGHIKL1234567890abcdefGHIKL' is too long for user name (should be no longer than 32) +GRANT CREATE ON t1 TO abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890a@localhost; +ERROR HY000: String 'abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij' is too long for user name (should be no longer than 80) GRANT CREATE ON t1 TO some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY; ERROR HY000: String '1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY' is too long for host name (should be no longer than 60) -REVOKE CREATE ON t1 FROM 1234567890abcdefGHIKL1234567890abcdefGHIKL@localhost; -ERROR HY000: String '1234567890abcdefGHIKL1234567890abcdefGHIKL' is too long for user name (should be no longer than 32) +REVOKE CREATE ON t1 FROM abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890a@localhost; +ERROR HY000: String 'abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij' is too long for user name (should be no longer than 80) REVOKE CREATE ON t1 FROM some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY; ERROR HY000: String '1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY' is too long for host name (should be no longer than 60) -GRANT EXECUTE ON PROCEDURE p1 TO 1234567890abcdefGHIKL1234567890abcdefGHIKL@localhost; -ERROR HY000: String '1234567890abcdefGHIKL1234567890abcdefGHIKL' is too long for user name (should be no longer than 32) +GRANT EXECUTE ON PROCEDURE p1 TO abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890a@localhost; +ERROR HY000: String 'abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij' is too long for user name (should be no longer than 80) GRANT EXECUTE ON PROCEDURE p1 TO some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY; ERROR HY000: String '1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY' is too long for host name (should be no longer than 60) -REVOKE EXECUTE ON PROCEDURE p1 FROM 1234567890abcdefGHIKL1234567890abcdefGHIKL@localhost; -ERROR HY000: String '1234567890abcdefGHIKL1234567890abcdefGHIKL' is too long for user name (should be no longer than 32) +REVOKE EXECUTE ON PROCEDURE p1 FROM abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890a@localhost; +ERROR HY000: String 'abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij' is too long for user name (should be no longer than 80) REVOKE EXECUTE ON PROCEDURE t1 FROM some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY; ERROR HY000: String '1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY' is too long for host name (should be no longer than 60) CREATE USER bug23556@localhost; @@ -1543,8 +1543,8 @@ user() юзер_юзер@localhost revoke all on test.* from юзер_юзер@localhost; drop user юзер_юзер@localhost; -grant select on test.* to очень_длинный_юзер_very_long_user@localhost; -ERROR HY000: String 'очень_длинный_юзер_very_long_user' is too long for user name (should be no longer than 32) +grant select on test.* to очень_длинный_юзерочень_длинный_юзер_очень_длинный_юзерочень_длинный_юзер_юзерррр@localhost; +ERROR HY000: String 'очень_длинный_юзерочень_длинный_юзер_?' is too long for user name (should be no longer than 80) set names default; create database mysqltest; use mysqltest; @@ -2622,116 +2622,116 @@ CREATE PROCEDURE p1() SELECT b FROM t1; CREATE USER user_name_len_16@localhost; CREATE USER user_name_len_22_01234@localhost; CREATE USER user_name_len_32_012345678901234@localhost; -CREATE USER user_name_len_33_0123456789012345@localhost; -ERROR HY000: String 'user_name_len_33_0123456789012345' is too long for user name (should be no longer than 32) -CREATE USER user_name_len_40_01234567890123456789012@localhost; -ERROR HY000: String 'user_name_len_40_01234567890123456789012' is too long for user name (should be no longer than 32) +CREATE USER user_with_length_81_abcdefghij1234567890abcdefghij1234567890abcdefghij12345678901@localhost; +ERROR HY000: String 'user_with_length_81_abcdefghij1234567890abcdefghij1234567890abcdefghij' is too long for user name (should be no longer than 80) +CREATE USER user_with_length_84_abcdefghij1234567890abcdefghij1234567890abcdefghij12345678901234@localhost; +ERROR HY000: String 'user_with_length_84_abcdefghij1234567890abcdefghij1234567890abcdefghij' is too long for user name (should be no longer than 80) GRANT CREATE ON mysqltest.* TO user_name_len_16@localhost; GRANT CREATE ON mysqltest.* TO user_name_len_22_01234@localhost; GRANT CREATE ON mysqltest.* TO user_name_len_32_012345678901234@localhost; -GRANT CREATE ON mysqltest.* TO user_name_len_33_0123456789012345@localhost; -ERROR HY000: String 'user_name_len_33_0123456789012345' is too long for user name (should be no longer than 32) -GRANT CREATE ON mysqltest.* TO user_name_len_40_01234567890123456789012@localhost; -ERROR HY000: String 'user_name_len_40_01234567890123456789012' is too long for user name (should be no longer than 32) +GRANT CREATE ON mysqltest.* TO user_with_length_81_abcdefghij1234567890abcdefghij1234567890abcdefghij12345678901@localhost; +ERROR HY000: String 'user_with_length_81_abcdefghij1234567890abcdefghij1234567890abcdefghij' is too long for user name (should be no longer than 80) +GRANT CREATE ON mysqltest.* TO user_with_length_84_abcdefghij1234567890abcdefghij1234567890abcdefghij12345678901234@localhost; +ERROR HY000: String 'user_with_length_84_abcdefghij1234567890abcdefghij1234567890abcdefghij' is too long for user name (should be no longer than 80) REVOKE CREATE ON mysqltest.* FROM user_name_len_16@localhost; REVOKE CREATE ON mysqltest.* FROM user_name_len_22_01234@localhost; REVOKE CREATE ON mysqltest.* FROM user_name_len_32_012345678901234@localhost; -REVOKE CREATE ON mysqltest.* FROM user_name_len_33_0123456789012345@localhost; -ERROR HY000: String 'user_name_len_33_0123456789012345' is too long for user name (should be no longer than 32) -REVOKE CREATE ON mysqltest.* FROM user_name_len_40_01234567890123456789012@localhost; -ERROR HY000: String 'user_name_len_40_01234567890123456789012' is too long for user name (should be no longer than 32) +REVOKE CREATE ON mysqltest.* FROM user_with_length_81_abcdefghij1234567890abcdefghij1234567890abcdefghij12345678901@localhost; +ERROR HY000: String 'user_with_length_81_abcdefghij1234567890abcdefghij1234567890abcdefghij' is too long for user name (should be no longer than 80) +REVOKE CREATE ON mysqltest.* FROM user_with_length_84_abcdefghij1234567890abcdefghij1234567890abcdefghij12345678901234@localhost; +ERROR HY000: String 'user_with_length_84_abcdefghij1234567890abcdefghij1234567890abcdefghij' is too long for user name (should be no longer than 80) GRANT CREATE ON t1 TO user_name_len_16@localhost; GRANT CREATE ON t1 TO user_name_len_22_01234@localhost; GRANT CREATE ON t1 TO user_name_len_32_012345678901234@localhost; -GRANT CREATE ON t1 TO user_name_len_33_0123456789012345@localhost; -ERROR HY000: String 'user_name_len_33_0123456789012345' is too long for user name (should be no longer than 32) -GRANT CREATE ON t1 TO user_name_len_40_01234567890123456789012@localhost; -ERROR HY000: String 'user_name_len_40_01234567890123456789012' is too long for user name (should be no longer than 32) +GRANT CREATE ON t1 TO user_with_length_81_abcdefghij1234567890abcdefghij1234567890abcdefghij12345678901@localhost; +ERROR HY000: String 'user_with_length_81_abcdefghij1234567890abcdefghij1234567890abcdefghij' is too long for user name (should be no longer than 80) +GRANT CREATE ON t1 TO user_with_length_84_abcdefghij1234567890abcdefghij1234567890abcdefghij12345678901234@localhost; +ERROR HY000: String 'user_with_length_84_abcdefghij1234567890abcdefghij1234567890abcdefghij' is too long for user name (should be no longer than 80) REVOKE CREATE ON t1 FROM user_name_len_16@localhost; REVOKE CREATE ON t1 FROM user_name_len_22_01234@localhost; REVOKE CREATE ON t1 FROM user_name_len_32_012345678901234@localhost; -REVOKE CREATE ON t1 FROM user_name_len_33_0123456789012345@localhost; -ERROR HY000: String 'user_name_len_33_0123456789012345' is too long for user name (should be no longer than 32) -REVOKE CREATE ON t1 FROM user_name_len_40_01234567890123456789012@localhost; -ERROR HY000: String 'user_name_len_40_01234567890123456789012' is too long for user name (should be no longer than 32) +REVOKE CREATE ON t1 FROM user_with_length_81_abcdefghij1234567890abcdefghij1234567890abcdefghij12345678901@localhost; +ERROR HY000: String 'user_with_length_81_abcdefghij1234567890abcdefghij1234567890abcdefghij' is too long for user name (should be no longer than 80) +REVOKE CREATE ON t1 FROM user_with_length_84_abcdefghij1234567890abcdefghij1234567890abcdefghij12345678901234@localhost; +ERROR HY000: String 'user_with_length_84_abcdefghij1234567890abcdefghij1234567890abcdefghij' is too long for user name (should be no longer than 80) GRANT SELECT ON t1 TO user_name_len_16@localhost; GRANT SELECT ON t1 TO user_name_len_22_01234@localhost; GRANT SELECT ON t1 TO user_name_len_32_012345678901234@localhost; -GRANT SELECT ON t1 TO user_name_len_33_0123456789012345@localhost; -ERROR HY000: String 'user_name_len_33_0123456789012345' is too long for user name (should be no longer than 32) -GRANT SELECT ON t1 TO user_name_len_40_01234567890123456789012@localhost; -ERROR HY000: String 'user_name_len_40_01234567890123456789012' is too long for user name (should be no longer than 32) +GRANT SELECT ON t1 TO user_with_length_81_abcdefghij1234567890abcdefghij1234567890abcdefghij12345678901@localhost; +ERROR HY000: String 'user_with_length_81_abcdefghij1234567890abcdefghij1234567890abcdefghij' is too long for user name (should be no longer than 80) +GRANT SELECT ON t1 TO user_with_length_84_abcdefghij1234567890abcdefghij1234567890abcdefghij12345678901234@localhost; +ERROR HY000: String 'user_with_length_84_abcdefghij1234567890abcdefghij1234567890abcdefghij' is too long for user name (should be no longer than 80) REVOKE SELECT ON t1 FROM user_name_len_16@localhost; REVOKE SELECT ON t1 FROM user_name_len_22_01234@localhost; REVOKE SELECT ON t1 FROM user_name_len_32_012345678901234@localhost; -REVOKE SELECT ON t1 FROM user_name_len_33_0123456789012345@localhost; -ERROR HY000: String 'user_name_len_33_0123456789012345' is too long for user name (should be no longer than 32) -REVOKE SELECT ON t1 FROM user_name_len_40_01234567890123456789012@localhost; -ERROR HY000: String 'user_name_len_40_01234567890123456789012' is too long for user name (should be no longer than 32) +REVOKE SELECT ON t1 FROM user_with_length_81_abcdefghij1234567890abcdefghij1234567890abcdefghij12345678901@localhost; +ERROR HY000: String 'user_with_length_81_abcdefghij1234567890abcdefghij1234567890abcdefghij' is too long for user name (should be no longer than 80) +REVOKE SELECT ON t1 FROM user_with_length_84_abcdefghij1234567890abcdefghij1234567890abcdefghij12345678901234@localhost; +ERROR HY000: String 'user_with_length_84_abcdefghij1234567890abcdefghij1234567890abcdefghij' is too long for user name (should be no longer than 80) GRANT EXECUTE ON PROCEDURE p1 TO user_name_len_16@localhost; GRANT EXECUTE ON PROCEDURE p1 TO user_name_len_22_01234@localhost; GRANT EXECUTE ON PROCEDURE p1 TO user_name_len_32_012345678901234@localhost; -GRANT EXECUTE ON PROCEDURE p1 TO user_name_len_33_0123456789012345@localhost; -ERROR HY000: String 'user_name_len_33_0123456789012345' is too long for user name (should be no longer than 32) -GRANT EXECUTE ON PROCEDURE p1 TO user_name_len_40_01234567890123456789012@localhost; -ERROR HY000: String 'user_name_len_40_01234567890123456789012' is too long for user name (should be no longer than 32) +GRANT EXECUTE ON PROCEDURE p1 TO user_with_length_81_abcdefghij1234567890abcdefghij1234567890abcdefghij12345678901@localhost; +ERROR HY000: String 'user_with_length_81_abcdefghij1234567890abcdefghij1234567890abcdefghij' is too long for user name (should be no longer than 80) +GRANT EXECUTE ON PROCEDURE p1 TO user_with_length_84_abcdefghij1234567890abcdefghij1234567890abcdefghij12345678901234@localhost; +ERROR HY000: String 'user_with_length_84_abcdefghij1234567890abcdefghij1234567890abcdefghij' is too long for user name (should be no longer than 80) REVOKE EXECUTE ON PROCEDURE p1 FROM user_name_len_16@localhost; REVOKE EXECUTE ON PROCEDURE p1 FROM user_name_len_22_01234@localhost; REVOKE EXECUTE ON PROCEDURE p1 FROM user_name_len_32_012345678901234@localhost; -REVOKE EXECUTE ON PROCEDURE p1 FROM user_name_len_33_0123456789012345@localhost; -ERROR HY000: String 'user_name_len_33_0123456789012345' is too long for user name (should be no longer than 32) -REVOKE EXECUTE ON PROCEDURE p1 FROM user_name_len_40_01234567890123456789012@localhost; -ERROR HY000: String 'user_name_len_40_01234567890123456789012' is too long for user name (should be no longer than 32) -DROP USER user_name_len_40_01234567890123456789012@localhost; -ERROR HY000: String 'user_name_len_40_01234567890123456789012' is too long for user name (should be no longer than 32) +REVOKE EXECUTE ON PROCEDURE p1 FROM user_with_length_81_abcdefghij1234567890abcdefghij1234567890abcdefghij12345678901@localhost; +ERROR HY000: String 'user_with_length_81_abcdefghij1234567890abcdefghij1234567890abcdefghij' is too long for user name (should be no longer than 80) +REVOKE EXECUTE ON PROCEDURE p1 FROM user_with_length_84_abcdefghij1234567890abcdefghij1234567890abcdefghij12345678901234@localhost; +ERROR HY000: String 'user_with_length_84_abcdefghij1234567890abcdefghij1234567890abcdefghij' is too long for user name (should be no longer than 80) +DROP USER user_with_length_84_abcdefghij1234567890abcdefghij1234567890abcdefghij12345678901234@localhost; +ERROR HY000: String 'user_with_length_84_abcdefghij1234567890abcdefghij1234567890abcdefghij' is too long for user name (should be no longer than 80) set names utf8; Warnings: Warning 3719 'utf8' is currently an alias for the character set UTF8MB3, but will be an alias for UTF8MB4 in a future release. Please consider using UTF8MB4 in order to be unambiguous. CREATE USER очень_длинный_юз@localhost; CREATE USER очень_очень_длинный_юзер@localhost; CREATE USER очень_очень_очень_длинный_юзер__@localhost; -CREATE USER очень_очень_очень_очень_длинный_юзер@localhost; -ERROR HY000: String 'очень_очень_очень_очень_длинный_юзер' is too long for user name (should be no longer than 32) +CREATE USER очень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзер@localhost; +ERROR HY000: String 'очень_очень_очень_очень_длинный_юзеро?' is too long for user name (should be no longer than 80) GRANT CREATE ON mysqltest.* TO очень_длинный_юз@localhost; GRANT CREATE ON mysqltest.* TO очень_очень_длинный_юзер@localhost; GRANT CREATE ON mysqltest.* TO очень_очень_очень_длинный_юзер__@localhost; -GRANT CREATE ON mysqltest.* TO очень_очень_очень_очень_длинный_юзер@localhost; -ERROR HY000: String 'очень_очень_очень_очень_длинный_юзер' is too long for user name (should be no longer than 32) +GRANT CREATE ON mysqltest.* TO очень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзер@localhost; +ERROR HY000: String 'очень_очень_очень_очень_длинный_юзеро?' is too long for user name (should be no longer than 80) REVOKE CREATE ON mysqltest.* FROM очень_длинный_юз@localhost; REVOKE CREATE ON mysqltest.* FROM очень_очень_длинный_юзер@localhost; REVOKE CREATE ON mysqltest.* FROM очень_очень_очень_длинный_юзер__@localhost; -REVOKE CREATE ON mysqltest.* FROM очень_очень_очень_очень_длинный_юзер@localhost; -ERROR HY000: String 'очень_очень_очень_очень_длинный_юзер' is too long for user name (should be no longer than 32) +REVOKE CREATE ON mysqltest.* FROM очень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзер@localhost; +ERROR HY000: String 'очень_очень_очень_очень_длинный_юзеро?' is too long for user name (should be no longer than 80) GRANT CREATE ON t1 TO очень_длинный_юз@localhost; GRANT CREATE ON t1 TO очень_очень_длинный_юзер@localhost; GRANT CREATE ON t1 TO очень_очень_очень_длинный_юзер__@localhost; -GRANT CREATE ON t1 TO очень_очень_очень_очень_длинный_юзер@localhost; -ERROR HY000: String 'очень_очень_очень_очень_длинный_юзер' is too long for user name (should be no longer than 32) +GRANT CREATE ON t1 TO очень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзер@localhost; +ERROR HY000: String 'очень_очень_очень_очень_длинный_юзеро?' is too long for user name (should be no longer than 80) REVOKE CREATE ON t1 FROM очень_длинный_юз@localhost; REVOKE CREATE ON t1 FROM очень_очень_длинный_юзер@localhost; REVOKE CREATE ON t1 FROM очень_очень_очень_длинный_юзер__@localhost; -REVOKE CREATE ON t1 FROM очень_очень_очень_очень_длинный_юзер@localhost; -ERROR HY000: String 'очень_очень_очень_очень_длинный_юзер' is too long for user name (should be no longer than 32) +REVOKE CREATE ON t1 FROM очень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзер@localhost; +ERROR HY000: String 'очень_очень_очень_очень_длинный_юзеро?' is too long for user name (should be no longer than 80) GRANT SELECT ON t1 TO очень_длинный_юз@localhost; GRANT SELECT ON t1 TO очень_очень_длинный_юзер@localhost; GRANT SELECT ON t1 TO очень_очень_очень_длинный_юзер__@localhost; -GRANT SELECT ON t1 TO очень_очень_очень_очень_длинный_юзер@localhost; -ERROR HY000: String 'очень_очень_очень_очень_длинный_юзер' is too long for user name (should be no longer than 32) +GRANT SELECT ON t1 TO очень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзер@localhost; +ERROR HY000: String 'очень_очень_очень_очень_длинный_юзеро?' is too long for user name (should be no longer than 80) REVOKE SELECT ON t1 FROM очень_длинный_юз@localhost; REVOKE SELECT ON t1 FROM очень_очень_длинный_юзер@localhost; REVOKE SELECT ON t1 FROM очень_очень_очень_длинный_юзер__@localhost; -REVOKE SELECT ON t1 FROM очень_очень_очень_очень_длинный_юзер@localhost; -ERROR HY000: String 'очень_очень_очень_очень_длинный_юзер' is too long for user name (should be no longer than 32) +REVOKE SELECT ON t1 FROM очень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзер@localhost; +ERROR HY000: String 'очень_очень_очень_очень_длинный_юзеро?' is too long for user name (should be no longer than 80) GRANT EXECUTE ON PROCEDURE p1 TO очень_длинный_юз@localhost; GRANT EXECUTE ON PROCEDURE p1 TO очень_очень_длинный_юзер@localhost; GRANT EXECUTE ON PROCEDURE p1 TO очень_очень_очень_длинный_юзер__@localhost; -GRANT EXECUTE ON PROCEDURE p1 TO очень_очень_очень_очень_длинный_юзер@localhost; -ERROR HY000: String 'очень_очень_очень_очень_длинный_юзер' is too long for user name (should be no longer than 32) +GRANT EXECUTE ON PROCEDURE p1 TO очень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзер@localhost; +ERROR HY000: String 'очень_очень_очень_очень_длинный_юзеро?' is too long for user name (should be no longer than 80) REVOKE EXECUTE ON PROCEDURE p1 FROM очень_длинный_юз@localhost; REVOKE EXECUTE ON PROCEDURE p1 FROM очень_очень_длинный_юзер@localhost; REVOKE EXECUTE ON PROCEDURE p1 FROM очень_очень_очень_длинный_юзер__@localhost; -REVOKE EXECUTE ON PROCEDURE p1 FROM очень_очень_очень_очень_длинный_юзер@localhost; -ERROR HY000: String 'очень_очень_очень_очень_длинный_юзер' is too long for user name (should be no longer than 32) +REVOKE EXECUTE ON PROCEDURE p1 FROM очень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзер@localhost; +ERROR HY000: String 'очень_очень_очень_очень_длинный_юзеро?' is too long for user name (should be no longer than 80) # Create a user, assign privileges, try to connect and use the granted # privileges. Trying out different connections (socket/TCP/SSL). CREATE USER user_name_len_25_01234567@localhost; @@ -2775,8 +2775,8 @@ DROP DATABASE db_1; DROP USER очень_длинный_юз@localhost; DROP USER очень_очень_длинный_юзер@localhost; DROP USER очень_очень_очень_длинный_юзер__@localhost; -DROP USER очень_очень_очень_очень_длинный_юзер@localhost; -ERROR HY000: String 'очень_очень_очень_очень_длинный_юзер' is too long for user name (should be no longer than 32) +DROP USER очень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзер@localhost; +ERROR HY000: String 'очень_очень_очень_очень_длинный_юзеро?' is too long for user name (should be no longer than 80) set names default; DROP USER user_name_len_16@localhost; DROP USER user_name_len_22_01234@localhost; diff --git a/mysql-test/r/grant_dynamic.result b/mysql-test/r/grant_dynamic.result index a7672b47e3b6..0933652bd739 100644 --- a/mysql-test/r/grant_dynamic.result +++ b/mysql-test/r/grant_dynamic.result @@ -750,7 +750,7 @@ DROP DATABASE db1_protected; # Restore missing system table and restart the server. CREATE TABLE IF NOT EXISTS mysql.global_grants ( -USER CHAR(32) BINARY DEFAULT '' NOT NULL, +USER CHAR(80) BINARY DEFAULT '' NOT NULL, HOST CHAR(60) BINARY DEFAULT '' NOT NULL, PRIV CHAR(32) COLLATE UTF8_GENERAL_CI DEFAULT '' NOT NULL, WITH_GRANT_OPTION ENUM('N','Y') COLLATE UTF8_GENERAL_CI DEFAULT 'N' NOT NULL, diff --git a/mysql-test/r/join.result b/mysql-test/r/join.result index bcb7622a3eee..6fe495089474 100644 --- a/mysql-test/r/join.result +++ b/mysql-test/r/join.result @@ -770,7 +770,7 @@ columns.TABLE_CATALOG, columns.TABLE_SCHEMA, columns.COLUMN_DEFAULT, columns.IS_ from information_schema.statistics join information_schema.columns using(table_name,column_name) where table_name='user'; TABLE_NAME COLUMN_NAME TABLE_CATALOG TABLE_SCHEMA NON_UNIQUE INDEX_SCHEMA INDEX_NAME SEQ_IN_INDEX COLLATION SUB_PART PACKED NULLABLE INDEX_TYPE COMMENT TABLE_CATALOG TABLE_SCHEMA COLUMN_DEFAULT IS_NULLABLE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE COLUMN_KEY EXTRA PRIVILEGES COLUMN_COMMENT user Host def mysql 0 mysql PRIMARY 1 A NULL NULL BTREE def mysql NO char 60 180 NULL NULL utf8 utf8_bin char(60) PRI select,insert,update,references -user User def mysql 0 mysql PRIMARY 2 A NULL NULL BTREE def mysql NO char 32 96 NULL NULL utf8 utf8_bin char(32) PRI select,insert,update,references +user User def mysql 0 mysql PRIMARY 2 A NULL NULL BTREE def mysql NO char 80 240 NULL NULL utf8 utf8_bin char(80) PRI select,insert,update,references drop table t1; drop table t2; drop table t3; diff --git a/mysql-test/r/mysqlshow_cs.result b/mysql-test/r/mysqlshow_cs.result index d81c97c82f0f..270372da1932 100644 --- a/mysql-test/r/mysqlshow_cs.result +++ b/mysql-test/r/mysqlshow_cs.result @@ -313,7 +313,7 @@ Database: mysql Table: user Wildcard: user +-------+----------+-----------+------+-----+---------+-------+---------------------------------+---------+ | Field | Type | Collation | Null | Key | Default | Extra | Privileges | Comment | +-------+----------+-----------+------+-----+---------+-------+---------------------------------+---------+ -| User | char(32) | utf8_bin | NO | PRI | | | select,insert,update,references | | +| User | char(80) | utf8_bin | NO | PRI | | | select,insert,update,references | | +-------+----------+-----------+------+-----+---------+-------+---------------------------------+---------+ DROP USER 'user_with_length_32_abcdefghijkl'@'localhost'; diff --git a/mysql-test/r/persisted_variables_extended.result b/mysql-test/r/persisted_variables_extended.result index 06541afab43f..262eb9d9c06b 100644 --- a/mysql-test/r/persisted_variables_extended.result +++ b/mysql-test/r/persisted_variables_extended.result @@ -262,7 +262,7 @@ variables_info CREATE TABLE "variables_info" ( "MIN_VALUE" varchar(64) DEFAULT NULL, "MAX_VALUE" varchar(64) DEFAULT NULL, "SET_TIME" timestamp(6) NULL DEFAULT NULL, - "SET_USER" char(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL, + "SET_USER" char(80) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL, "SET_HOST" char(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci CREATE USER 'user1'@'localhost' IDENTIFIED BY 'pass1'; diff --git a/mysql-test/r/plugin_auth.result b/mysql-test/r/plugin_auth.result index ee20bcaab14d..f0d419224605 100644 --- a/mysql-test/r/plugin_auth.result +++ b/mysql-test/r/plugin_auth.result @@ -25,9 +25,9 @@ SHOW CREATE TABLE mysql.proxies_priv; Table Create Table proxies_priv CREATE TABLE `proxies_priv` ( `Host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '', - `User` char(32) COLLATE utf8_bin NOT NULL DEFAULT '', + `User` char(80) COLLATE utf8_bin NOT NULL DEFAULT '', `Proxied_host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '', - `Proxied_user` char(32) COLLATE utf8_bin NOT NULL DEFAULT '', + `Proxied_user` char(80) COLLATE utf8_bin NOT NULL DEFAULT '', `With_grant` tinyint(1) NOT NULL DEFAULT '0', `Grantor` char(93) COLLATE utf8_bin NOT NULL DEFAULT '', `Timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, @@ -527,9 +527,9 @@ SHOW CREATE TABLE mysql.proxies_priv; Table Create Table proxies_priv CREATE TABLE `proxies_priv` ( `Host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '', - `User` char(32) COLLATE utf8_bin NOT NULL DEFAULT '', + `User` char(80) COLLATE utf8_bin NOT NULL DEFAULT '', `Proxied_host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '', - `Proxied_user` char(32) COLLATE utf8_bin NOT NULL DEFAULT '', + `Proxied_user` char(80) COLLATE utf8_bin NOT NULL DEFAULT '', `With_grant` tinyint(1) NOT NULL DEFAULT '0', `Grantor` char(93) COLLATE utf8_bin NOT NULL DEFAULT '', `Timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, @@ -559,9 +559,9 @@ SHOW CREATE TABLE mysql.proxies_priv; Table Create Table proxies_priv CREATE TABLE `proxies_priv` ( `Host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '', - `User` char(32) COLLATE utf8_bin NOT NULL DEFAULT '', + `User` char(80) COLLATE utf8_bin NOT NULL DEFAULT '', `Proxied_host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '', - `Proxied_user` char(32) COLLATE utf8_bin NOT NULL DEFAULT '', + `Proxied_user` char(80) COLLATE utf8_bin NOT NULL DEFAULT '', `With_grant` tinyint(1) NOT NULL DEFAULT '0', `Grantor` char(93) COLLATE utf8_bin NOT NULL DEFAULT '', `Timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, diff --git a/mysql-test/r/roles-upgrade.result b/mysql-test/r/roles-upgrade.result index df3386c51251..d2947afcb336 100644 --- a/mysql-test/r/roles-upgrade.result +++ b/mysql-test/r/roles-upgrade.result @@ -94,9 +94,9 @@ SHOW CREATE TABLE mysql.role_edges; Table Create Table role_edges CREATE TABLE `role_edges` ( `FROM_HOST` char(60) COLLATE utf8_bin NOT NULL DEFAULT '', - `FROM_USER` char(32) COLLATE utf8_bin NOT NULL DEFAULT '', + `FROM_USER` char(80) COLLATE utf8_bin NOT NULL DEFAULT '', `TO_HOST` char(60) COLLATE utf8_bin NOT NULL DEFAULT '', - `TO_USER` char(32) COLLATE utf8_bin NOT NULL DEFAULT '', + `TO_USER` char(80) COLLATE utf8_bin NOT NULL DEFAULT '', `WITH_ADMIN_OPTION` enum('N','Y') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N', PRIMARY KEY (`FROM_HOST`,`FROM_USER`,`TO_HOST`,`TO_USER`) ) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin STATS_PERSISTENT=0 COMMENT='Role hierarchy and role grants' @@ -104,9 +104,9 @@ SHOW CREATE TABLE mysql.default_roles; Table Create Table default_roles CREATE TABLE `default_roles` ( `HOST` char(60) COLLATE utf8_bin NOT NULL DEFAULT '', - `USER` char(32) COLLATE utf8_bin NOT NULL DEFAULT '', + `USER` char(80) COLLATE utf8_bin NOT NULL DEFAULT '', `DEFAULT_ROLE_HOST` char(60) COLLATE utf8_bin NOT NULL DEFAULT '%', - `DEFAULT_ROLE_USER` char(32) COLLATE utf8_bin NOT NULL DEFAULT '', + `DEFAULT_ROLE_USER` char(80) COLLATE utf8_bin NOT NULL DEFAULT '', PRIMARY KEY (`HOST`,`USER`,`DEFAULT_ROLE_HOST`,`DEFAULT_ROLE_USER`) ) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin STATS_PERSISTENT=0 COMMENT='Default roles' CREATE USER u1; diff --git a/mysql-test/r/roles.result b/mysql-test/r/roles.result index dd6efacff178..abdfc2625487 100644 --- a/mysql-test/r/roles.result +++ b/mysql-test/r/roles.result @@ -940,8 +940,8 @@ GRANT `u1234567890123456789012345678901`@`%` TO `u1`@`localhost` REVOKE u1234567890123456789012345678901 FROM u1@localhost; DROP ROLE u1234567890123456789012345678901; DROP USER u1@localhost; -CREATE ROLE `u12345678901234567890123456789012`; -ERROR HY000: String 'u12345678901234567890123456789012' is too long for user name (should be no longer than 32) +CREATE ROLE `user_with_length_81_abcdefghij1234567890abcdefghij1234567890abcdefghij12345678901`; +ERROR HY000: String 'user_with_length_81_abcdefghij1234567890abcdefghij1234567890abcdefghij' is too long for user name (should be no longer than 80) CREATE ROLE `PUBLIC`,`EVENT_SCHEDULER`,`127.0.0.1`,`a b`; DROP ROLE `PUBLIC`,`EVENT_SCHEDULER`,`127.0.0.1`,`a b`; CREATE ROLE PUBLIC; diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result index f234cf52816a..adb5316f0949 100644 --- a/mysql-test/r/sp.result +++ b/mysql-test/r/sp.result @@ -5261,7 +5261,7 @@ CREATE DEFINER=1234567890abcdefGHIKLsdafdsjakfhkshfkshsndvkjsddngjhasdkjghskahfd BEGIN SET @a = 1; END| -ERROR HY000: String '1234567890abcdefGHIKLsdafdsjakfhkshfkshsndvkjsddngjhasdkjghskahfdksjhc' is too long for user name (should be no longer than 32) +ERROR HY000: String '1234567890abcdefGHIKLsdafdsjakfhkshfkshsndvkjsddngjhasdkjghskahfdksjhc' is too long for user name (should be no longer than 80) CREATE DEFINER=some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY FUNCTION bug16899_f1() RETURNS INT BEGIN @@ -8286,9 +8286,9 @@ GRANT EXECUTE ON PROCEDURE test1.p1_len22 TO user_name_len_16@localhost; # p1_len22 procedure CALL test1.p1_len22(); int_field char_field -CREATE DEFINER=user_name_len_33_0123456789012345@localhost PROCEDURE test1.p1_len33() +CREATE DEFINER=abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890a@localhost PROCEDURE test1.p1_len33() SELECT * FROM test1.t1; -ERROR HY000: String 'user_name_len_33_0123456789012345' is too long for user name (should be no longer than 32) +ERROR HY000: String 'abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij' is too long for user name (should be no longer than 80) # REVOKE the SELECT permission from user_name_len_22_01234 REVOKE SELECT ON test1.t1 FROM user_name_len_22_01234@localhost; # and GRANT it to user_name_len_32_012345678901234 @@ -8318,9 +8318,9 @@ GRANT EXECUTE ON PROCEDURE test1.p1_len22 TO user_name_len_16@localhost; # security context CALL test1.p1_len22(); ERROR 42000: SELECT command denied to user 'user_name_len_16'@'localhost' for table 't1' -CREATE DEFINER=user_name_len_33_0123456789012345@localhost FUNCTION test1.f1_len33() RETURNS INT +CREATE DEFINER=abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890a@localhost FUNCTION test1.f1_len33() RETURNS INT RETURN (SELECT COUNT(*) FROM test1.t1); -ERROR HY000: String 'user_name_len_33_0123456789012345' is too long for user name (should be no longer than 32) +ERROR HY000: String 'abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij' is too long for user name (should be no longer than 80) DROP DATABASE test1; DROP USER user_name_len_16@localhost; DROP USER user_name_len_22_01234@localhost; diff --git a/mysql-test/r/system_mysql_db.result b/mysql-test/r/system_mysql_db.result index 9ca6a447bd95..3b8110e0287c 100644 --- a/mysql-test/r/system_mysql_db.result +++ b/mysql-test/r/system_mysql_db.result @@ -38,7 +38,7 @@ Table Create Table db CREATE TABLE `db` ( `Host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '', `Db` char(64) COLLATE utf8_bin NOT NULL DEFAULT '', - `User` char(32) COLLATE utf8_bin NOT NULL DEFAULT '', + `User` char(80) COLLATE utf8_bin NOT NULL DEFAULT '', `Select_priv` enum('N','Y') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N', `Insert_priv` enum('N','Y') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N', `Update_priv` enum('N','Y') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N', @@ -65,7 +65,7 @@ show create table user; Table Create Table user CREATE TABLE `user` ( `Host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '', - `User` char(32) COLLATE utf8_bin NOT NULL DEFAULT '', + `User` char(80) COLLATE utf8_bin NOT NULL DEFAULT '', `Select_priv` enum('N','Y') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N', `Insert_priv` enum('N','Y') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N', `Update_priv` enum('N','Y') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N', @@ -130,7 +130,7 @@ Table Create Table tables_priv CREATE TABLE `tables_priv` ( `Host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '', `Db` char(64) COLLATE utf8_bin NOT NULL DEFAULT '', - `User` char(32) COLLATE utf8_bin NOT NULL DEFAULT '', + `User` char(80) COLLATE utf8_bin NOT NULL DEFAULT '', `Table_name` char(64) COLLATE utf8_bin NOT NULL DEFAULT '', `Grantor` char(93) COLLATE utf8_bin NOT NULL DEFAULT '', `Timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, @@ -144,7 +144,7 @@ Table Create Table columns_priv CREATE TABLE `columns_priv` ( `Host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '', `Db` char(64) COLLATE utf8_bin NOT NULL DEFAULT '', - `User` char(32) COLLATE utf8_bin NOT NULL DEFAULT '', + `User` char(80) COLLATE utf8_bin NOT NULL DEFAULT '', `Table_name` char(64) COLLATE utf8_bin NOT NULL DEFAULT '', `Column_name` char(64) COLLATE utf8_bin NOT NULL DEFAULT '', `Timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, @@ -156,7 +156,7 @@ Table Create Table procs_priv CREATE TABLE `procs_priv` ( `Host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '', `Db` char(64) COLLATE utf8_bin NOT NULL DEFAULT '', - `User` char(32) COLLATE utf8_bin NOT NULL DEFAULT '', + `User` char(80) COLLATE utf8_bin NOT NULL DEFAULT '', `Routine_name` char(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '', `Routine_type` enum('FUNCTION','PROCEDURE') COLLATE utf8_bin NOT NULL, `Grantor` char(93) COLLATE utf8_bin NOT NULL DEFAULT '', diff --git a/mysql-test/r/trigger.result b/mysql-test/r/trigger.result index 038dcb7ac193..2a139197a221 100644 --- a/mysql-test/r/trigger.result +++ b/mysql-test/r/trigger.result @@ -1105,9 +1105,9 @@ DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t2; CREATE TABLE t1(c INT); CREATE TABLE t2(c INT); -CREATE DEFINER=1234567890abcdefGHIKL1234567890abcdefGHIKL@localhost +CREATE DEFINER=abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890a@localhost TRIGGER t1_bi BEFORE INSERT ON t1 FOR EACH ROW SET @a = 1; -ERROR HY000: String '1234567890abcdefGHIKL1234567890abcdefGHIKL' is too long for user name (should be no longer than 32) +ERROR HY000: String 'abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij' is too long for user name (should be no longer than 80) CREATE DEFINER=some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY TRIGGER t2_bi BEFORE INSERT ON t2 FOR EACH ROW SET @a = 2; ERROR HY000: String '1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY' is too long for host name (should be no longer than 60) @@ -3191,9 +3191,9 @@ INSERT INTO test1.t1 VALUES (1,'haha'); SELECT @a; @a 1 -CREATE DEFINER=user_name_len_33_0123456789012345@localhost +CREATE DEFINER=abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890a@localhost TRIGGER test1.t1_bi BEFORE INSERT ON test1.t1 FOR EACH ROW SET @a = (SELECT COUNT(*) FROM test1.t1); -ERROR HY000: String 'user_name_len_33_0123456789012345' is too long for user name (should be no longer than 32) +ERROR HY000: String 'abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij' is too long for user name (should be no longer than 80) DROP DATABASE test1; DROP USER user_name_len_22_01234@localhost; DROP USER user_name_len_32_012345678901234@localhost; diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result index 128ffd8de1d0..9e923ff00bb5 100644 --- a/mysql-test/r/view.result +++ b/mysql-test/r/view.result @@ -3089,9 +3089,9 @@ DROP TABLE IF EXISTS t1; DROP VIEW IF EXISTS v1; DROP VIEW IF EXISTS v2; CREATE TABLE t1(a INT, b INT); -CREATE DEFINER=1234567890abcdefGHIKL1234567890abcdefGHIKL@localhost +CREATE DEFINER=abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890a@localhost VIEW v1 AS SELECT a FROM t1; -ERROR HY000: String '1234567890abcdefGHIKL1234567890abcdefGHIKL' is too long for user name (should be no longer than 32) +ERROR HY000: String 'abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij' is too long for user name (should be no longer than 80) CREATE DEFINER=some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY VIEW v2 AS SELECT b FROM t1; ERROR HY000: String '1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY' is too long for host name (should be no longer than 60) diff --git a/mysql-test/r/view_grant.result b/mysql-test/r/view_grant.result index 8826d406a377..017a4bc4a78c 100644 --- a/mysql-test/r/view_grant.result +++ b/mysql-test/r/view_grant.result @@ -2668,9 +2668,9 @@ connection con_user_22; SELECT * FROM test1.v1; int_field connection default; -CREATE DEFINER=user_name_len_33_0123456789012345@localhost +CREATE DEFINER=user_with_length_81_abcdefghij1234567890abcdefghij1234567890abcdefghij12345678901@localhost VIEW test1.v2 AS SELECT int_field FROM test1.t1; -ERROR HY000: String 'user_name_len_33_0123456789012345' is too long for user name (should be no longer than 32) +ERROR HY000: String 'user_with_length_81_abcdefghij1234567890abcdefghij1234567890abcdefghij' is too long for user name (should be no longer than 80) DROP DATABASE test1; DROP USER user_name_len_22_01234@localhost; DROP USER user_name_len_32_012345678901234@localhost; diff --git a/mysql-test/std_data/dd/sdi/innodb_sdi/mysql.json b/mysql-test/std_data/dd/sdi/innodb_sdi/mysql.json index a3f709368509..fb16177669b7 100644 --- a/mysql-test/std_data/dd/sdi/innodb_sdi/mysql.json +++ b/mysql-test/std_data/dd/sdi/innodb_sdi/mysql.json @@ -22919,7 +22919,7 @@ "is_virtual": false, "hidden": 1, "ordinal_position": 3, - "char_length": 96, + "char_length": 240, "numeric_precision": 0, "numeric_scale": 0, "numeric_scale_null": true, @@ -22940,7 +22940,7 @@ "options": "interval_count=0;", "se_private_data": "table_id=X", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -23917,7 +23917,7 @@ }, { "ordinal_position": 3, - "length": 96, + "length": 240, "order": 2, "column_opx": 2 }, @@ -24066,7 +24066,7 @@ "elements": [ { "ordinal_position": 1, - "length": 96, + "length": 240, "order": 2, "column_opx": 2 }, @@ -24157,7 +24157,7 @@ "is_virtual": false, "hidden": 1, "ordinal_position": 2, - "char_length": 96, + "char_length": 240, "numeric_precision": 0, "numeric_scale": 0, "numeric_scale_null": true, @@ -24178,7 +24178,7 @@ "options": "interval_count=0;", "se_private_data": "table_id=X", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -26345,7 +26345,7 @@ }, { "ordinal_position": 2, - "length": 96, + "length": 240, "order": 2, "column_opx": 1 }, @@ -26724,7 +26724,7 @@ "is_virtual": false, "hidden": 1, "ordinal_position": 2, - "char_length": 96, + "char_length": 240, "numeric_precision": 0, "numeric_scale": 0, "numeric_scale_null": true, @@ -26745,7 +26745,7 @@ "options": "interval_count=0;", "se_private_data": "table_id=X", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -26796,7 +26796,7 @@ "is_virtual": false, "hidden": 1, "ordinal_position": 4, - "char_length": 96, + "char_length": 240, "numeric_precision": 0, "numeric_scale": 0, "numeric_scale_null": true, @@ -26817,7 +26817,7 @@ "options": "interval_count=0;", "se_private_data": "table_id=X", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -26933,7 +26933,7 @@ }, { "ordinal_position": 2, - "length": 96, + "length": 240, "order": 2, "column_opx": 1 }, @@ -26945,7 +26945,7 @@ }, { "ordinal_position": 4, - "length": 96, + "length": 240, "order": 2, "column_opx": 3 }, @@ -27036,7 +27036,7 @@ "is_virtual": false, "hidden": 1, "ordinal_position": 2, - "char_length": 96, + "char_length": 240, "numeric_precision": 0, "numeric_scale": 0, "numeric_scale_null": true, @@ -27057,7 +27057,7 @@ "options": "interval_count=0;", "se_private_data": "table_id=X", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -27108,7 +27108,7 @@ "is_virtual": false, "hidden": 1, "ordinal_position": 4, - "char_length": 96, + "char_length": 240, "numeric_precision": 0, "numeric_scale": 0, "numeric_scale_null": true, @@ -27129,7 +27129,7 @@ "options": "interval_count=0;", "se_private_data": "table_id=X", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -27290,7 +27290,7 @@ }, { "ordinal_position": 2, - "length": 96, + "length": 240, "order": 2, "column_opx": 1 }, @@ -27302,7 +27302,7 @@ }, { "ordinal_position": 4, - "length": 96, + "length": 240, "order": 2, "column_opx": 3 }, @@ -27363,7 +27363,7 @@ "is_virtual": false, "hidden": 1, "ordinal_position": 1, - "char_length": 96, + "char_length": 240, "numeric_precision": 0, "numeric_scale": 0, "numeric_scale_null": true, @@ -27384,7 +27384,7 @@ "options": "interval_count=0;", "se_private_data": "table_id=X", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -27611,7 +27611,7 @@ "elements": [ { "ordinal_position": 1, - "length": 96, + "length": 240, "order": 2, "column_opx": 0 }, @@ -27720,7 +27720,7 @@ "is_virtual": false, "hidden": 1, "ordinal_position": 2, - "char_length": 96, + "char_length": 240, "numeric_precision": 0, "numeric_scale": 0, "numeric_scale_null": true, @@ -27741,7 +27741,7 @@ "options": "interval_count=0;", "se_private_data": "table_id=X", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -27929,7 +27929,7 @@ }, { "ordinal_position": 2, - "length": 96, + "length": 240, "order": 2, "column_opx": 1 }, @@ -29139,7 +29139,7 @@ "is_virtual": false, "hidden": 1, "ordinal_position": 3, - "char_length": 96, + "char_length": 240, "numeric_precision": 0, "numeric_scale": 0, "numeric_scale_null": true, @@ -29160,7 +29160,7 @@ "options": "interval_count=0;", "se_private_data": "table_id=X", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -29532,7 +29532,7 @@ }, { "ordinal_position": 3, - "length": 96, + "length": 240, "order": 2, "column_opx": 2 }, @@ -29736,7 +29736,7 @@ "is_virtual": false, "hidden": 1, "ordinal_position": 3, - "char_length": 96, + "char_length": 240, "numeric_precision": 0, "numeric_scale": 0, "numeric_scale_null": true, @@ -29757,7 +29757,7 @@ "options": "interval_count=0;", "se_private_data": "table_id=X", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -30040,7 +30040,7 @@ }, { "ordinal_position": 3, - "length": 96, + "length": 240, "order": 2, "column_opx": 2 }, @@ -32759,7 +32759,7 @@ "is_virtual": false, "hidden": 1, "ordinal_position": 3, - "char_length": 96, + "char_length": 240, "numeric_precision": 0, "numeric_scale": 0, "numeric_scale_null": true, @@ -32780,7 +32780,7 @@ "options": "interval_count=0;", "se_private_data": "table_id=X", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -33104,7 +33104,7 @@ }, { "ordinal_position": 3, - "length": 96, + "length": 240, "order": 2, "column_opx": 2 }, @@ -37088,7 +37088,7 @@ "is_virtual": false, "hidden": 1, "ordinal_position": 2, - "char_length": 96, + "char_length": 240, "numeric_precision": 0, "numeric_scale": 0, "numeric_scale_null": true, @@ -37109,7 +37109,7 @@ "options": "interval_count=0;", "se_private_data": "table_id=X", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -37160,7 +37160,7 @@ "is_virtual": false, "hidden": 1, "ordinal_position": 4, - "char_length": 96, + "char_length": 240, "numeric_precision": 0, "numeric_scale": 0, "numeric_scale_null": true, @@ -37181,7 +37181,7 @@ "options": "interval_count=0;", "se_private_data": "table_id=X", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -37405,7 +37405,7 @@ }, { "ordinal_position": 2, - "length": 96, + "length": 240, "order": 2, "column_opx": 1 }, @@ -37417,7 +37417,7 @@ }, { "ordinal_position": 4, - "length": 96, + "length": 240, "order": 2, "column_opx": 3 }, diff --git a/mysql-test/std_data/dd/sdi/upgrade/mysql.json b/mysql-test/std_data/dd/sdi/upgrade/mysql.json index ef067f4690c4..c86ee43f3f7a 100644 --- a/mysql-test/std_data/dd/sdi/upgrade/mysql.json +++ b/mysql-test/std_data/dd/sdi/upgrade/mysql.json @@ -22883,7 +22883,7 @@ "is_virtual": false, "hidden": 1, "ordinal_position": 2, - "char_length": 96, + "char_length": 240, "numeric_precision": 0, "numeric_scale": 0, "numeric_scale_null": true, @@ -22904,7 +22904,7 @@ "options": "interval_count=0;", "se_private_data": "table_id=X", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -22955,7 +22955,7 @@ "is_virtual": false, "hidden": 1, "ordinal_position": 4, - "char_length": 96, + "char_length": 240, "numeric_precision": 0, "numeric_scale": 0, "numeric_scale_null": true, @@ -22976,7 +22976,7 @@ "options": "interval_count=0;", "se_private_data": "table_id=X", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -23092,7 +23092,7 @@ }, { "ordinal_position": 2, - "length": 96, + "length": 240, "order": 2, "column_opx": 1 }, @@ -23104,7 +23104,7 @@ }, { "ordinal_position": 4, - "length": 96, + "length": 240, "order": 2, "column_opx": 3 }, @@ -23195,7 +23195,7 @@ "is_virtual": false, "hidden": 1, "ordinal_position": 2, - "char_length": 96, + "char_length": 240, "numeric_precision": 0, "numeric_scale": 0, "numeric_scale_null": true, @@ -23216,7 +23216,7 @@ "options": "interval_count=0;", "se_private_data": "table_id=X", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -23267,7 +23267,7 @@ "is_virtual": false, "hidden": 1, "ordinal_position": 4, - "char_length": 96, + "char_length": 240, "numeric_precision": 0, "numeric_scale": 0, "numeric_scale_null": true, @@ -23288,7 +23288,7 @@ "options": "interval_count=0;", "se_private_data": "table_id=X", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -23449,7 +23449,7 @@ }, { "ordinal_position": 2, - "length": 96, + "length": 240, "order": 2, "column_opx": 1 }, @@ -23461,7 +23461,7 @@ }, { "ordinal_position": 4, - "length": 96, + "length": 240, "order": 2, "column_opx": 3 }, @@ -23522,7 +23522,7 @@ "is_virtual": false, "hidden": 1, "ordinal_position": 1, - "char_length": 96, + "char_length": 240, "numeric_precision": 0, "numeric_scale": 0, "numeric_scale_null": true, @@ -23543,7 +23543,7 @@ "options": "interval_count=0;", "se_private_data": "table_id=X", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -23770,7 +23770,7 @@ "elements": [ { "ordinal_position": 1, - "length": 96, + "length": 240, "order": 2, "column_opx": 0 }, @@ -23879,7 +23879,7 @@ "is_virtual": false, "hidden": 1, "ordinal_position": 2, - "char_length": 96, + "char_length": 240, "numeric_precision": 0, "numeric_scale": 0, "numeric_scale_null": true, @@ -23900,7 +23900,7 @@ "options": "interval_count=0;", "se_private_data": "table_id=X", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -24088,7 +24088,7 @@ }, { "ordinal_position": 2, - "length": 96, + "length": 240, "order": 2, "column_opx": 1 }, @@ -24497,7 +24497,7 @@ "is_virtual": false, "hidden": 1, "ordinal_position": 3, - "char_length": 96, + "char_length": 240, "numeric_precision": 0, "numeric_scale": 0, "numeric_scale_null": true, @@ -24518,7 +24518,7 @@ "options": "interval_count=0;", "se_private_data": "table_id=X", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -25495,7 +25495,7 @@ }, { "ordinal_position": 3, - "length": 96, + "length": 240, "order": 2, "column_opx": 2 }, @@ -25644,7 +25644,7 @@ "elements": [ { "ordinal_position": 1, - "length": 96, + "length": 240, "order": 2, "column_opx": 2 }, @@ -25735,7 +25735,7 @@ "is_virtual": false, "hidden": 1, "ordinal_position": 2, - "char_length": 96, + "char_length": 240, "numeric_precision": 0, "numeric_scale": 0, "numeric_scale_null": true, @@ -25756,7 +25756,7 @@ "options": "interval_count=0;", "se_private_data": "table_id=X", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -27923,7 +27923,7 @@ }, { "ordinal_position": 2, - "length": 96, + "length": 240, "order": 2, "column_opx": 1 }, @@ -28338,7 +28338,7 @@ "is_virtual": false, "hidden": 1, "ordinal_position": 3, - "char_length": 96, + "char_length": 240, "numeric_precision": 0, "numeric_scale": 0, "numeric_scale_null": true, @@ -28359,7 +28359,7 @@ "options": "interval_count=0;", "se_private_data": "table_id=X", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -28731,7 +28731,7 @@ }, { "ordinal_position": 3, - "length": 96, + "length": 240, "order": 2, "column_opx": 2 }, @@ -28935,7 +28935,7 @@ "is_virtual": false, "hidden": 1, "ordinal_position": 3, - "char_length": 96, + "char_length": 240, "numeric_precision": 0, "numeric_scale": 0, "numeric_scale_null": true, @@ -28956,7 +28956,7 @@ "options": "interval_count=0;", "se_private_data": "table_id=X", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -29239,7 +29239,7 @@ }, { "ordinal_position": 3, - "length": 96, + "length": 240, "order": 2, "column_opx": 2 }, @@ -29390,7 +29390,7 @@ "is_virtual": false, "hidden": 1, "ordinal_position": 3, - "char_length": 96, + "char_length": 240, "numeric_precision": 0, "numeric_scale": 0, "numeric_scale_null": true, @@ -29411,7 +29411,7 @@ "options": "interval_count=0;", "se_private_data": "table_id=X", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -29735,7 +29735,7 @@ }, { "ordinal_position": 3, - "length": 96, + "length": 240, "order": 2, "column_opx": 2 }, @@ -29909,7 +29909,7 @@ "is_virtual": false, "hidden": 1, "ordinal_position": 2, - "char_length": 96, + "char_length": 240, "numeric_precision": 0, "numeric_scale": 0, "numeric_scale_null": true, @@ -29930,7 +29930,7 @@ "options": "interval_count=0;", "se_private_data": "table_id=X", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -29981,7 +29981,7 @@ "is_virtual": false, "hidden": 1, "ordinal_position": 4, - "char_length": 96, + "char_length": 240, "numeric_precision": 0, "numeric_scale": 0, "numeric_scale_null": true, @@ -30002,7 +30002,7 @@ "options": "interval_count=0;", "se_private_data": "table_id=X", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -30226,7 +30226,7 @@ }, { "ordinal_position": 2, - "length": 96, + "length": 240, "order": 2, "column_opx": 1 }, @@ -30238,7 +30238,7 @@ }, { "ordinal_position": 4, - "length": 96, + "length": 240, "order": 2, "column_opx": 3 }, diff --git a/mysql-test/suite/auth_sec/r/ssl_mode.result b/mysql-test/suite/auth_sec/r/ssl_mode.result index cc2fab88db8a..3e75042c9608 100644 --- a/mysql-test/suite/auth_sec/r/ssl_mode.result +++ b/mysql-test/suite/auth_sec/r/ssl_mode.result @@ -6,7 +6,7 @@ Database: mysql Table: user Wildcard: user +-------+----------+-----------+------+-----+---------+-------+---------------------------------+---------+ | Field | Type | Collation | Null | Key | Default | Extra | Privileges | Comment | +-------+----------+-----------+------+-----+---------+-------+---------------------------------+---------+ -| User | char(32) | utf8_bin | NO | PRI | | | select,insert,update,references | | +| User | char(80) | utf8_bin | NO | PRI | | | select,insert,update,references | | +-------+----------+-----------+------+-----+---------+-------+---------------------------------+---------+ mysql.test: Records: 1 Deleted: 0 Skipped: 0 Warnings: 1 # Testing of all clients with ssl mode REQUIRED @@ -15,7 +15,7 @@ Database: mysql Table: user Wildcard: user +-------+----------+-----------+------+-----+---------+-------+---------------------------------+---------+ | Field | Type | Collation | Null | Key | Default | Extra | Privileges | Comment | +-------+----------+-----------+------+-----+---------+-------+---------------------------------+---------+ -| User | char(32) | utf8_bin | NO | PRI | | | select,insert,update,references | | +| User | char(80) | utf8_bin | NO | PRI | | | select,insert,update,references | | +-------+----------+-----------+------+-----+---------+-------+---------------------------------+---------+ mysql.test: Records: 1 Deleted: 0 Skipped: 0 Warnings: 1 # Testing of all clients with ssl mode VERIFY_CA @@ -24,7 +24,7 @@ Database: mysql Table: user Wildcard: user +-------+----------+-----------+------+-----+---------+-------+---------------------------------+---------+ | Field | Type | Collation | Null | Key | Default | Extra | Privileges | Comment | +-------+----------+-----------+------+-----+---------+-------+---------------------------------+---------+ -| User | char(32) | utf8_bin | NO | PRI | | | select,insert,update,references | | +| User | char(80) | utf8_bin | NO | PRI | | | select,insert,update,references | | +-------+----------+-----------+------+-----+---------+-------+---------------------------------+---------+ mysql.test: Records: 1 Deleted: 0 Skipped: 0 Warnings: 1 # Testing of all clients with ssl mode VERIFY_IDENTITY @@ -33,7 +33,7 @@ Database: mysql Table: user Wildcard: user +-------+----------+-----------+------+-----+---------+-------+---------------------------------+---------+ | Field | Type | Collation | Null | Key | Default | Extra | Privileges | Comment | +-------+----------+-----------+------+-----+---------+-------+---------------------------------+---------+ -| User | char(32) | utf8_bin | NO | PRI | | | select,insert,update,references | | +| User | char(80) | utf8_bin | NO | PRI | | | select,insert,update,references | | +-------+----------+-----------+------+-----+---------+-------+---------------------------------+---------+ mysql.test: Records: 1 Deleted: 0 Skipped: 0 Warnings: 1 # Tests related to deprecation of ssl options diff --git a/mysql-test/suite/funcs_1/r/is_columns_is_cs.result b/mysql-test/suite/funcs_1/r/is_columns_is_cs.result index f2ab9b39ae53..93fb2b8cfc91 100644 --- a/mysql-test/suite/funcs_1/r/is_columns_is_cs.result +++ b/mysql-test/suite/funcs_1/r/is_columns_is_cs.result @@ -191,7 +191,7 @@ def information_schema PLUGINS PLUGIN_DESCRIPTION 9 YES varchar 21845 65535 NUL def information_schema PLUGINS PLUGIN_LICENSE 10 YES varchar 26 80 NULL NULL NULL utf8 utf8_general_ci varchar(80) select NULL def information_schema PLUGINS LOAD_OPTION 11 NO varchar 21 64 NULL NULL NULL utf8 utf8_general_ci varchar(64) select NULL def information_schema PROCESSLIST ID 1 NO bigint NULL NULL NULL NULL NULL NULL NULL bigint(21) unsigned select NULL -def information_schema PROCESSLIST USER 2 NO varchar 10 32 NULL NULL NULL utf8 utf8_general_ci varchar(32) select NULL +def information_schema PROCESSLIST USER 2 NO varchar 26 80 NULL NULL NULL utf8 utf8_general_ci varchar(80) select NULL def information_schema PROCESSLIST HOST 3 NO varchar 21 64 NULL NULL NULL utf8 utf8_general_ci varchar(64) select NULL def information_schema PROCESSLIST DB 4 YES varchar 21 64 NULL NULL NULL utf8 utf8_general_ci varchar(64) select NULL def information_schema PROCESSLIST COMMAND 5 NO varchar 5 16 NULL NULL NULL utf8 utf8_general_ci varchar(16) select NULL @@ -643,7 +643,7 @@ NULL information_schema PARTITIONS CHECKSUM bigint NULL NULL NULL NULL bigint(21 3.0769 information_schema PLUGINS PLUGIN_LICENSE varchar 26 80 utf8 utf8_general_ci varchar(80) 3.0476 information_schema PLUGINS LOAD_OPTION varchar 21 64 utf8 utf8_general_ci varchar(64) NULL information_schema PROCESSLIST ID bigint NULL NULL NULL NULL bigint(21) unsigned -3.2000 information_schema PROCESSLIST USER varchar 10 32 utf8 utf8_general_ci varchar(32) +3.0769 information_schema PROCESSLIST USER varchar 26 80 utf8 utf8_general_ci varchar(80) 3.0476 information_schema PROCESSLIST HOST varchar 21 64 utf8 utf8_general_ci varchar(64) 3.0476 information_schema PROCESSLIST DB varchar 21 64 utf8 utf8_general_ci varchar(64) 3.2000 information_schema PROCESSLIST COMMAND varchar 5 16 utf8 utf8_general_ci varchar(16) diff --git a/mysql-test/suite/funcs_1/r/is_columns_mysql.result b/mysql-test/suite/funcs_1/r/is_columns_mysql.result index 3e525d474aa1..f34e0167a10f 100644 --- a/mysql-test/suite/funcs_1/r/is_columns_mysql.result +++ b/mysql-test/suite/funcs_1/r/is_columns_mysql.result @@ -7,7 +7,7 @@ ordinal_position; 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 GENERATION_EXPRESSION SRS_ID def mysql columns_priv Host 1 NO char 60 180 NULL NULL NULL utf8 utf8_bin char(60) PRI select,insert,update,references NULL def mysql columns_priv Db 2 NO char 64 192 NULL NULL NULL utf8 utf8_bin char(64) PRI select,insert,update,references NULL -def mysql columns_priv User 3 NO char 32 96 NULL NULL NULL utf8 utf8_bin char(32) PRI select,insert,update,references NULL +def mysql columns_priv User 3 NO char 80 240 NULL NULL NULL utf8 utf8_bin char(80) PRI select,insert,update,references NULL def mysql columns_priv Table_name 4 NO char 64 192 NULL NULL NULL utf8 utf8_bin char(64) PRI select,insert,update,references NULL def mysql columns_priv Column_name 5 NO char 64 192 NULL NULL NULL utf8 utf8_bin char(64) PRI select,insert,update,references NULL def mysql columns_priv Timestamp 6 CURRENT_TIMESTAMP NO timestamp NULL NULL NULL NULL 0 NULL NULL timestamp DEFAULT_GENERATED on update CURRENT_TIMESTAMP select,insert,update,references NULL @@ -17,7 +17,7 @@ def mysql component component_group_id 2 NULL NO int NULL NULL 10 0 NULL NULL NU def mysql component component_urn 3 NULL NO text 65535 65535 NULL NULL NULL utf8 utf8_general_ci text select,insert,update,references NULL def mysql db Host 1 NO char 60 180 NULL NULL NULL utf8 utf8_bin char(60) PRI select,insert,update,references NULL def mysql db Db 2 NO char 64 192 NULL NULL NULL utf8 utf8_bin char(64) PRI select,insert,update,references NULL -def mysql db User 3 NO char 32 96 NULL NULL NULL utf8 utf8_bin char(32) PRI select,insert,update,references NULL +def mysql db User 3 NO char 80 240 NULL NULL NULL utf8 utf8_bin char(80) PRI select,insert,update,references NULL def mysql db Select_priv 4 N NO enum 1 3 NULL NULL NULL utf8 utf8_general_ci enum('N','Y') select,insert,update,references NULL def mysql db Insert_priv 5 N NO enum 1 3 NULL NULL NULL utf8 utf8_general_ci enum('N','Y') select,insert,update,references NULL def mysql db Update_priv 6 N NO enum 1 3 NULL NULL NULL utf8 utf8_general_ci enum('N','Y') select,insert,update,references NULL @@ -38,9 +38,9 @@ def mysql db Execute_priv 20 N NO enum 1 3 NULL NULL NULL utf8 utf8_general_ci e def mysql db Event_priv 21 N NO enum 1 3 NULL NULL NULL utf8 utf8_general_ci enum('N','Y') select,insert,update,references NULL def mysql db Trigger_priv 22 N NO enum 1 3 NULL NULL NULL utf8 utf8_general_ci enum('N','Y') select,insert,update,references NULL def mysql default_roles HOST 1 NO char 60 180 NULL NULL NULL utf8 utf8_bin char(60) PRI select,insert,update,references NULL -def mysql default_roles USER 2 NO char 32 96 NULL NULL NULL utf8 utf8_bin char(32) PRI select,insert,update,references NULL +def mysql default_roles USER 2 NO char 80 240 NULL NULL NULL utf8 utf8_bin char(80) PRI select,insert,update,references NULL def mysql default_roles DEFAULT_ROLE_HOST 3 % NO char 60 180 NULL NULL NULL utf8 utf8_bin char(60) PRI select,insert,update,references NULL -def mysql default_roles DEFAULT_ROLE_USER 4 NO char 32 96 NULL NULL NULL utf8 utf8_bin char(32) PRI select,insert,update,references NULL +def mysql default_roles DEFAULT_ROLE_USER 4 NO char 80 240 NULL NULL NULL utf8 utf8_bin char(80) PRI select,insert,update,references NULL def mysql engine_cost engine_name 1 NULL NO varchar 64 192 NULL NULL NULL utf8 utf8_general_ci varchar(64) PRI select,insert,update,references NULL def mysql engine_cost device_type 2 NULL NO int NULL NULL 10 0 NULL NULL NULL int(11) PRI select,insert,update,references NULL def mysql engine_cost cost_name 3 NULL NO varchar 64 192 NULL NULL NULL utf8 utf8_general_ci varchar(64) PRI select,insert,update,references NULL @@ -58,7 +58,7 @@ def mysql general_log thread_id 3 NULL NO bigint NULL NULL 20 0 NULL NULL NULL b def mysql general_log server_id 4 NULL NO int NULL NULL 10 0 NULL NULL NULL int(10) unsigned select,insert,update,references NULL def mysql general_log command_type 5 NULL NO varchar 64 192 NULL NULL NULL utf8 utf8_general_ci varchar(64) select,insert,update,references NULL def mysql general_log argument 6 NULL NO mediumblob 16777215 16777215 NULL NULL NULL NULL NULL mediumblob select,insert,update,references NULL -def mysql global_grants USER 1 NO char 32 96 NULL NULL NULL utf8 utf8_bin char(32) PRI select,insert,update,references NULL +def mysql global_grants USER 1 NO char 80 240 NULL NULL NULL utf8 utf8_bin char(80) PRI select,insert,update,references NULL def mysql global_grants HOST 2 NO char 60 180 NULL NULL NULL utf8 utf8_bin char(60) PRI select,insert,update,references NULL def mysql global_grants PRIV 3 NO char 32 96 NULL NULL NULL utf8 utf8_general_ci char(32) PRI select,insert,update,references NULL def mysql global_grants WITH_GRANT_OPTION 4 N NO enum 1 3 NULL NULL NULL utf8 utf8_general_ci enum('N','Y') select,insert,update,references NULL @@ -94,30 +94,30 @@ def mysql innodb_table_stats n_rows 4 NULL NO bigint NULL NULL 20 0 NULL NULL NU def mysql innodb_table_stats clustered_index_size 5 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NULL def mysql innodb_table_stats sum_of_other_index_sizes 6 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NULL def mysql password_history Host 1 NO char 60 180 NULL NULL NULL utf8 utf8_bin char(60) PRI select,insert,update,references NULL -def mysql password_history User 2 NO char 32 96 NULL NULL NULL utf8 utf8_bin char(32) PRI select,insert,update,references NULL +def mysql password_history User 2 NO char 80 240 NULL NULL NULL utf8 utf8_bin char(80) PRI select,insert,update,references NULL def mysql password_history Password_timestamp 3 CURRENT_TIMESTAMP(6) NO timestamp NULL NULL NULL NULL 6 NULL NULL timestamp(6) PRI DEFAULT_GENERATED select,insert,update,references NULL def mysql password_history Password 4 NULL YES text 65535 65535 NULL NULL NULL utf8 utf8_bin text select,insert,update,references NULL def mysql plugin name 1 NO varchar 64 192 NULL NULL NULL utf8 utf8_general_ci varchar(64) PRI select,insert,update,references NULL def mysql plugin dl 2 NO varchar 128 384 NULL NULL NULL utf8 utf8_general_ci varchar(128) select,insert,update,references NULL def mysql procs_priv Host 1 NO char 60 180 NULL NULL NULL utf8 utf8_bin char(60) PRI select,insert,update,references NULL def mysql procs_priv Db 2 NO char 64 192 NULL NULL NULL utf8 utf8_bin char(64) PRI select,insert,update,references NULL -def mysql procs_priv User 3 NO char 32 96 NULL NULL NULL utf8 utf8_bin char(32) PRI select,insert,update,references NULL +def mysql procs_priv User 3 NO char 80 240 NULL NULL NULL utf8 utf8_bin char(80) PRI select,insert,update,references NULL def mysql procs_priv Routine_name 4 NO char 64 192 NULL NULL NULL utf8 utf8_general_ci char(64) PRI select,insert,update,references NULL def mysql procs_priv Routine_type 5 NULL NO enum 9 27 NULL NULL NULL utf8 utf8_bin enum('FUNCTION','PROCEDURE') PRI select,insert,update,references NULL def mysql procs_priv Grantor 6 NO char 93 279 NULL NULL NULL utf8 utf8_bin char(93) MUL select,insert,update,references NULL def mysql procs_priv Proc_priv 7 NO set 27 81 NULL NULL NULL utf8 utf8_general_ci set('Execute','Alter Routine','Grant') select,insert,update,references NULL def mysql procs_priv Timestamp 8 CURRENT_TIMESTAMP NO timestamp NULL NULL NULL NULL 0 NULL NULL timestamp DEFAULT_GENERATED on update CURRENT_TIMESTAMP select,insert,update,references NULL def mysql proxies_priv Host 1 NO char 60 180 NULL NULL NULL utf8 utf8_bin char(60) PRI select,insert,update,references NULL -def mysql proxies_priv User 2 NO char 32 96 NULL NULL NULL utf8 utf8_bin char(32) PRI select,insert,update,references NULL +def mysql proxies_priv User 2 NO char 80 240 NULL NULL NULL utf8 utf8_bin char(80) PRI select,insert,update,references NULL def mysql proxies_priv Proxied_host 3 NO char 60 180 NULL NULL NULL utf8 utf8_bin char(60) PRI select,insert,update,references NULL -def mysql proxies_priv Proxied_user 4 NO char 32 96 NULL NULL NULL utf8 utf8_bin char(32) PRI select,insert,update,references NULL +def mysql proxies_priv Proxied_user 4 NO char 80 240 NULL NULL NULL utf8 utf8_bin char(80) PRI select,insert,update,references NULL def mysql proxies_priv With_grant 5 0 NO tinyint NULL NULL 3 0 NULL NULL NULL tinyint(1) select,insert,update,references NULL def mysql proxies_priv Grantor 6 NO char 93 279 NULL NULL NULL utf8 utf8_bin char(93) MUL select,insert,update,references NULL def mysql proxies_priv Timestamp 7 CURRENT_TIMESTAMP NO timestamp NULL NULL NULL NULL 0 NULL NULL timestamp DEFAULT_GENERATED on update CURRENT_TIMESTAMP select,insert,update,references NULL def mysql role_edges FROM_HOST 1 NO char 60 180 NULL NULL NULL utf8 utf8_bin char(60) PRI select,insert,update,references NULL -def mysql role_edges FROM_USER 2 NO char 32 96 NULL NULL NULL utf8 utf8_bin char(32) PRI select,insert,update,references NULL +def mysql role_edges FROM_USER 2 NO char 80 240 NULL NULL NULL utf8 utf8_bin char(80) PRI select,insert,update,references NULL def mysql role_edges TO_HOST 3 NO char 60 180 NULL NULL NULL utf8 utf8_bin char(60) PRI select,insert,update,references NULL -def mysql role_edges TO_USER 4 NO char 32 96 NULL NULL NULL utf8 utf8_bin char(32) PRI select,insert,update,references NULL +def mysql role_edges TO_USER 4 NO char 80 240 NULL NULL NULL utf8 utf8_bin char(80) PRI select,insert,update,references NULL def mysql role_edges WITH_ADMIN_OPTION 5 N NO enum 1 3 NULL NULL NULL utf8 utf8_general_ci enum('N','Y') select,insert,update,references NULL def mysql servers Server_name 1 NO char 64 192 NULL NULL NULL utf8 utf8_general_ci char(64) PRI select,insert,update,references NULL def mysql servers Host 2 NO char 64 192 NULL NULL NULL utf8 utf8_general_ci char(64) select,insert,update,references NULL @@ -196,7 +196,7 @@ def mysql slow_log sql_text 11 NULL NO mediumblob 16777215 16777215 NULL NULL NU def mysql slow_log thread_id 12 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(21) unsigned select,insert,update,references NULL def mysql tables_priv Host 1 NO char 60 180 NULL NULL NULL utf8 utf8_bin char(60) PRI select,insert,update,references NULL def mysql tables_priv Db 2 NO char 64 192 NULL NULL NULL utf8 utf8_bin char(64) PRI select,insert,update,references NULL -def mysql tables_priv User 3 NO char 32 96 NULL NULL NULL utf8 utf8_bin char(32) PRI select,insert,update,references NULL +def mysql tables_priv User 3 NO char 80 240 NULL NULL NULL utf8 utf8_bin char(80) PRI select,insert,update,references NULL def mysql tables_priv Table_name 4 NO char 64 192 NULL NULL NULL utf8 utf8_bin char(64) PRI select,insert,update,references NULL def mysql tables_priv Grantor 5 NO char 93 279 NULL NULL NULL utf8 utf8_bin char(93) MUL select,insert,update,references NULL def mysql tables_priv Timestamp 6 CURRENT_TIMESTAMP NO timestamp NULL NULL NULL NULL 0 NULL NULL timestamp DEFAULT_GENERATED on update CURRENT_TIMESTAMP select,insert,update,references NULL @@ -217,7 +217,7 @@ def mysql time_zone_transition_type Offset 3 0 NO int NULL NULL 10 0 NULL NULL N def mysql time_zone_transition_type Is_DST 4 0 NO tinyint NULL NULL 3 0 NULL NULL NULL tinyint(3) unsigned select,insert,update,references NULL def mysql time_zone_transition_type Abbreviation 5 NO char 8 24 NULL NULL NULL utf8 utf8_general_ci char(8) select,insert,update,references NULL def mysql user Host 1 NO char 60 180 NULL NULL NULL utf8 utf8_bin char(60) PRI select,insert,update,references NULL -def mysql user User 2 NO char 32 96 NULL NULL NULL utf8 utf8_bin char(32) PRI select,insert,update,references NULL +def mysql user User 2 NO char 80 240 NULL NULL NULL utf8 utf8_bin char(80) PRI select,insert,update,references NULL def mysql user Select_priv 3 N NO enum 1 3 NULL NULL NULL utf8 utf8_general_ci enum('N','Y') select,insert,update,references NULL def mysql user Insert_priv 4 N NO enum 1 3 NULL NULL NULL utf8 utf8_general_ci enum('N','Y') select,insert,update,references NULL def mysql user Update_priv 5 N NO enum 1 3 NULL NULL NULL utf8 utf8_general_ci enum('N','Y') select,insert,update,references NULL @@ -337,7 +337,7 @@ ORDER BY TABLE_SCHEMA, TABLE_NAME COLLATE utf8_general_ci, ORDINAL_POSITION; COL_CML TABLE_SCHEMA TABLE_NAME COLUMN_NAME DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE 3.0000 mysql columns_priv Host char 60 180 utf8 utf8_bin char(60) 3.0000 mysql columns_priv Db char 64 192 utf8 utf8_bin char(64) -3.0000 mysql columns_priv User char 32 96 utf8 utf8_bin char(32) +3.0000 mysql columns_priv User char 80 240 utf8 utf8_bin char(80) 3.0000 mysql columns_priv Table_name char 64 192 utf8 utf8_bin char(64) 3.0000 mysql columns_priv Column_name char 64 192 utf8 utf8_bin char(64) NULL mysql columns_priv Timestamp timestamp NULL NULL NULL NULL timestamp @@ -347,7 +347,7 @@ NULL mysql component component_group_id int NULL NULL NULL NULL int(10) unsigned 1.0000 mysql component component_urn text 65535 65535 utf8 utf8_general_ci text 3.0000 mysql db Host char 60 180 utf8 utf8_bin char(60) 3.0000 mysql db Db char 64 192 utf8 utf8_bin char(64) -3.0000 mysql db User char 32 96 utf8 utf8_bin char(32) +3.0000 mysql db User char 80 240 utf8 utf8_bin char(80) 3.0000 mysql db Select_priv enum 1 3 utf8 utf8_general_ci enum('N','Y') 3.0000 mysql db Insert_priv enum 1 3 utf8 utf8_general_ci enum('N','Y') 3.0000 mysql db Update_priv enum 1 3 utf8 utf8_general_ci enum('N','Y') @@ -368,9 +368,9 @@ NULL mysql component component_group_id int NULL NULL NULL NULL int(10) unsigned 3.0000 mysql db Event_priv enum 1 3 utf8 utf8_general_ci enum('N','Y') 3.0000 mysql db Trigger_priv enum 1 3 utf8 utf8_general_ci enum('N','Y') 3.0000 mysql default_roles HOST char 60 180 utf8 utf8_bin char(60) -3.0000 mysql default_roles USER char 32 96 utf8 utf8_bin char(32) +3.0000 mysql default_roles USER char 80 240 utf8 utf8_bin char(80) 3.0000 mysql default_roles DEFAULT_ROLE_HOST char 60 180 utf8 utf8_bin char(60) -3.0000 mysql default_roles DEFAULT_ROLE_USER char 32 96 utf8 utf8_bin char(32) +3.0000 mysql default_roles DEFAULT_ROLE_USER char 80 240 utf8 utf8_bin char(80) 3.0000 mysql engine_cost engine_name varchar 64 192 utf8 utf8_general_ci varchar(64) NULL mysql engine_cost device_type int NULL NULL NULL NULL int(11) 3.0000 mysql engine_cost cost_name varchar 64 192 utf8 utf8_general_ci varchar(64) @@ -388,7 +388,7 @@ NULL mysql general_log thread_id bigint NULL NULL NULL NULL bigint(21) unsigned NULL mysql general_log server_id int NULL NULL NULL NULL int(10) unsigned 3.0000 mysql general_log command_type varchar 64 192 utf8 utf8_general_ci varchar(64) 1.0000 mysql general_log argument mediumblob 16777215 16777215 NULL NULL mediumblob -3.0000 mysql global_grants USER char 32 96 utf8 utf8_bin char(32) +3.0000 mysql global_grants USER char 80 240 utf8 utf8_bin char(80) 3.0000 mysql global_grants HOST char 60 180 utf8 utf8_bin char(60) 3.0000 mysql global_grants PRIV char 32 96 utf8 utf8_general_ci char(32) 3.0000 mysql global_grants WITH_GRANT_OPTION enum 1 3 utf8 utf8_general_ci enum('N','Y') @@ -424,30 +424,30 @@ NULL mysql innodb_table_stats n_rows bigint NULL NULL NULL NULL bigint(20) unsig NULL mysql innodb_table_stats clustered_index_size bigint NULL NULL NULL NULL bigint(20) unsigned NULL mysql innodb_table_stats sum_of_other_index_sizes bigint NULL NULL NULL NULL bigint(20) unsigned 3.0000 mysql password_history Host char 60 180 utf8 utf8_bin char(60) -3.0000 mysql password_history User char 32 96 utf8 utf8_bin char(32) +3.0000 mysql password_history User char 80 240 utf8 utf8_bin char(80) NULL mysql password_history Password_timestamp timestamp NULL NULL NULL NULL timestamp(6) 1.0000 mysql password_history Password text 65535 65535 utf8 utf8_bin text 3.0000 mysql plugin name varchar 64 192 utf8 utf8_general_ci varchar(64) 3.0000 mysql plugin dl varchar 128 384 utf8 utf8_general_ci varchar(128) 3.0000 mysql procs_priv Host char 60 180 utf8 utf8_bin char(60) 3.0000 mysql procs_priv Db char 64 192 utf8 utf8_bin char(64) -3.0000 mysql procs_priv User char 32 96 utf8 utf8_bin char(32) +3.0000 mysql procs_priv User char 80 240 utf8 utf8_bin char(80) 3.0000 mysql procs_priv Routine_name char 64 192 utf8 utf8_general_ci char(64) 3.0000 mysql procs_priv Routine_type enum 9 27 utf8 utf8_bin enum('FUNCTION','PROCEDURE') 3.0000 mysql procs_priv Grantor char 93 279 utf8 utf8_bin char(93) 3.0000 mysql procs_priv Proc_priv set 27 81 utf8 utf8_general_ci set('Execute','Alter Routine','Grant') NULL mysql procs_priv Timestamp timestamp NULL NULL NULL NULL timestamp 3.0000 mysql proxies_priv Host char 60 180 utf8 utf8_bin char(60) -3.0000 mysql proxies_priv User char 32 96 utf8 utf8_bin char(32) +3.0000 mysql proxies_priv User char 80 240 utf8 utf8_bin char(80) 3.0000 mysql proxies_priv Proxied_host char 60 180 utf8 utf8_bin char(60) -3.0000 mysql proxies_priv Proxied_user char 32 96 utf8 utf8_bin char(32) +3.0000 mysql proxies_priv Proxied_user char 80 240 utf8 utf8_bin char(80) NULL mysql proxies_priv With_grant tinyint NULL NULL NULL NULL tinyint(1) 3.0000 mysql proxies_priv Grantor char 93 279 utf8 utf8_bin char(93) NULL mysql proxies_priv Timestamp timestamp NULL NULL NULL NULL timestamp 3.0000 mysql role_edges FROM_HOST char 60 180 utf8 utf8_bin char(60) -3.0000 mysql role_edges FROM_USER char 32 96 utf8 utf8_bin char(32) +3.0000 mysql role_edges FROM_USER char 80 240 utf8 utf8_bin char(80) 3.0000 mysql role_edges TO_HOST char 60 180 utf8 utf8_bin char(60) -3.0000 mysql role_edges TO_USER char 32 96 utf8 utf8_bin char(32) +3.0000 mysql role_edges TO_USER char 80 240 utf8 utf8_bin char(80) 3.0000 mysql role_edges WITH_ADMIN_OPTION enum 1 3 utf8 utf8_general_ci enum('N','Y') 3.0000 mysql servers Server_name char 64 192 utf8 utf8_general_ci char(64) 3.0000 mysql servers Host char 64 192 utf8 utf8_general_ci char(64) @@ -526,7 +526,7 @@ NULL mysql slow_log server_id int NULL NULL NULL NULL int(10) unsigned NULL mysql slow_log thread_id bigint NULL NULL NULL NULL bigint(21) unsigned 3.0000 mysql tables_priv Host char 60 180 utf8 utf8_bin char(60) 3.0000 mysql tables_priv Db char 64 192 utf8 utf8_bin char(64) -3.0000 mysql tables_priv User char 32 96 utf8 utf8_bin char(32) +3.0000 mysql tables_priv User char 80 240 utf8 utf8_bin char(80) 3.0000 mysql tables_priv Table_name char 64 192 utf8 utf8_bin char(64) 3.0000 mysql tables_priv Grantor char 93 279 utf8 utf8_bin char(93) NULL mysql tables_priv Timestamp timestamp NULL NULL NULL NULL timestamp @@ -547,7 +547,7 @@ NULL mysql time_zone_transition_type Offset int NULL NULL NULL NULL int(11) NULL mysql time_zone_transition_type Is_DST tinyint NULL NULL NULL NULL tinyint(3) unsigned 3.0000 mysql time_zone_transition_type Abbreviation char 8 24 utf8 utf8_general_ci char(8) 3.0000 mysql user Host char 60 180 utf8 utf8_bin char(60) -3.0000 mysql user User char 32 96 utf8 utf8_bin char(32) +3.0000 mysql user User char 80 240 utf8 utf8_bin char(80) 3.0000 mysql user Select_priv enum 1 3 utf8 utf8_general_ci enum('N','Y') 3.0000 mysql user Insert_priv enum 1 3 utf8 utf8_general_ci enum('N','Y') 3.0000 mysql user Update_priv enum 1 3 utf8 utf8_general_ci enum('N','Y') 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 1e85be957384..1d8934e399a1 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 @@ -25,7 +25,7 @@ SHOW CREATE TABLE processlist; Table Create Table PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` ( `ID` bigint(21) unsigned NOT NULL DEFAULT '0', - `USER` varchar(32) NOT NULL DEFAULT '', + `USER` varchar(80) NOT NULL DEFAULT '', `HOST` varchar(64) NOT NULL DEFAULT '', `DB` varchar(64) DEFAULT NULL, `COMMAND` varchar(16) NOT NULL DEFAULT '', @@ -98,7 +98,7 @@ SHOW CREATE TABLE processlist; Table Create Table PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` ( `ID` bigint(21) unsigned NOT NULL DEFAULT '0', - `USER` varchar(32) NOT NULL DEFAULT '', + `USER` varchar(80) NOT NULL DEFAULT '', `HOST` varchar(64) NOT NULL DEFAULT '', `DB` varchar(64) DEFAULT NULL, `COMMAND` varchar(16) NOT NULL DEFAULT '', 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 55889a975311..fb258fd151b0 100644 --- a/mysql-test/suite/funcs_1/r/processlist_priv_ps.result +++ b/mysql-test/suite/funcs_1/r/processlist_priv_ps.result @@ -25,7 +25,7 @@ SHOW CREATE TABLE processlist; Table Create Table PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` ( `ID` bigint(21) unsigned NOT NULL DEFAULT '0', - `USER` varchar(32) NOT NULL DEFAULT '', + `USER` varchar(80) NOT NULL DEFAULT '', `HOST` varchar(64) NOT NULL DEFAULT '', `DB` varchar(64) DEFAULT NULL, `COMMAND` varchar(16) NOT NULL DEFAULT '', @@ -98,7 +98,7 @@ SHOW CREATE TABLE processlist; Table Create Table PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` ( `ID` bigint(21) unsigned NOT NULL DEFAULT '0', - `USER` varchar(32) NOT NULL DEFAULT '', + `USER` varchar(80) NOT NULL DEFAULT '', `HOST` varchar(64) NOT NULL DEFAULT '', `DB` varchar(64) DEFAULT NULL, `COMMAND` varchar(16) NOT NULL DEFAULT '', 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 97ede88fbacf..97fe39872d2f 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 @@ -13,7 +13,7 @@ SHOW CREATE TABLE INFORMATION_SCHEMA.PROCESSLIST; Table Create Table PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` ( `ID` bigint(21) unsigned NOT NULL DEFAULT '0', - `USER` varchar(32) NOT NULL DEFAULT '', + `USER` varchar(80) NOT NULL DEFAULT '', `HOST` varchar(64) NOT NULL DEFAULT '', `DB` varchar(64) DEFAULT NULL, `COMMAND` varchar(16) NOT NULL DEFAULT '', 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 4905af64c19d..209cf0032737 100644 --- a/mysql-test/suite/funcs_1/r/processlist_val_ps.result +++ b/mysql-test/suite/funcs_1/r/processlist_val_ps.result @@ -13,7 +13,7 @@ SHOW CREATE TABLE INFORMATION_SCHEMA.PROCESSLIST; Table Create Table PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` ( `ID` bigint(21) unsigned NOT NULL DEFAULT '0', - `USER` varchar(32) NOT NULL DEFAULT '', + `USER` varchar(80) NOT NULL DEFAULT '', `HOST` varchar(64) NOT NULL DEFAULT '', `DB` varchar(64) DEFAULT NULL, `COMMAND` varchar(16) NOT NULL DEFAULT '', diff --git a/mysql-test/suite/innodb/r/upgrade_orphan.result b/mysql-test/suite/innodb/r/upgrade_orphan.result index 1ed8035e811d..989dc00bec01 100644 --- a/mysql-test/suite/innodb/r/upgrade_orphan.result +++ b/mysql-test/suite/innodb/r/upgrade_orphan.result @@ -41,7 +41,7 @@ SHOW CREATE TABLE mysql.user; Table Create Table user CREATE TABLE `user` ( `Host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '', - `User` char(32) COLLATE utf8_bin NOT NULL DEFAULT '', + `User` char(80) COLLATE utf8_bin NOT NULL DEFAULT '', `Select_priv` enum('N','Y') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N', `Insert_priv` enum('N','Y') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N', `Update_priv` enum('N','Y') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N', diff --git a/mysql-test/suite/perfschema/r/dd_version_check.result b/mysql-test/suite/perfschema/r/dd_version_check.result index 815bbe3479d6..a45d195d0635 100644 --- a/mysql-test/suite/perfschema/r/dd_version_check.result +++ b/mysql-test/suite/perfschema/r/dd_version_check.result @@ -1,6 +1,6 @@ "Checking the data dictionary properties ..." SUBSTRING_INDEX(SUBSTRING(properties, LOCATE('PS_VERSION', properties), 30), ';', 1) -PS_VERSION=80011001 +PS_VERSION=80011002 "Checking the performance schema database structure ..." CHECK STATUS The tables in the performance_schema were last changed in MySQL 8.0.11 diff --git a/mysql-test/suite/perfschema/r/idx_accounts.result b/mysql-test/suite/perfschema/r/idx_accounts.result index 12e50770b1ed..a42fa0c09e25 100644 --- a/mysql-test/suite/perfschema/r/idx_accounts.result +++ b/mysql-test/suite/perfschema/r/idx_accounts.result @@ -9,7 +9,7 @@ explain select TOTAL_CONNECTIONS from performance_schema.accounts where USER = "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE accounts NULL ref ACCOUNT ACCOUNT 129 const # 100.00 NULL +1 SIMPLE accounts NULL ref ACCOUNT ACCOUNT 321 const # 100.00 NULL ############ Explain for Query #################################### explain select TOTAL_CONNECTIONS from performance_schema.accounts @@ -27,7 +27,7 @@ explain select TOTAL_CONNECTIONS from performance_schema.accounts where USER = "foo"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE accounts NULL ref ACCOUNT ACCOUNT 129 const # 100.00 NULL +1 SIMPLE accounts NULL ref ACCOUNT ACCOUNT 321 const # 100.00 NULL ############ Explain for Query #################################### explain select TOTAL_CONNECTIONS from performance_schema.accounts @@ -48,21 +48,21 @@ from performance_schema.accounts where USER = "foo" and HOST > "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE accounts NULL ref ACCOUNT ACCOUNT 129 const # 33.33 Using where +1 SIMPLE accounts NULL ref ACCOUNT ACCOUNT 321 const # 33.33 Using where ############ Explain for Query #################################### explain select TOTAL_CONNECTIONS from performance_schema.accounts where USER = "foo" and HOST < "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE accounts NULL ref ACCOUNT ACCOUNT 129 const # 33.33 Using where +1 SIMPLE accounts NULL ref ACCOUNT ACCOUNT 321 const # 33.33 Using where ############ Explain for Query #################################### explain select TOTAL_CONNECTIONS from performance_schema.accounts where USER = "foo" and HOST = "localhost"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE accounts NULL const ACCOUNT ACCOUNT 370 const,const # 100.00 NULL +1 SIMPLE accounts NULL const ACCOUNT ACCOUNT 562 const,const # 100.00 NULL ############# Explain End ######################################### flush status; select TOTAL_CONNECTIONS diff --git a/mysql-test/suite/perfschema/r/idx_ees_by_account_by_error.result b/mysql-test/suite/perfschema/r/idx_ees_by_account_by_error.result index 555c46853b28..dcd7c71bd4e5 100644 --- a/mysql-test/suite/perfschema/r/idx_ees_by_account_by_error.result +++ b/mysql-test/suite/perfschema/r/idx_ees_by_account_by_error.result @@ -34,14 +34,14 @@ from performance_schema.events_errors_summary_by_account_by_error where HOST = "impossible" and USER = "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_errors_summary_by_account_by_error NULL ref ACCOUNT ACCOUNT 370 const,const # 100.00 NULL +1 SIMPLE events_errors_summary_by_account_by_error NULL ref ACCOUNT ACCOUNT 562 const,const # 100.00 NULL ############ Explain for Query #################################### explain select SUM_ERROR_RAISED from performance_schema.events_errors_summary_by_account_by_error where HOST = "localhost" and USER = "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_errors_summary_by_account_by_error NULL ref ACCOUNT ACCOUNT 370 const,const # 100.00 NULL +1 SIMPLE events_errors_summary_by_account_by_error NULL ref ACCOUNT ACCOUNT 562 const,const # 100.00 NULL ############ Explain for Query #################################### explain select SUM_ERROR_RAISED from performance_schema.events_errors_summary_by_account_by_error @@ -62,7 +62,7 @@ from performance_schema.events_errors_summary_by_account_by_error where HOST = "localhost" and USER = "foo"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_errors_summary_by_account_by_error NULL ref ACCOUNT ACCOUNT 370 const,const # 100.00 NULL +1 SIMPLE events_errors_summary_by_account_by_error NULL ref ACCOUNT ACCOUNT 562 const,const # 100.00 NULL ############ Explain for Query #################################### explain select SUM_ERROR_RAISED from performance_schema.events_errors_summary_by_account_by_error @@ -86,7 +86,7 @@ where HOST = "localhost" and USER = "foo" and ERROR_NUMBER > "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_errors_summary_by_account_by_error NULL ref ACCOUNT ACCOUNT 370 const,const # 33.33 Using where +1 SIMPLE events_errors_summary_by_account_by_error NULL ref ACCOUNT ACCOUNT 562 const,const # 33.33 Using where ############ Explain for Query #################################### explain select SUM_ERROR_RAISED from performance_schema.events_errors_summary_by_account_by_error @@ -94,7 +94,7 @@ where HOST = "localhost" and USER = "foo" and ERROR_NUMBER < "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_errors_summary_by_account_by_error NULL ref ACCOUNT ACCOUNT 370 const,const # 33.33 Using where +1 SIMPLE events_errors_summary_by_account_by_error NULL ref ACCOUNT ACCOUNT 562 const,const # 33.33 Using where ############ Explain for Query #################################### explain select SUM_ERROR_RAISED from performance_schema.events_errors_summary_by_account_by_error @@ -102,7 +102,7 @@ where HOST = "localhost" and USER = "foo" and ERROR_NUMBER = "1146"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_errors_summary_by_account_by_error NULL const ACCOUNT ACCOUNT 375 const,const,const # 100.00 NULL +1 SIMPLE events_errors_summary_by_account_by_error NULL const ACCOUNT ACCOUNT 567 const,const,const # 100.00 NULL ############# Explain End ######################################### flush status; select SUM_ERROR_RAISED diff --git a/mysql-test/suite/perfschema/r/idx_ees_by_user_by_error.result b/mysql-test/suite/perfschema/r/idx_ees_by_user_by_error.result index ac4b4ef254a5..0ec600361397 100644 --- a/mysql-test/suite/perfschema/r/idx_ees_by_user_by_error.result +++ b/mysql-test/suite/perfschema/r/idx_ees_by_user_by_error.result @@ -9,7 +9,7 @@ explain select SUM_ERROR_RAISED from performance_schema.events_errors_summary_by_user_by_error where USER = "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_errors_summary_by_user_by_error NULL ref USER USER 129 const # 100.00 NULL +1 SIMPLE events_errors_summary_by_user_by_error NULL ref USER USER 321 const # 100.00 NULL ############ Explain for Query #################################### explain select SUM_ERROR_RAISED from performance_schema.events_errors_summary_by_user_by_error @@ -27,7 +27,7 @@ explain select SUM_ERROR_RAISED from performance_schema.events_errors_summary_by_user_by_error where USER = "foo"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_errors_summary_by_user_by_error NULL ref USER USER 129 const # 100.00 NULL +1 SIMPLE events_errors_summary_by_user_by_error NULL ref USER USER 321 const # 100.00 NULL ############ Explain for Query #################################### explain select SUM_ERROR_RAISED from performance_schema.events_errors_summary_by_user_by_error @@ -48,21 +48,21 @@ from performance_schema.events_errors_summary_by_user_by_error where USER = "foo" and ERROR_NUMBER > "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_errors_summary_by_user_by_error NULL ref USER USER 129 const # 33.33 Using where +1 SIMPLE events_errors_summary_by_user_by_error NULL ref USER USER 321 const # 33.33 Using where ############ Explain for Query #################################### explain select SUM_ERROR_RAISED from performance_schema.events_errors_summary_by_user_by_error where USER = "foo" and ERROR_NUMBER < "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_errors_summary_by_user_by_error NULL ref USER USER 129 const # 33.33 Using where +1 SIMPLE events_errors_summary_by_user_by_error NULL ref USER USER 321 const # 33.33 Using where ############ Explain for Query #################################### explain select SUM_ERROR_RAISED from performance_schema.events_errors_summary_by_user_by_error where USER = "foo" and ERROR_NUMBER = "1146"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_errors_summary_by_user_by_error NULL const USER USER 134 const,const # 100.00 NULL +1 SIMPLE events_errors_summary_by_user_by_error NULL const USER USER 326 const,const # 100.00 NULL ############# Explain End ######################################### flush status; select SUM_ERROR_RAISED diff --git a/mysql-test/suite/perfschema/r/idx_esgs_by_account_by_event_name.result b/mysql-test/suite/perfschema/r/idx_esgs_by_account_by_event_name.result index 116cead68569..2eaccbbff8be 100644 --- a/mysql-test/suite/perfschema/r/idx_esgs_by_account_by_event_name.result +++ b/mysql-test/suite/perfschema/r/idx_esgs_by_account_by_event_name.result @@ -34,14 +34,14 @@ from performance_schema.events_stages_summary_by_account_by_event_name where HOST = "impossible" and USER = "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_stages_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 370 const,const # 100.00 NULL +1 SIMPLE events_stages_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 562 const,const # 100.00 NULL ############ Explain for Query #################################### explain select COUNT_STAR from performance_schema.events_stages_summary_by_account_by_event_name where HOST = "localhost" and USER = "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_stages_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 370 const,const # 100.00 NULL +1 SIMPLE events_stages_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 562 const,const # 100.00 NULL ############ Explain for Query #################################### explain select COUNT_STAR from performance_schema.events_stages_summary_by_account_by_event_name @@ -62,7 +62,7 @@ from performance_schema.events_stages_summary_by_account_by_event_name where HOST = "localhost" and USER = "foo"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_stages_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 370 const,const # 100.00 NULL +1 SIMPLE events_stages_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 562 const,const # 100.00 NULL ############ Explain for Query #################################### explain select COUNT_STAR from performance_schema.events_stages_summary_by_account_by_event_name @@ -86,7 +86,7 @@ where HOST = "localhost" and USER = "foo" and EVENT_NAME > "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_stages_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 370 const,const # 33.33 Using where +1 SIMPLE events_stages_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 562 const,const # 33.33 Using where ############ Explain for Query #################################### explain select COUNT_STAR from performance_schema.events_stages_summary_by_account_by_event_name @@ -94,7 +94,7 @@ where HOST = "localhost" and USER = "foo" and EVENT_NAME < "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_stages_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 370 const,const # 33.33 Using where +1 SIMPLE events_stages_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 562 const,const # 33.33 Using where ############ Explain for Query #################################### explain select COUNT_STAR from performance_schema.events_stages_summary_by_account_by_event_name @@ -102,7 +102,7 @@ where HOST = "localhost" and USER = "foo" and EVENT_NAME = "stage/sql/executing"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_stages_summary_by_account_by_event_name NULL const ACCOUNT ACCOUNT 884 const,const,const # 100.00 NULL +1 SIMPLE events_stages_summary_by_account_by_event_name NULL const ACCOUNT ACCOUNT 1076 const,const,const # 100.00 NULL ############# Explain End ######################################### flush status; select COUNT_STAR diff --git a/mysql-test/suite/perfschema/r/idx_esgs_by_user_by_event_name.result b/mysql-test/suite/perfschema/r/idx_esgs_by_user_by_event_name.result index 89a6e58fd9db..93477f818796 100644 --- a/mysql-test/suite/perfschema/r/idx_esgs_by_user_by_event_name.result +++ b/mysql-test/suite/perfschema/r/idx_esgs_by_user_by_event_name.result @@ -9,7 +9,7 @@ explain select COUNT_STAR from performance_schema.events_stages_summary_by_user_by_event_name where USER = "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_stages_summary_by_user_by_event_name NULL ref USER USER 129 const # 100.00 NULL +1 SIMPLE events_stages_summary_by_user_by_event_name NULL ref USER USER 321 const # 100.00 NULL ############ Explain for Query #################################### explain select COUNT_STAR from performance_schema.events_stages_summary_by_user_by_event_name @@ -27,7 +27,7 @@ explain select COUNT_STAR from performance_schema.events_stages_summary_by_user_by_event_name where USER = "foo"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_stages_summary_by_user_by_event_name NULL ref USER USER 129 const # 100.00 NULL +1 SIMPLE events_stages_summary_by_user_by_event_name NULL ref USER USER 321 const # 100.00 NULL ############ Explain for Query #################################### explain select COUNT_STAR from performance_schema.events_stages_summary_by_user_by_event_name @@ -48,21 +48,21 @@ from performance_schema.events_stages_summary_by_user_by_event_name where USER = "foo" and EVENT_NAME > "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_stages_summary_by_user_by_event_name NULL ref USER USER 129 const # 33.33 Using where +1 SIMPLE events_stages_summary_by_user_by_event_name NULL ref USER USER 321 const # 33.33 Using where ############ Explain for Query #################################### explain select COUNT_STAR from performance_schema.events_stages_summary_by_user_by_event_name where USER = "foo" and EVENT_NAME < "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_stages_summary_by_user_by_event_name NULL ref USER USER 129 const # 33.33 Using where +1 SIMPLE events_stages_summary_by_user_by_event_name NULL ref USER USER 321 const # 33.33 Using where ############ Explain for Query #################################### explain select COUNT_STAR from performance_schema.events_stages_summary_by_user_by_event_name where USER = "foo" and EVENT_NAME = "stage/sql/executing"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_stages_summary_by_user_by_event_name NULL const USER USER 643 const,const # 100.00 NULL +1 SIMPLE events_stages_summary_by_user_by_event_name NULL const USER USER 835 const,const # 100.00 NULL ############# Explain End ######################################### flush status; select COUNT_STAR diff --git a/mysql-test/suite/perfschema/r/idx_esms_by_account_by_event_name.result b/mysql-test/suite/perfschema/r/idx_esms_by_account_by_event_name.result index bc74c25d5c43..67476c9571b9 100644 --- a/mysql-test/suite/perfschema/r/idx_esms_by_account_by_event_name.result +++ b/mysql-test/suite/perfschema/r/idx_esms_by_account_by_event_name.result @@ -34,14 +34,14 @@ from performance_schema.events_statements_summary_by_account_by_event_name where HOST = "impossible" and USER = "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_statements_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 370 const,const # 100.00 NULL +1 SIMPLE events_statements_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 562 const,const # 100.00 NULL ############ Explain for Query #################################### explain select COUNT_STAR from performance_schema.events_statements_summary_by_account_by_event_name where HOST = "localhost" and USER = "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_statements_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 370 const,const # 100.00 NULL +1 SIMPLE events_statements_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 562 const,const # 100.00 NULL ############ Explain for Query #################################### explain select COUNT_STAR from performance_schema.events_statements_summary_by_account_by_event_name @@ -62,7 +62,7 @@ from performance_schema.events_statements_summary_by_account_by_event_name where HOST = "localhost" and USER = "foo"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_statements_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 370 const,const # 100.00 NULL +1 SIMPLE events_statements_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 562 const,const # 100.00 NULL ############ Explain for Query #################################### explain select COUNT_STAR from performance_schema.events_statements_summary_by_account_by_event_name @@ -86,7 +86,7 @@ where HOST = "localhost" and USER = "foo" and EVENT_NAME > "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_statements_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 370 const,const # 33.33 Using where +1 SIMPLE events_statements_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 562 const,const # 33.33 Using where ############ Explain for Query #################################### explain select COUNT_STAR from performance_schema.events_statements_summary_by_account_by_event_name @@ -94,7 +94,7 @@ where HOST = "localhost" and USER = "foo" and EVENT_NAME < "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_statements_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 370 const,const # 33.33 Using where +1 SIMPLE events_statements_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 562 const,const # 33.33 Using where ############ Explain for Query #################################### explain select COUNT_STAR from performance_schema.events_statements_summary_by_account_by_event_name @@ -102,7 +102,7 @@ where HOST = "localhost" and USER = "foo" and EVENT_NAME = "statement/sql/select"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_statements_summary_by_account_by_event_name NULL const ACCOUNT ACCOUNT 884 const,const,const # 100.00 NULL +1 SIMPLE events_statements_summary_by_account_by_event_name NULL const ACCOUNT ACCOUNT 1076 const,const,const # 100.00 NULL ############# Explain End ######################################### flush status; select COUNT_STAR diff --git a/mysql-test/suite/perfschema/r/idx_esms_by_user_by_event_name.result b/mysql-test/suite/perfschema/r/idx_esms_by_user_by_event_name.result index 5586e271069c..504e3fd4a180 100644 --- a/mysql-test/suite/perfschema/r/idx_esms_by_user_by_event_name.result +++ b/mysql-test/suite/perfschema/r/idx_esms_by_user_by_event_name.result @@ -9,7 +9,7 @@ explain select COUNT_STAR from performance_schema.events_statements_summary_by_user_by_event_name where USER = "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_statements_summary_by_user_by_event_name NULL ref USER USER 129 const # 100.00 NULL +1 SIMPLE events_statements_summary_by_user_by_event_name NULL ref USER USER 321 const # 100.00 NULL ############ Explain for Query #################################### explain select COUNT_STAR from performance_schema.events_statements_summary_by_user_by_event_name @@ -27,7 +27,7 @@ explain select COUNT_STAR from performance_schema.events_statements_summary_by_user_by_event_name where USER = "foo"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_statements_summary_by_user_by_event_name NULL ref USER USER 129 const # 100.00 NULL +1 SIMPLE events_statements_summary_by_user_by_event_name NULL ref USER USER 321 const # 100.00 NULL ############ Explain for Query #################################### explain select COUNT_STAR from performance_schema.events_statements_summary_by_user_by_event_name @@ -48,21 +48,21 @@ from performance_schema.events_statements_summary_by_user_by_event_name where USER = "foo" and EVENT_NAME > "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_statements_summary_by_user_by_event_name NULL ref USER USER 129 const # 33.33 Using where +1 SIMPLE events_statements_summary_by_user_by_event_name NULL ref USER USER 321 const # 33.33 Using where ############ Explain for Query #################################### explain select COUNT_STAR from performance_schema.events_statements_summary_by_user_by_event_name where USER = "foo" and EVENT_NAME < "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_statements_summary_by_user_by_event_name NULL ref USER USER 129 const # 33.33 Using where +1 SIMPLE events_statements_summary_by_user_by_event_name NULL ref USER USER 321 const # 33.33 Using where ############ Explain for Query #################################### explain select COUNT_STAR from performance_schema.events_statements_summary_by_user_by_event_name where USER = "foo" and EVENT_NAME = "statement/sql/select"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_statements_summary_by_user_by_event_name NULL const USER USER 643 const,const # 100.00 NULL +1 SIMPLE events_statements_summary_by_user_by_event_name NULL const USER USER 835 const,const # 100.00 NULL ############# Explain End ######################################### flush status; select COUNT_STAR diff --git a/mysql-test/suite/perfschema/r/idx_ets_by_account_by_event_name.result b/mysql-test/suite/perfschema/r/idx_ets_by_account_by_event_name.result index 3d7a836686f8..fd30167ed705 100644 --- a/mysql-test/suite/perfschema/r/idx_ets_by_account_by_event_name.result +++ b/mysql-test/suite/perfschema/r/idx_ets_by_account_by_event_name.result @@ -34,14 +34,14 @@ from performance_schema.events_transactions_summary_by_account_by_event_name where HOST = "impossible" and USER = "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_transactions_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 370 const,const # 100.00 NULL +1 SIMPLE events_transactions_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 562 const,const # 100.00 NULL ############ Explain for Query #################################### explain select COUNT_STAR from performance_schema.events_transactions_summary_by_account_by_event_name where HOST = "localhost" and USER = "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_transactions_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 370 const,const # 100.00 NULL +1 SIMPLE events_transactions_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 562 const,const # 100.00 NULL ############ Explain for Query #################################### explain select COUNT_STAR from performance_schema.events_transactions_summary_by_account_by_event_name @@ -62,7 +62,7 @@ from performance_schema.events_transactions_summary_by_account_by_event_name where HOST = "localhost" and USER = "foo"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_transactions_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 370 const,const # 100.00 NULL +1 SIMPLE events_transactions_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 562 const,const # 100.00 NULL ############ Explain for Query #################################### explain select COUNT_STAR from performance_schema.events_transactions_summary_by_account_by_event_name @@ -86,7 +86,7 @@ where HOST = "localhost" and USER = "foo" and EVENT_NAME > "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_transactions_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 370 const,const # 33.33 Using where +1 SIMPLE events_transactions_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 562 const,const # 33.33 Using where ############ Explain for Query #################################### explain select COUNT_STAR from performance_schema.events_transactions_summary_by_account_by_event_name @@ -94,7 +94,7 @@ where HOST = "localhost" and USER = "foo" and EVENT_NAME < "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_transactions_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 370 const,const # 33.33 Using where +1 SIMPLE events_transactions_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 562 const,const # 33.33 Using where ############ Explain for Query #################################### explain select COUNT_STAR from performance_schema.events_transactions_summary_by_account_by_event_name @@ -102,7 +102,7 @@ where HOST = "localhost" and USER = "foo" and EVENT_NAME = "transaction"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_transactions_summary_by_account_by_event_name NULL const ACCOUNT ACCOUNT 884 const,const,const # 100.00 NULL +1 SIMPLE events_transactions_summary_by_account_by_event_name NULL const ACCOUNT ACCOUNT 1076 const,const,const # 100.00 NULL ############# Explain End ######################################### flush status; select COUNT_STAR diff --git a/mysql-test/suite/perfschema/r/idx_ets_by_user_by_event_name.result b/mysql-test/suite/perfschema/r/idx_ets_by_user_by_event_name.result index 96ac3b84b8d8..4d1385e0a9ea 100644 --- a/mysql-test/suite/perfschema/r/idx_ets_by_user_by_event_name.result +++ b/mysql-test/suite/perfschema/r/idx_ets_by_user_by_event_name.result @@ -9,7 +9,7 @@ explain select COUNT_STAR from performance_schema.events_transactions_summary_by_user_by_event_name where USER = "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_transactions_summary_by_user_by_event_name NULL ref USER USER 129 const # 100.00 NULL +1 SIMPLE events_transactions_summary_by_user_by_event_name NULL ref USER USER 321 const # 100.00 NULL ############ Explain for Query #################################### explain select COUNT_STAR from performance_schema.events_transactions_summary_by_user_by_event_name @@ -27,7 +27,7 @@ explain select COUNT_STAR from performance_schema.events_transactions_summary_by_user_by_event_name where USER = "foo"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_transactions_summary_by_user_by_event_name NULL ref USER USER 129 const # 100.00 NULL +1 SIMPLE events_transactions_summary_by_user_by_event_name NULL ref USER USER 321 const # 100.00 NULL ############ Explain for Query #################################### explain select COUNT_STAR from performance_schema.events_transactions_summary_by_user_by_event_name @@ -48,21 +48,21 @@ from performance_schema.events_transactions_summary_by_user_by_event_name where USER = "foo" and EVENT_NAME > "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_transactions_summary_by_user_by_event_name NULL ref USER USER 129 const # 33.33 Using where +1 SIMPLE events_transactions_summary_by_user_by_event_name NULL ref USER USER 321 const # 33.33 Using where ############ Explain for Query #################################### explain select COUNT_STAR from performance_schema.events_transactions_summary_by_user_by_event_name where USER = "foo" and EVENT_NAME < "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_transactions_summary_by_user_by_event_name NULL ref USER USER 129 const # 33.33 Using where +1 SIMPLE events_transactions_summary_by_user_by_event_name NULL ref USER USER 321 const # 33.33 Using where ############ Explain for Query #################################### explain select COUNT_STAR from performance_schema.events_transactions_summary_by_user_by_event_name where USER = "foo" and EVENT_NAME = "transaction"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_transactions_summary_by_user_by_event_name NULL const USER USER 643 const,const # 100.00 NULL +1 SIMPLE events_transactions_summary_by_user_by_event_name NULL const USER USER 835 const,const # 100.00 NULL ############# Explain End ######################################### flush status; select COUNT_STAR diff --git a/mysql-test/suite/perfschema/r/idx_ews_by_account_by_event_name.result b/mysql-test/suite/perfschema/r/idx_ews_by_account_by_event_name.result index 6a0e592e4d81..5ea3e34e9af7 100644 --- a/mysql-test/suite/perfschema/r/idx_ews_by_account_by_event_name.result +++ b/mysql-test/suite/perfschema/r/idx_ews_by_account_by_event_name.result @@ -34,14 +34,14 @@ from performance_schema.events_waits_summary_by_account_by_event_name where HOST = "impossible" and USER = "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_waits_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 370 const,const # 100.00 NULL +1 SIMPLE events_waits_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 562 const,const # 100.00 NULL ############ Explain for Query #################################### explain select COUNT_STAR from performance_schema.events_waits_summary_by_account_by_event_name where HOST = "localhost" and USER = "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_waits_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 370 const,const # 100.00 NULL +1 SIMPLE events_waits_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 562 const,const # 100.00 NULL ############ Explain for Query #################################### explain select COUNT_STAR from performance_schema.events_waits_summary_by_account_by_event_name @@ -62,7 +62,7 @@ from performance_schema.events_waits_summary_by_account_by_event_name where HOST = "localhost" and USER = "foo"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_waits_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 370 const,const # 100.00 NULL +1 SIMPLE events_waits_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 562 const,const # 100.00 NULL ############ Explain for Query #################################### explain select COUNT_STAR from performance_schema.events_waits_summary_by_account_by_event_name @@ -86,7 +86,7 @@ where HOST = "localhost" and USER = "foo" and EVENT_NAME > "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_waits_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 370 const,const # 33.33 Using where +1 SIMPLE events_waits_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 562 const,const # 33.33 Using where ############ Explain for Query #################################### explain select COUNT_STAR from performance_schema.events_waits_summary_by_account_by_event_name @@ -94,7 +94,7 @@ where HOST = "localhost" and USER = "foo" and EVENT_NAME < "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_waits_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 370 const,const # 33.33 Using where +1 SIMPLE events_waits_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 562 const,const # 33.33 Using where ############ Explain for Query #################################### explain select COUNT_STAR from performance_schema.events_waits_summary_by_account_by_event_name @@ -102,7 +102,7 @@ where HOST = "localhost" and USER = "foo" and EVENT_NAME = "wait/lock/table/sql/handler"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_waits_summary_by_account_by_event_name NULL const ACCOUNT ACCOUNT 884 const,const,const # 100.00 NULL +1 SIMPLE events_waits_summary_by_account_by_event_name NULL const ACCOUNT ACCOUNT 1076 const,const,const # 100.00 NULL ############# Explain End ######################################### flush status; select COUNT_STAR diff --git a/mysql-test/suite/perfschema/r/idx_ews_by_user_by_event_name.result b/mysql-test/suite/perfschema/r/idx_ews_by_user_by_event_name.result index 36118b327572..9d594282d018 100644 --- a/mysql-test/suite/perfschema/r/idx_ews_by_user_by_event_name.result +++ b/mysql-test/suite/perfschema/r/idx_ews_by_user_by_event_name.result @@ -9,7 +9,7 @@ explain select COUNT_STAR from performance_schema.events_waits_summary_by_user_by_event_name where USER = "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_waits_summary_by_user_by_event_name NULL ref USER USER 129 const # 100.00 NULL +1 SIMPLE events_waits_summary_by_user_by_event_name NULL ref USER USER 321 const # 100.00 NULL ############ Explain for Query #################################### explain select COUNT_STAR from performance_schema.events_waits_summary_by_user_by_event_name @@ -27,7 +27,7 @@ explain select COUNT_STAR from performance_schema.events_waits_summary_by_user_by_event_name where USER = "foo"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_waits_summary_by_user_by_event_name NULL ref USER USER 129 const # 100.00 NULL +1 SIMPLE events_waits_summary_by_user_by_event_name NULL ref USER USER 321 const # 100.00 NULL ############ Explain for Query #################################### explain select COUNT_STAR from performance_schema.events_waits_summary_by_user_by_event_name @@ -48,21 +48,21 @@ from performance_schema.events_waits_summary_by_user_by_event_name where USER = "foo" and EVENT_NAME > "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_waits_summary_by_user_by_event_name NULL ref USER USER 129 const # 33.33 Using where +1 SIMPLE events_waits_summary_by_user_by_event_name NULL ref USER USER 321 const # 33.33 Using where ############ Explain for Query #################################### explain select COUNT_STAR from performance_schema.events_waits_summary_by_user_by_event_name where USER = "foo" and EVENT_NAME < "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_waits_summary_by_user_by_event_name NULL ref USER USER 129 const # 33.33 Using where +1 SIMPLE events_waits_summary_by_user_by_event_name NULL ref USER USER 321 const # 33.33 Using where ############ Explain for Query #################################### explain select COUNT_STAR from performance_schema.events_waits_summary_by_user_by_event_name where USER = "foo" and EVENT_NAME = "wait/lock/table/sql/handler"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE events_waits_summary_by_user_by_event_name NULL const USER USER 643 const,const # 100.00 NULL +1 SIMPLE events_waits_summary_by_user_by_event_name NULL const USER USER 835 const,const # 100.00 NULL ############# Explain End ######################################### flush status; select COUNT_STAR diff --git a/mysql-test/suite/perfschema/r/idx_joins.result b/mysql-test/suite/perfschema/r/idx_joins.result index 1b3073966e6a..8991b0eb92d6 100644 --- a/mysql-test/suite/perfschema/r/idx_joins.result +++ b/mysql-test/suite/perfschema/r/idx_joins.result @@ -8,8 +8,8 @@ USE performance_schema; EXPLAIN SELECT * FROM (users AS t1 INNER JOIN hosts AS t2 ON (t2.host = t1.user)); id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE t1 NULL ALL USER NULL NULL NULL # 100.00 Using where -1 SIMPLE t2 NULL ref HOST HOST 241 performance_schema.t1.USER # 100.00 Using where +1 SIMPLE t2 NULL ALL HOST NULL NULL NULL # 100.00 Using where +1 SIMPLE t1 NULL ref USER USER 321 performance_schema.t2.HOST # 100.00 Using where Warnings: Note 1003 /* select#1 */ select `performance_schema`.`t1`.`USER` AS `USER`,`performance_schema`.`t1`.`CURRENT_CONNECTIONS` AS `CURRENT_CONNECTIONS`,`performance_schema`.`t1`.`TOTAL_CONNECTIONS` AS `TOTAL_CONNECTIONS`,`performance_schema`.`t2`.`HOST` AS `HOST`,`performance_schema`.`t2`.`CURRENT_CONNECTIONS` AS `CURRENT_CONNECTIONS`,`performance_schema`.`t2`.`TOTAL_CONNECTIONS` AS `TOTAL_CONNECTIONS` from `performance_schema`.`users` `t1` join `performance_schema`.`hosts` `t2` where (`performance_schema`.`t2`.`HOST` = `performance_schema`.`t1`.`USER`) diff --git a/mysql-test/suite/perfschema/r/idx_setup_actors.result b/mysql-test/suite/perfschema/r/idx_setup_actors.result index 46adbeb22f8c..eb850bcb3e81 100644 --- a/mysql-test/suite/perfschema/r/idx_setup_actors.result +++ b/mysql-test/suite/perfschema/r/idx_setup_actors.result @@ -14,7 +14,7 @@ explain select * from performance_schema.setup_actors where HOST = 'host1' and USER = 'user1'; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE setup_actors NULL ref PRIMARY PRIMARY 368 const,const # 100.00 NULL +1 SIMPLE setup_actors NULL ref PRIMARY PRIMARY 560 const,const # 100.00 NULL Warnings: Note 1003 /* select#1 */ select `performance_schema`.`setup_actors`.`HOST` AS `HOST`,`performance_schema`.`setup_actors`.`USER` AS `USER`,`performance_schema`.`setup_actors`.`ROLE` AS `ROLE`,`performance_schema`.`setup_actors`.`ENABLED` AS `ENABLED`,`performance_schema`.`setup_actors`.`HISTORY` AS `HISTORY` from `performance_schema`.`setup_actors` where ((`performance_schema`.`setup_actors`.`USER` = 'user1') and (`performance_schema`.`setup_actors`.`HOST` = 'host1')) ############ Explain for Query #################################### @@ -50,7 +50,7 @@ explain select HOST, USER, `ROLE` where HOST = 'host1' and USER = 'user1' and `ROLE` = '%'; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE setup_actors NULL const PRIMARY PRIMARY 496 const,const,const # 100.00 NULL +1 SIMPLE setup_actors NULL const PRIMARY PRIMARY 688 const,const,const # 100.00 NULL Warnings: Note 1003 /* select#1 */ select 'host1' AS `HOST`,'user1' AS `USER`,'%' AS `ROLE` from `performance_schema`.`setup_actors` where 1 ############# Explain End ######################################### diff --git a/mysql-test/suite/perfschema/r/idx_status_by_account.result b/mysql-test/suite/perfschema/r/idx_status_by_account.result index 10f8392e72a4..828b85eadc6b 100644 --- a/mysql-test/suite/perfschema/r/idx_status_by_account.result +++ b/mysql-test/suite/perfschema/r/idx_status_by_account.result @@ -10,7 +10,7 @@ explain select VARIABLE_VALUE from performance_schema.status_by_account where USER = "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE status_by_account NULL ref ACCOUNT ACCOUNT 129 const # 100.00 NULL +1 SIMPLE status_by_account NULL ref ACCOUNT ACCOUNT 321 const # 100.00 NULL ############ Explain for Query #################################### explain select VARIABLE_VALUE from performance_schema.status_by_account @@ -28,42 +28,42 @@ explain select VARIABLE_VALUE from performance_schema.status_by_account where USER = "foo"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE status_by_account NULL ref ACCOUNT ACCOUNT 129 const # 100.00 NULL +1 SIMPLE status_by_account NULL ref ACCOUNT ACCOUNT 321 const # 100.00 NULL ############ Explain for Query #################################### explain select VARIABLE_VALUE from performance_schema.status_by_account where USER = "impossible" and HOST = "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE status_by_account NULL ref ACCOUNT ACCOUNT 370 const,const # 100.00 NULL +1 SIMPLE status_by_account NULL ref ACCOUNT ACCOUNT 562 const,const # 100.00 NULL ############ Explain for Query #################################### explain select VARIABLE_VALUE from performance_schema.status_by_account where USER = "foo" and HOST = "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE status_by_account NULL ref ACCOUNT ACCOUNT 370 const,const # 100.00 NULL +1 SIMPLE status_by_account NULL ref ACCOUNT ACCOUNT 562 const,const # 100.00 NULL ############ Explain for Query #################################### explain select VARIABLE_VALUE from performance_schema.status_by_account where USER = "foo" and HOST > "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE status_by_account NULL ref ACCOUNT ACCOUNT 129 const # 33.33 Using where +1 SIMPLE status_by_account NULL ref ACCOUNT ACCOUNT 321 const # 33.33 Using where ############ Explain for Query #################################### explain select VARIABLE_VALUE from performance_schema.status_by_account where USER = "foo" and HOST < "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE status_by_account NULL ref ACCOUNT ACCOUNT 129 const # 33.33 Using where +1 SIMPLE status_by_account NULL ref ACCOUNT ACCOUNT 321 const # 33.33 Using where ############ Explain for Query #################################### explain select VARIABLE_VALUE from performance_schema.status_by_account where USER = "foo" and HOST = "localhost"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE status_by_account NULL ref ACCOUNT ACCOUNT 370 const,const # 100.00 NULL +1 SIMPLE status_by_account NULL ref ACCOUNT ACCOUNT 562 const,const # 100.00 NULL ############ Explain for Query #################################### explain select VARIABLE_VALUE from performance_schema.status_by_account @@ -87,7 +87,7 @@ where USER = "foo" and HOST = "localhost" and VARIABLE_NAME > "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE status_by_account NULL ref ACCOUNT ACCOUNT 370 const,const # 33.33 Using where +1 SIMPLE status_by_account NULL ref ACCOUNT ACCOUNT 562 const,const # 33.33 Using where ############ Explain for Query #################################### explain select VARIABLE_VALUE from performance_schema.status_by_account @@ -95,7 +95,7 @@ where USER = "foo" and HOST = "localhost" and VARIABLE_NAME < "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE status_by_account NULL ref ACCOUNT ACCOUNT 370 const,const # 33.33 Using where +1 SIMPLE status_by_account NULL ref ACCOUNT ACCOUNT 562 const,const # 33.33 Using where ############ Explain for Query #################################### explain select VARIABLE_VALUE from performance_schema.status_by_account @@ -103,7 +103,7 @@ where USER = "foo" and HOST = "localhost" and VARIABLE_NAME = "Max_execution_time_exceeded"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE status_by_account NULL const ACCOUNT ACCOUNT 628 const,const,const # 100.00 NULL +1 SIMPLE status_by_account NULL const ACCOUNT ACCOUNT 820 const,const,const # 100.00 NULL ############# Explain End ######################################### flush status; select VARIABLE_VALUE diff --git a/mysql-test/suite/perfschema/r/idx_status_by_user.result b/mysql-test/suite/perfschema/r/idx_status_by_user.result index f7542e75b1e0..653f990d446a 100644 --- a/mysql-test/suite/perfschema/r/idx_status_by_user.result +++ b/mysql-test/suite/perfschema/r/idx_status_by_user.result @@ -10,7 +10,7 @@ explain select VARIABLE_VALUE from performance_schema.status_by_user where USER = "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE status_by_user NULL ref USER USER 129 const # 100.00 NULL +1 SIMPLE status_by_user NULL ref USER USER 321 const # 100.00 NULL ############ Explain for Query #################################### explain select VARIABLE_VALUE from performance_schema.status_by_user @@ -28,7 +28,7 @@ explain select VARIABLE_VALUE from performance_schema.status_by_user where USER = "foo"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE status_by_user NULL ref USER USER 129 const # 100.00 NULL +1 SIMPLE status_by_user NULL ref USER USER 321 const # 100.00 NULL ############ Explain for Query #################################### explain select VARIABLE_VALUE from performance_schema.status_by_user @@ -49,21 +49,21 @@ from performance_schema.status_by_user where USER = "foo" and VARIABLE_NAME > "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE status_by_user NULL ref USER USER 129 const # 33.33 Using where +1 SIMPLE status_by_user NULL ref USER USER 321 const # 33.33 Using where ############ Explain for Query #################################### explain select VARIABLE_VALUE from performance_schema.status_by_user where USER = "foo" and VARIABLE_NAME < "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE status_by_user NULL ref USER USER 129 const # 33.33 Using where +1 SIMPLE status_by_user NULL ref USER USER 321 const # 33.33 Using where ############ Explain for Query #################################### explain select VARIABLE_VALUE from performance_schema.status_by_user where USER = "foo" and VARIABLE_NAME = "Max_execution_time_exceeded"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE status_by_user NULL const USER USER 387 const,const # 100.00 NULL +1 SIMPLE status_by_user NULL const USER USER 579 const,const # 100.00 NULL ############# Explain End ######################################### flush status; select VARIABLE_VALUE diff --git a/mysql-test/suite/perfschema/r/idx_threads.result b/mysql-test/suite/perfschema/r/idx_threads.result index ef331890754b..8b77f65d2a5d 100644 --- a/mysql-test/suite/perfschema/r/idx_threads.result +++ b/mysql-test/suite/perfschema/r/idx_threads.result @@ -114,13 +114,13 @@ thread_id name processlist_state processlist_info explain select THREAD_ID from performance_schema.threads where PROCESSLIST_USER = "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE threads NULL ref PROCESSLIST_ACCOUNT PROCESSLIST_ACCOUNT 131 const 10 100.00 NULL +1 SIMPLE threads NULL ref PROCESSLIST_ACCOUNT PROCESSLIST_ACCOUNT 323 const 10 100.00 NULL Warnings: Note 1003 /* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID` from `performance_schema`.`threads` where (`performance_schema`.`threads`.`PROCESSLIST_USER` = 'impossible') explain select THREAD_ID from performance_schema.threads where PROCESSLIST_USER = "root"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE threads NULL ref PROCESSLIST_ACCOUNT PROCESSLIST_ACCOUNT 131 const 10 100.00 NULL +1 SIMPLE threads NULL ref PROCESSLIST_ACCOUNT PROCESSLIST_ACCOUNT 323 const 10 100.00 NULL Warnings: Note 1003 /* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID` from `performance_schema`.`threads` where (`performance_schema`.`threads`.`PROCESSLIST_USER` = 'root') explain select * from performance_schema.threads @@ -151,31 +151,31 @@ where PROCESSLIST_USER = "root" explain select THREAD_ID from performance_schema.threads where PROCESSLIST_USER = "impossible" and PROCESSLIST_HOST = "impossible"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE threads NULL ref PROCESSLIST_ACCOUNT,PROCESSLIST_HOST PROCESSLIST_ACCOUNT 374 const,const 10 100.00 NULL +1 SIMPLE threads NULL ref PROCESSLIST_ACCOUNT,PROCESSLIST_HOST PROCESSLIST_ACCOUNT 566 const,const 10 100.00 NULL Warnings: Note 1003 /* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID` from `performance_schema`.`threads` where ((`performance_schema`.`threads`.`PROCESSLIST_HOST` = 'impossible') and (`performance_schema`.`threads`.`PROCESSLIST_USER` = 'impossible')) explain select THREAD_ID from performance_schema.threads where PROCESSLIST_USER = "root" and PROCESSLIST_HOST = "localhost"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE threads NULL ref PROCESSLIST_ACCOUNT,PROCESSLIST_HOST PROCESSLIST_ACCOUNT 374 const,const 10 100.00 NULL +1 SIMPLE threads NULL ref PROCESSLIST_ACCOUNT,PROCESSLIST_HOST PROCESSLIST_ACCOUNT 566 const,const 10 100.00 NULL Warnings: Note 1003 /* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID` from `performance_schema`.`threads` where ((`performance_schema`.`threads`.`PROCESSLIST_HOST` = 'localhost') and (`performance_schema`.`threads`.`PROCESSLIST_USER` = 'root')) explain select * from performance_schema.threads where PROCESSLIST_USER = "foo" and PROCESSLIST_HOST < "foo"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE threads NULL ref PROCESSLIST_ACCOUNT,PROCESSLIST_HOST PROCESSLIST_ACCOUNT 131 const 10 33.33 Using where +1 SIMPLE threads NULL ref PROCESSLIST_ACCOUNT,PROCESSLIST_HOST PROCESSLIST_ACCOUNT 323 const 10 33.33 Using where Warnings: Note 1003 /* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID`,`performance_schema`.`threads`.`NAME` AS `NAME`,`performance_schema`.`threads`.`TYPE` AS `TYPE`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `PROCESSLIST_ID`,`performance_schema`.`threads`.`PROCESSLIST_USER` AS `PROCESSLIST_USER`,`performance_schema`.`threads`.`PROCESSLIST_HOST` AS `PROCESSLIST_HOST`,`performance_schema`.`threads`.`PROCESSLIST_DB` AS `PROCESSLIST_DB`,`performance_schema`.`threads`.`PROCESSLIST_COMMAND` AS `PROCESSLIST_COMMAND`,`performance_schema`.`threads`.`PROCESSLIST_TIME` AS `PROCESSLIST_TIME`,`performance_schema`.`threads`.`PROCESSLIST_STATE` AS `PROCESSLIST_STATE`,`performance_schema`.`threads`.`PROCESSLIST_INFO` AS `PROCESSLIST_INFO`,`performance_schema`.`threads`.`PARENT_THREAD_ID` AS `PARENT_THREAD_ID`,`performance_schema`.`threads`.`ROLE` AS `ROLE`,`performance_schema`.`threads`.`INSTRUMENTED` AS `INSTRUMENTED`,`performance_schema`.`threads`.`HISTORY` AS `HISTORY`,`performance_schema`.`threads`.`CONNECTION_TYPE` AS `CONNECTION_TYPE`,`performance_schema`.`threads`.`THREAD_OS_ID` AS `THREAD_OS_ID`,`performance_schema`.`threads`.`RESOURCE_GROUP` AS `RESOURCE_GROUP` from `performance_schema`.`threads` where ((`performance_schema`.`threads`.`PROCESSLIST_USER` = 'foo') and (`performance_schema`.`threads`.`PROCESSLIST_HOST` < 'foo')) explain select * from performance_schema.threads where PROCESSLIST_USER = "foo" and PROCESSLIST_HOST > "bar"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE threads NULL ref PROCESSLIST_ACCOUNT,PROCESSLIST_HOST PROCESSLIST_ACCOUNT 131 const 10 33.33 Using where +1 SIMPLE threads NULL ref PROCESSLIST_ACCOUNT,PROCESSLIST_HOST PROCESSLIST_ACCOUNT 323 const 10 33.33 Using where Warnings: Note 1003 /* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID`,`performance_schema`.`threads`.`NAME` AS `NAME`,`performance_schema`.`threads`.`TYPE` AS `TYPE`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `PROCESSLIST_ID`,`performance_schema`.`threads`.`PROCESSLIST_USER` AS `PROCESSLIST_USER`,`performance_schema`.`threads`.`PROCESSLIST_HOST` AS `PROCESSLIST_HOST`,`performance_schema`.`threads`.`PROCESSLIST_DB` AS `PROCESSLIST_DB`,`performance_schema`.`threads`.`PROCESSLIST_COMMAND` AS `PROCESSLIST_COMMAND`,`performance_schema`.`threads`.`PROCESSLIST_TIME` AS `PROCESSLIST_TIME`,`performance_schema`.`threads`.`PROCESSLIST_STATE` AS `PROCESSLIST_STATE`,`performance_schema`.`threads`.`PROCESSLIST_INFO` AS `PROCESSLIST_INFO`,`performance_schema`.`threads`.`PARENT_THREAD_ID` AS `PARENT_THREAD_ID`,`performance_schema`.`threads`.`ROLE` AS `ROLE`,`performance_schema`.`threads`.`INSTRUMENTED` AS `INSTRUMENTED`,`performance_schema`.`threads`.`HISTORY` AS `HISTORY`,`performance_schema`.`threads`.`CONNECTION_TYPE` AS `CONNECTION_TYPE`,`performance_schema`.`threads`.`THREAD_OS_ID` AS `THREAD_OS_ID`,`performance_schema`.`threads`.`RESOURCE_GROUP` AS `RESOURCE_GROUP` from `performance_schema`.`threads` where ((`performance_schema`.`threads`.`PROCESSLIST_USER` = 'foo') and (`performance_schema`.`threads`.`PROCESSLIST_HOST` > 'bar')) explain select * from performance_schema.threads where PROCESSLIST_USER = "foo" and PROCESSLIST_HOST like "bar%"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE threads NULL ref PROCESSLIST_ACCOUNT,PROCESSLIST_HOST PROCESSLIST_ACCOUNT 131 const 10 11.11 Using where +1 SIMPLE threads NULL ref PROCESSLIST_ACCOUNT,PROCESSLIST_HOST PROCESSLIST_ACCOUNT 323 const 10 11.11 Using where Warnings: Note 1003 /* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID`,`performance_schema`.`threads`.`NAME` AS `NAME`,`performance_schema`.`threads`.`TYPE` AS `TYPE`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `PROCESSLIST_ID`,`performance_schema`.`threads`.`PROCESSLIST_USER` AS `PROCESSLIST_USER`,`performance_schema`.`threads`.`PROCESSLIST_HOST` AS `PROCESSLIST_HOST`,`performance_schema`.`threads`.`PROCESSLIST_DB` AS `PROCESSLIST_DB`,`performance_schema`.`threads`.`PROCESSLIST_COMMAND` AS `PROCESSLIST_COMMAND`,`performance_schema`.`threads`.`PROCESSLIST_TIME` AS `PROCESSLIST_TIME`,`performance_schema`.`threads`.`PROCESSLIST_STATE` AS `PROCESSLIST_STATE`,`performance_schema`.`threads`.`PROCESSLIST_INFO` AS `PROCESSLIST_INFO`,`performance_schema`.`threads`.`PARENT_THREAD_ID` AS `PARENT_THREAD_ID`,`performance_schema`.`threads`.`ROLE` AS `ROLE`,`performance_schema`.`threads`.`INSTRUMENTED` AS `INSTRUMENTED`,`performance_schema`.`threads`.`HISTORY` AS `HISTORY`,`performance_schema`.`threads`.`CONNECTION_TYPE` AS `CONNECTION_TYPE`,`performance_schema`.`threads`.`THREAD_OS_ID` AS `THREAD_OS_ID`,`performance_schema`.`threads`.`RESOURCE_GROUP` AS `RESOURCE_GROUP` from `performance_schema`.`threads` where ((`performance_schema`.`threads`.`PROCESSLIST_USER` = 'foo') and (`performance_schema`.`threads`.`PROCESSLIST_HOST` like 'bar%')) select thread_id = @tid, name, processlist_state, processlist_info diff --git a/mysql-test/suite/perfschema/r/idx_users.result b/mysql-test/suite/perfschema/r/idx_users.result index 286a47c14cd1..ee2c83a19e13 100644 --- a/mysql-test/suite/perfschema/r/idx_users.result +++ b/mysql-test/suite/perfschema/r/idx_users.result @@ -27,7 +27,7 @@ explain select TOTAL_CONNECTIONS from performance_schema.users where USER = "foo"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE users NULL const USER USER 129 const # 100.00 NULL +1 SIMPLE users NULL const USER USER 321 const # 100.00 NULL ############# Explain End ######################################### flush status; select TOTAL_CONNECTIONS diff --git a/mysql-test/suite/perfschema/r/idx_variables_info.result b/mysql-test/suite/perfschema/r/idx_variables_info.result index 821561e5c285..3059bd6ee73a 100644 --- a/mysql-test/suite/perfschema/r/idx_variables_info.result +++ b/mysql-test/suite/perfschema/r/idx_variables_info.result @@ -7,7 +7,7 @@ variables_info CREATE TABLE `variables_info` ( `MIN_VALUE` varchar(64) DEFAULT NULL, `MAX_VALUE` varchar(64) DEFAULT NULL, `SET_TIME` timestamp(6) NULL DEFAULT NULL, - `SET_USER` char(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL, + `SET_USER` char(80) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL, `SET_HOST` char(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci select * from INFORMATION_SCHEMA.STATISTICS diff --git a/mysql-test/suite/perfschema/r/schema.result b/mysql-test/suite/perfschema/r/schema.result index fff2af859228..acef2a1d6f0b 100644 --- a/mysql-test/suite/perfschema/r/schema.result +++ b/mysql-test/suite/perfschema/r/schema.result @@ -113,7 +113,7 @@ variables_info show create table accounts; Table Create Table accounts CREATE TABLE `accounts` ( - `USER` char(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL, + `USER` char(80) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL, `HOST` char(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL, `CURRENT_CONNECTIONS` bigint(20) NOT NULL, `TOTAL_CONNECTIONS` bigint(20) NOT NULL, @@ -204,7 +204,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; Table Create Table events_stages_summary_by_user_by_event_name CREATE TABLE `events_stages_summary_by_user_by_event_name` ( - `USER` char(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL, + `USER` char(80) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL, `EVENT_NAME` varchar(128) NOT NULL, `COUNT_STAR` bigint(20) unsigned NOT NULL, `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL, @@ -216,7 +216,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; Table Create Table events_stages_summary_by_account_by_event_name CREATE TABLE `events_stages_summary_by_account_by_event_name` ( - `USER` char(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL, + `USER` char(80) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL, `HOST` char(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL, `EVENT_NAME` varchar(128) NOT NULL, `COUNT_STAR` bigint(20) unsigned NOT NULL, @@ -479,7 +479,7 @@ events_statements_summary_by_thread_by_event_name CREATE TABLE `events_statement show create table events_statements_summary_by_user_by_event_name; Table Create Table events_statements_summary_by_user_by_event_name CREATE TABLE `events_statements_summary_by_user_by_event_name` ( - `USER` char(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL, + `USER` char(80) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL, `EVENT_NAME` varchar(128) NOT NULL, `COUNT_STAR` bigint(20) unsigned NOT NULL, `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL, @@ -510,7 +510,7 @@ events_statements_summary_by_user_by_event_name CREATE TABLE `events_statements_ show create table events_statements_summary_by_account_by_event_name; Table Create Table events_statements_summary_by_account_by_event_name CREATE TABLE `events_statements_summary_by_account_by_event_name` ( - `USER` char(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL, + `USER` char(80) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL, `HOST` char(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL, `EVENT_NAME` varchar(128) NOT NULL, `COUNT_STAR` bigint(20) unsigned NOT NULL, @@ -702,7 +702,7 @@ events_transactions_summary_by_thread_by_event_name CREATE TABLE `events_transac show create table events_transactions_summary_by_user_by_event_name; Table Create Table events_transactions_summary_by_user_by_event_name CREATE TABLE `events_transactions_summary_by_user_by_event_name` ( - `USER` char(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL, + `USER` char(80) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL, `EVENT_NAME` varchar(128) NOT NULL, `COUNT_STAR` bigint(20) unsigned NOT NULL, `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL, @@ -724,7 +724,7 @@ events_transactions_summary_by_user_by_event_name CREATE TABLE `events_transacti show create table events_transactions_summary_by_account_by_event_name; Table Create Table events_transactions_summary_by_account_by_event_name CREATE TABLE `events_transactions_summary_by_account_by_event_name` ( - `USER` char(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL, + `USER` char(80) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL, `HOST` char(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL, `EVENT_NAME` varchar(128) NOT NULL, `COUNT_STAR` bigint(20) unsigned NOT NULL, @@ -876,7 +876,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; Table Create Table events_waits_summary_by_user_by_event_name CREATE TABLE `events_waits_summary_by_user_by_event_name` ( - `USER` char(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL, + `USER` char(80) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL, `EVENT_NAME` varchar(128) NOT NULL, `COUNT_STAR` bigint(20) unsigned NOT NULL, `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL, @@ -888,7 +888,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; Table Create Table events_waits_summary_by_account_by_event_name CREATE TABLE `events_waits_summary_by_account_by_event_name` ( - `USER` char(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL, + `USER` char(80) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL, `HOST` char(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL, `EVENT_NAME` varchar(128) NOT NULL, `COUNT_STAR` bigint(20) unsigned NOT NULL, @@ -1214,7 +1214,7 @@ show create table setup_actors; Table Create Table setup_actors CREATE TABLE `setup_actors` ( `HOST` char(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '%', - `USER` char(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '%', + `USER` char(80) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '%', `ROLE` char(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '%', `ENABLED` enum('YES','NO') NOT NULL DEFAULT 'YES', `HISTORY` enum('YES','NO') NOT NULL DEFAULT 'YES', @@ -1503,7 +1503,7 @@ threads CREATE TABLE `threads` ( `NAME` varchar(128) NOT NULL, `TYPE` varchar(10) NOT NULL, `PROCESSLIST_ID` bigint(20) unsigned DEFAULT NULL, - `PROCESSLIST_USER` varchar(32) DEFAULT NULL, + `PROCESSLIST_USER` varchar(80) DEFAULT NULL, `PROCESSLIST_HOST` varchar(60) DEFAULT NULL, `PROCESSLIST_DB` varchar(64) DEFAULT NULL, `PROCESSLIST_COMMAND` varchar(16) DEFAULT NULL, @@ -1528,7 +1528,7 @@ threads CREATE TABLE `threads` ( show create table users; Table Create Table users CREATE TABLE `users` ( - `USER` char(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL, + `USER` char(80) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL, `CURRENT_CONNECTIONS` bigint(20) NOT NULL, `TOTAL_CONNECTIONS` bigint(20) NOT NULL, UNIQUE KEY `USER` (`USER`) diff --git a/mysql-test/suite/perfschema/r/table_schema.result b/mysql-test/suite/perfschema/r/table_schema.result index 2112f72980c3..9f4bf91fb06c 100644 --- a/mysql-test/suite/perfschema/r/table_schema.result +++ b/mysql-test/suite/perfschema/r/table_schema.result @@ -1,7 +1,7 @@ select * from information_schema.columns where table_schema="performance_schema" order by table_name collate utf8_general_ci, ordinal_position; 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 GENERATION_EXPRESSION SRS_ID -def performance_schema accounts USER 1 NULL YES char 32 128 NULL NULL NULL utf8mb4 utf8mb4_bin char(32) MUL select,insert,update,references NULL +def performance_schema accounts USER 1 NULL YES char 80 320 NULL NULL NULL utf8mb4 utf8mb4_bin char(80) MUL select,insert,update,references NULL def performance_schema accounts HOST 2 NULL YES char 60 240 NULL NULL NULL utf8mb4 utf8mb4_bin char(60) select,insert,update,references NULL def performance_schema accounts CURRENT_CONNECTIONS 3 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references NULL def performance_schema accounts TOTAL_CONNECTIONS 4 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references NULL @@ -33,7 +33,7 @@ def performance_schema data_lock_waits BLOCKING_ENGINE_TRANSACTION_ID 8 NULL YES def performance_schema data_lock_waits BLOCKING_THREAD_ID 9 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned MUL select,insert,update,references NULL def performance_schema data_lock_waits BLOCKING_EVENT_ID 10 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NULL def performance_schema data_lock_waits BLOCKING_OBJECT_INSTANCE_BEGIN 11 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NULL -def performance_schema events_errors_summary_by_account_by_error USER 1 NULL YES char 32 128 NULL NULL NULL utf8mb4 utf8mb4_bin char(32) MUL select,insert,update,references NULL +def performance_schema events_errors_summary_by_account_by_error USER 1 NULL YES char 80 320 NULL NULL NULL utf8mb4 utf8mb4_bin char(80) MUL select,insert,update,references NULL def performance_schema events_errors_summary_by_account_by_error HOST 2 NULL YES char 60 240 NULL NULL NULL utf8mb4 utf8mb4_bin char(60) select,insert,update,references NULL def performance_schema events_errors_summary_by_account_by_error ERROR_NUMBER 3 NULL YES int NULL NULL 10 0 NULL NULL NULL int(11) select,insert,update,references NULL def performance_schema events_errors_summary_by_account_by_error ERROR_NAME 4 NULL YES varchar 64 256 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(64) select,insert,update,references NULL @@ -58,7 +58,7 @@ def performance_schema events_errors_summary_by_thread_by_error SUM_ERROR_RAISED def performance_schema events_errors_summary_by_thread_by_error SUM_ERROR_HANDLED 6 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NULL def performance_schema events_errors_summary_by_thread_by_error FIRST_SEEN 7 0000-00-00 00:00:00 YES timestamp NULL NULL NULL NULL 0 NULL NULL timestamp select,insert,update,references NULL def performance_schema events_errors_summary_by_thread_by_error LAST_SEEN 8 0000-00-00 00:00:00 YES timestamp NULL NULL NULL NULL 0 NULL NULL timestamp select,insert,update,references NULL -def performance_schema events_errors_summary_by_user_by_error USER 1 NULL YES char 32 128 NULL NULL NULL utf8mb4 utf8mb4_bin char(32) MUL select,insert,update,references NULL +def performance_schema events_errors_summary_by_user_by_error USER 1 NULL YES char 80 320 NULL NULL NULL utf8mb4 utf8mb4_bin char(80) MUL select,insert,update,references NULL def performance_schema events_errors_summary_by_user_by_error ERROR_NUMBER 2 NULL YES int NULL NULL 10 0 NULL NULL NULL int(11) select,insert,update,references NULL def performance_schema events_errors_summary_by_user_by_error ERROR_NAME 3 NULL YES varchar 64 256 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(64) select,insert,update,references NULL def performance_schema events_errors_summary_by_user_by_error SQL_STATE 4 NULL YES varchar 5 20 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(5) select,insert,update,references NULL @@ -109,7 +109,7 @@ def performance_schema events_stages_history_long WORK_COMPLETED 9 NULL YES bigi def performance_schema events_stages_history_long WORK_ESTIMATED 10 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NULL def performance_schema events_stages_history_long NESTING_EVENT_ID 11 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NULL def performance_schema events_stages_history_long NESTING_EVENT_TYPE 12 NULL YES enum 11 44 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci enum('TRANSACTION','STATEMENT','STAGE','WAIT') select,insert,update,references NULL -def performance_schema events_stages_summary_by_account_by_event_name USER 1 NULL YES char 32 128 NULL NULL NULL utf8mb4 utf8mb4_bin char(32) MUL select,insert,update,references NULL +def performance_schema events_stages_summary_by_account_by_event_name USER 1 NULL YES char 80 320 NULL NULL NULL utf8mb4 utf8mb4_bin char(80) MUL select,insert,update,references NULL def performance_schema events_stages_summary_by_account_by_event_name HOST 2 NULL YES char 60 240 NULL NULL NULL utf8mb4 utf8mb4_bin char(60) select,insert,update,references NULL def performance_schema events_stages_summary_by_account_by_event_name EVENT_NAME 3 NULL NO varchar 128 512 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(128) select,insert,update,references NULL def performance_schema events_stages_summary_by_account_by_event_name COUNT_STAR 4 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NULL @@ -131,7 +131,7 @@ def performance_schema events_stages_summary_by_thread_by_event_name SUM_TIMER_W def performance_schema events_stages_summary_by_thread_by_event_name MIN_TIMER_WAIT 5 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NULL def performance_schema events_stages_summary_by_thread_by_event_name AVG_TIMER_WAIT 6 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NULL def performance_schema events_stages_summary_by_thread_by_event_name MAX_TIMER_WAIT 7 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NULL -def performance_schema events_stages_summary_by_user_by_event_name USER 1 NULL YES char 32 128 NULL NULL NULL utf8mb4 utf8mb4_bin char(32) MUL select,insert,update,references NULL +def performance_schema events_stages_summary_by_user_by_event_name USER 1 NULL YES char 80 320 NULL NULL NULL utf8mb4 utf8mb4_bin char(80) MUL select,insert,update,references NULL def performance_schema events_stages_summary_by_user_by_event_name EVENT_NAME 2 NULL NO varchar 128 512 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(128) select,insert,update,references NULL def performance_schema events_stages_summary_by_user_by_event_name COUNT_STAR 3 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NULL def performance_schema events_stages_summary_by_user_by_event_name SUM_TIMER_WAIT 4 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NULL @@ -281,7 +281,7 @@ def performance_schema events_statements_history_long NO_GOOD_INDEX_USED 38 NULL def performance_schema events_statements_history_long NESTING_EVENT_ID 39 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NULL def performance_schema events_statements_history_long NESTING_EVENT_TYPE 40 NULL YES enum 11 44 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci enum('TRANSACTION','STATEMENT','STAGE','WAIT') select,insert,update,references NULL def performance_schema events_statements_history_long NESTING_EVENT_LEVEL 41 NULL YES int NULL NULL 10 0 NULL NULL NULL int(11) select,insert,update,references NULL -def performance_schema events_statements_summary_by_account_by_event_name USER 1 NULL YES char 32 128 NULL NULL NULL utf8mb4 utf8mb4_bin char(32) MUL select,insert,update,references NULL +def performance_schema events_statements_summary_by_account_by_event_name USER 1 NULL YES char 80 320 NULL NULL NULL utf8mb4 utf8mb4_bin char(80) MUL select,insert,update,references NULL def performance_schema events_statements_summary_by_account_by_event_name HOST 2 NULL YES char 60 240 NULL NULL NULL utf8mb4 utf8mb4_bin char(60) select,insert,update,references NULL def performance_schema events_statements_summary_by_account_by_event_name EVENT_NAME 3 NULL NO varchar 128 512 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(128) select,insert,update,references NULL def performance_schema events_statements_summary_by_account_by_event_name COUNT_STAR 4 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NULL @@ -427,7 +427,7 @@ def performance_schema events_statements_summary_by_thread_by_event_name SUM_SOR def performance_schema events_statements_summary_by_thread_by_event_name SUM_SORT_SCAN 24 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NULL def performance_schema events_statements_summary_by_thread_by_event_name SUM_NO_INDEX_USED 25 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NULL def performance_schema events_statements_summary_by_thread_by_event_name SUM_NO_GOOD_INDEX_USED 26 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NULL -def performance_schema events_statements_summary_by_user_by_event_name USER 1 NULL YES char 32 128 NULL NULL NULL utf8mb4 utf8mb4_bin char(32) MUL select,insert,update,references NULL +def performance_schema events_statements_summary_by_user_by_event_name USER 1 NULL YES char 80 320 NULL NULL NULL utf8mb4 utf8mb4_bin char(80) MUL select,insert,update,references NULL def performance_schema events_statements_summary_by_user_by_event_name EVENT_NAME 2 NULL NO varchar 128 512 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(128) select,insert,update,references NULL def performance_schema events_statements_summary_by_user_by_event_name COUNT_STAR 3 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NULL def performance_schema events_statements_summary_by_user_by_event_name SUM_TIMER_WAIT 4 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NULL @@ -550,7 +550,7 @@ def performance_schema events_transactions_history_long NUMBER_OF_RELEASE_SAVEPO def performance_schema events_transactions_history_long OBJECT_INSTANCE_BEGIN 22 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NULL def performance_schema events_transactions_history_long NESTING_EVENT_ID 23 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NULL def performance_schema events_transactions_history_long NESTING_EVENT_TYPE 24 NULL YES enum 11 44 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci enum('TRANSACTION','STATEMENT','STAGE','WAIT') select,insert,update,references NULL -def performance_schema events_transactions_summary_by_account_by_event_name USER 1 NULL YES char 32 128 NULL NULL NULL utf8mb4 utf8mb4_bin char(32) MUL select,insert,update,references NULL +def performance_schema events_transactions_summary_by_account_by_event_name USER 1 NULL YES char 80 320 NULL NULL NULL utf8mb4 utf8mb4_bin char(80) MUL select,insert,update,references NULL def performance_schema events_transactions_summary_by_account_by_event_name HOST 2 NULL YES char 60 240 NULL NULL NULL utf8mb4 utf8mb4_bin char(60) select,insert,update,references NULL def performance_schema events_transactions_summary_by_account_by_event_name EVENT_NAME 3 NULL NO varchar 128 512 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(128) select,insert,update,references NULL def performance_schema events_transactions_summary_by_account_by_event_name COUNT_STAR 4 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NULL @@ -602,7 +602,7 @@ def performance_schema events_transactions_summary_by_thread_by_event_name SUM_T def performance_schema events_transactions_summary_by_thread_by_event_name MIN_TIMER_READ_ONLY 15 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NULL def performance_schema events_transactions_summary_by_thread_by_event_name AVG_TIMER_READ_ONLY 16 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NULL def performance_schema events_transactions_summary_by_thread_by_event_name MAX_TIMER_READ_ONLY 17 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NULL -def performance_schema events_transactions_summary_by_user_by_event_name USER 1 NULL YES char 32 128 NULL NULL NULL utf8mb4 utf8mb4_bin char(32) MUL select,insert,update,references NULL +def performance_schema events_transactions_summary_by_user_by_event_name USER 1 NULL YES char 80 320 NULL NULL NULL utf8mb4 utf8mb4_bin char(80) MUL select,insert,update,references NULL def performance_schema events_transactions_summary_by_user_by_event_name EVENT_NAME 2 NULL NO varchar 128 512 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(128) select,insert,update,references NULL def performance_schema events_transactions_summary_by_user_by_event_name COUNT_STAR 3 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NULL def performance_schema events_transactions_summary_by_user_by_event_name SUM_TIMER_WAIT 4 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NULL @@ -692,7 +692,7 @@ def performance_schema events_waits_history_long NESTING_EVENT_TYPE 16 NULL YES def performance_schema events_waits_history_long OPERATION 17 NULL NO varchar 32 128 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(32) select,insert,update,references NULL def performance_schema events_waits_history_long NUMBER_OF_BYTES 18 NULL YES bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references NULL def performance_schema events_waits_history_long FLAGS 19 NULL YES int NULL NULL 10 0 NULL NULL NULL int(10) unsigned select,insert,update,references NULL -def performance_schema events_waits_summary_by_account_by_event_name USER 1 NULL YES char 32 128 NULL NULL NULL utf8mb4 utf8mb4_bin char(32) MUL select,insert,update,references NULL +def performance_schema events_waits_summary_by_account_by_event_name USER 1 NULL YES char 80 320 NULL NULL NULL utf8mb4 utf8mb4_bin char(80) MUL select,insert,update,references NULL def performance_schema events_waits_summary_by_account_by_event_name HOST 2 NULL YES char 60 240 NULL NULL NULL utf8mb4 utf8mb4_bin char(60) select,insert,update,references NULL def performance_schema events_waits_summary_by_account_by_event_name EVENT_NAME 3 NULL NO varchar 128 512 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(128) select,insert,update,references NULL def performance_schema events_waits_summary_by_account_by_event_name COUNT_STAR 4 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NULL @@ -721,7 +721,7 @@ def performance_schema events_waits_summary_by_thread_by_event_name SUM_TIMER_WA def performance_schema events_waits_summary_by_thread_by_event_name MIN_TIMER_WAIT 5 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NULL def performance_schema events_waits_summary_by_thread_by_event_name AVG_TIMER_WAIT 6 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NULL def performance_schema events_waits_summary_by_thread_by_event_name MAX_TIMER_WAIT 7 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NULL -def performance_schema events_waits_summary_by_user_by_event_name USER 1 NULL YES char 32 128 NULL NULL NULL utf8mb4 utf8mb4_bin char(32) MUL select,insert,update,references NULL +def performance_schema events_waits_summary_by_user_by_event_name USER 1 NULL YES char 80 320 NULL NULL NULL utf8mb4 utf8mb4_bin char(80) MUL select,insert,update,references NULL def performance_schema events_waits_summary_by_user_by_event_name EVENT_NAME 2 NULL NO varchar 128 512 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(128) select,insert,update,references NULL def performance_schema events_waits_summary_by_user_by_event_name COUNT_STAR 3 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NULL def performance_schema events_waits_summary_by_user_by_event_name SUM_TIMER_WAIT 4 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NULL @@ -1006,7 +1006,7 @@ def performance_schema replication_applier_status_by_worker APPLYING_TRANSACTION def performance_schema replication_connection_configuration CHANNEL_NAME 1 NULL NO char 64 256 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci char(64) PRI select,insert,update,references NULL def performance_schema replication_connection_configuration HOST 2 NULL NO char 60 240 NULL NULL NULL utf8mb4 utf8mb4_bin char(60) select,insert,update,references NULL def performance_schema replication_connection_configuration PORT 3 NULL NO int NULL NULL 10 0 NULL NULL NULL int(11) select,insert,update,references NULL -def performance_schema replication_connection_configuration USER 4 NULL NO char 32 128 NULL NULL NULL utf8mb4 utf8mb4_bin char(32) select,insert,update,references NULL +def performance_schema replication_connection_configuration USER 4 NULL NO char 80 320 NULL NULL NULL utf8mb4 utf8mb4_bin char(80) select,insert,update,references NULL def performance_schema replication_connection_configuration NETWORK_INTERFACE 5 NULL NO char 60 240 NULL NULL NULL utf8mb4 utf8mb4_bin char(60) select,insert,update,references NULL def performance_schema replication_connection_configuration AUTO_POSITION 6 NULL NO enum 1 4 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci enum('1','0') select,insert,update,references NULL def performance_schema replication_connection_configuration SSL_ALLOWED 7 NULL NO enum 7 28 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci enum('YES','NO','IGNORED') select,insert,update,references NULL @@ -1085,7 +1085,7 @@ def performance_schema session_status VARIABLE_VALUE 2 NULL YES varchar 1024 409 def performance_schema session_variables VARIABLE_NAME 1 NULL NO varchar 64 256 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(64) PRI select,insert,update,references NULL def performance_schema session_variables VARIABLE_VALUE 2 NULL YES varchar 1024 4096 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(1024) select,insert,update,references NULL def performance_schema setup_actors HOST 1 % NO char 60 240 NULL NULL NULL utf8mb4 utf8mb4_bin char(60) PRI select,insert,update,references NULL -def performance_schema setup_actors USER 2 % NO char 32 128 NULL NULL NULL utf8mb4 utf8mb4_bin char(32) PRI select,insert,update,references NULL +def performance_schema setup_actors USER 2 % NO char 80 320 NULL NULL NULL utf8mb4 utf8mb4_bin char(80) PRI select,insert,update,references NULL def performance_schema setup_actors ROLE 3 % NO char 32 128 NULL NULL NULL utf8mb4 utf8mb4_bin char(32) PRI select,insert,update,references NULL def performance_schema setup_actors ENABLED 4 YES NO enum 3 12 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci enum('YES','NO') select,insert,update,references NULL def performance_schema setup_actors HISTORY 5 YES NO enum 3 12 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci enum('YES','NO') select,insert,update,references NULL @@ -1162,7 +1162,7 @@ def performance_schema socket_summary_by_instance SUM_TIMER_MISC 21 NULL NO bigi def performance_schema socket_summary_by_instance MIN_TIMER_MISC 22 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NULL def performance_schema socket_summary_by_instance AVG_TIMER_MISC 23 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NULL def performance_schema socket_summary_by_instance MAX_TIMER_MISC 24 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NULL -def performance_schema status_by_account USER 1 NULL YES char 32 128 NULL NULL NULL utf8mb4 utf8mb4_bin char(32) MUL select,insert,update,references NULL +def performance_schema status_by_account USER 1 NULL YES char 80 320 NULL NULL NULL utf8mb4 utf8mb4_bin char(80) MUL select,insert,update,references NULL def performance_schema status_by_account HOST 2 NULL YES char 60 240 NULL NULL NULL utf8mb4 utf8mb4_bin char(60) select,insert,update,references NULL def performance_schema status_by_account VARIABLE_NAME 3 NULL NO varchar 64 256 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(64) select,insert,update,references NULL def performance_schema status_by_account VARIABLE_VALUE 4 NULL YES varchar 1024 4096 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(1024) select,insert,update,references NULL @@ -1172,7 +1172,7 @@ def performance_schema status_by_host VARIABLE_VALUE 3 NULL YES varchar 1024 409 def performance_schema status_by_thread THREAD_ID 1 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned PRI select,insert,update,references NULL def performance_schema status_by_thread VARIABLE_NAME 2 NULL NO varchar 64 256 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(64) PRI select,insert,update,references NULL def performance_schema status_by_thread VARIABLE_VALUE 3 NULL YES varchar 1024 4096 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(1024) select,insert,update,references NULL -def performance_schema status_by_user USER 1 NULL YES char 32 128 NULL NULL NULL utf8mb4 utf8mb4_bin char(32) MUL select,insert,update,references NULL +def performance_schema status_by_user USER 1 NULL YES char 80 320 NULL NULL NULL utf8mb4 utf8mb4_bin char(80) MUL select,insert,update,references NULL def performance_schema status_by_user VARIABLE_NAME 2 NULL NO varchar 64 256 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(64) select,insert,update,references NULL def performance_schema status_by_user VARIABLE_VALUE 3 NULL YES varchar 1024 4096 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(1024) select,insert,update,references NULL def performance_schema table_handles OBJECT_TYPE 1 NULL NO varchar 64 256 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(64) MUL select,insert,update,references NULL @@ -1332,7 +1332,7 @@ def performance_schema threads THREAD_ID 1 NULL NO bigint NULL NULL 20 0 NULL NU def performance_schema threads NAME 2 NULL NO varchar 128 512 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(128) MUL select,insert,update,references NULL def performance_schema threads TYPE 3 NULL NO varchar 10 40 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(10) select,insert,update,references NULL def performance_schema threads PROCESSLIST_ID 4 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned MUL select,insert,update,references NULL -def performance_schema threads PROCESSLIST_USER 5 NULL YES varchar 32 128 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(32) MUL select,insert,update,references NULL +def performance_schema threads PROCESSLIST_USER 5 NULL YES varchar 80 320 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(80) MUL select,insert,update,references NULL def performance_schema threads PROCESSLIST_HOST 6 NULL YES varchar 60 240 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(60) MUL select,insert,update,references NULL def performance_schema threads PROCESSLIST_DB 7 NULL YES varchar 64 256 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(64) select,insert,update,references NULL def performance_schema threads PROCESSLIST_COMMAND 8 NULL YES varchar 16 64 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(16) select,insert,update,references NULL @@ -1346,7 +1346,7 @@ def performance_schema threads HISTORY 15 NULL NO enum 3 12 NULL NULL NULL utf8m def performance_schema threads CONNECTION_TYPE 16 NULL YES varchar 16 64 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(16) select,insert,update,references NULL def performance_schema threads THREAD_OS_ID 17 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned MUL select,insert,update,references NULL def performance_schema threads RESOURCE_GROUP 18 NULL YES varchar 64 256 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(64) MUL select,insert,update,references NULL -def performance_schema users USER 1 NULL YES char 32 128 NULL NULL NULL utf8mb4 utf8mb4_bin char(32) UNI select,insert,update,references NULL +def performance_schema users USER 1 NULL YES char 80 320 NULL NULL NULL utf8mb4 utf8mb4_bin char(80) UNI select,insert,update,references NULL def performance_schema users CURRENT_CONNECTIONS 2 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references NULL def performance_schema users TOTAL_CONNECTIONS 3 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references NULL def performance_schema user_defined_functions UDF_NAME 1 NULL NO varchar 64 256 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(64) PRI select,insert,update,references NULL @@ -1366,7 +1366,7 @@ def performance_schema variables_info VARIABLE_PATH 3 NULL YES varchar 1024 4096 def performance_schema variables_info MIN_VALUE 4 NULL YES varchar 64 256 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(64) select,insert,update,references NULL def performance_schema variables_info MAX_VALUE 5 NULL YES varchar 64 256 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(64) select,insert,update,references NULL def performance_schema variables_info SET_TIME 6 NULL YES timestamp NULL NULL NULL NULL 6 NULL NULL timestamp(6) select,insert,update,references NULL -def performance_schema variables_info SET_USER 7 NULL YES char 32 128 NULL NULL NULL utf8mb4 utf8mb4_bin char(32) select,insert,update,references NULL +def performance_schema variables_info SET_USER 7 NULL YES char 80 320 NULL NULL NULL utf8mb4 utf8mb4_bin char(80) select,insert,update,references NULL def performance_schema variables_info SET_HOST 8 NULL YES char 60 240 NULL NULL NULL utf8mb4 utf8mb4_bin char(60) select,insert,update,references NULL select count(*) from information_schema.columns where table_schema="performance_schema" and data_type = "bigint" diff --git a/mysql-test/suite/perfschema/t/dd_version_check.test b/mysql-test/suite/perfschema/t/dd_version_check.test index 5a309b459524..ceb11eaf2308 100644 --- a/mysql-test/suite/perfschema/t/dd_version_check.test +++ b/mysql-test/suite/perfschema/t/dd_version_check.test @@ -61,7 +61,7 @@ create table test.pfs_published_schema insert into test.pfs_published_schema values("MySQL 8.0.11", - "927fe3e6fdeccae11387ae67dd17ccfc2fa30bda939ebdc140f6a20123c2f649"); + "b5e4366c0e44c990d43f8885bdca23d1dd48393cbf468017df81d8654068ddc7"); create table test.pfs_check_table (id int(11) NOT NULL AUTO_INCREMENT, diff --git a/mysql-test/suite/rpl/r/rpl_slave_status.result b/mysql-test/suite/rpl/r/rpl_slave_status.result index b7ad18d59ef7..cc8f800d85cb 100644 --- a/mysql-test/suite/rpl/r/rpl_slave_status.result +++ b/mysql-test/suite/rpl/r/rpl_slave_status.result @@ -5,14 +5,14 @@ Note #### Storing MySQL user name or password information in the master info rep [connection master] ==== Create new replication user ==== [on master] -CREATE USER rpluser_with_length_32_123456789@127.0.0.1 IDENTIFIED BY 'rpl'; -CREATE USER rpluser_with_length_32_1234567890@127.0.0.1 IDENTIFIED BY 'rpl'; -ERROR HY000: String 'rpluser_with_length_32_1234567890' is too long for user name (should be no longer than 32) -GRANT REPLICATION SLAVE ON *.* TO rpluser_with_length_32_123456789@127.0.0.1; +CREATE USER rpluser_with_length_80_abcdefghij1234567890abcdefghij1234567890abcdefghij123456@127.0.0.1 IDENTIFIED BY 'rpl'; +CREATE USER rpluser_with_length_84_abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890@127.0.0.1 IDENTIFIED BY 'rpl'; +ERROR HY000: String 'rpluser_with_length_84_abcdefghij1234567890abcdefghij1234567890abcdefg' is too long for user name (should be no longer than 80) +GRANT REPLICATION SLAVE ON *.* TO rpluser_with_length_80_abcdefghij1234567890abcdefghij1234567890abcdefghij123456@127.0.0.1; [on slave] include/sync_slave_sql_with_master.inc include/stop_slave.inc -CHANGE MASTER TO master_user='rpluser_with_length_32_123456789', +CHANGE MASTER TO master_user='rpluser_with_length_80_abcdefghij1234567890abcdefghij1234567890abcdefghij123456', master_password='rpl', get_master_public_key = 1; Warnings: Note #### Sending passwords in plain text without SSL/TLS is extremely insecure. @@ -29,7 +29,7 @@ n 1 ==== Delete new replication user ==== [on master] -DROP USER rpluser_with_length_32_123456789@127.0.0.1; +DROP USER rpluser_with_length_80_abcdefghij1234567890abcdefghij1234567890abcdefghij123456@127.0.0.1; FLUSH PRIVILEGES; [on slave] include/sync_slave_sql_with_master.inc diff --git a/mysql-test/suite/rpl/r/rpl_user.result b/mysql-test/suite/rpl/r/rpl_user.result index ef3e345c1418..c249bda042d9 100644 --- a/mysql-test/suite/rpl/r/rpl_user.result +++ b/mysql-test/suite/rpl/r/rpl_user.result @@ -9,9 +9,9 @@ set session sql_log_bin=1; set session sql_log_bin=0; delete from mysql.user where Host='fakehost'; set session sql_log_bin=1; -create user 'foo'@'fakehost'; -create user 'foo'@'fakehost', 'bar'@'fakehost'; -ERROR HY000: Operation CREATE USER failed for 'foo'@'fakehost' +create user 'abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890'@'fakehost'; +create user 'abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890'@'fakehost', 'bar'@'fakehost'; +ERROR HY000: Operation CREATE USER failed for 'abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890'@'fakehost' create user 'bar'@'fakehost'; create user 'foo1'@'fakehost' IDENTIFIED WITH 'mysql_native_password' BY 'foo1', 'foo2'@'fakehost' IDENTIFIED WITH 'mysql_native_password' AS '*1111111111111111111111111111111111111111', @@ -19,13 +19,13 @@ create user 'foo1'@'fakehost' IDENTIFIED WITH 'mysql_native_password' BY 'foo1', include/sync_slave_sql_with_master.inc select Host,User from mysql.user where Host='fakehost'; Host User +fakehost abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890 fakehost bar -fakehost foo fakehost foo1 fakehost foo2 fakehost foo3 include/diff_tables.inc [master:mysql.user, slave:mysql.user] -rename user 'foo'@'fakehost' to 'foofoo'@'fakehost'; +rename user 'abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890'@'fakehost' to 'foofoo'@'fakehost'; rename user 'not_exist_user1'@'fakehost' to 'foobar'@'fakehost', 'bar'@'fakehost' to 'barbar'@'fakehost'; ERROR HY000: Operation RENAME USER failed for 'not_exist_user1'@'fakehost' rename user 'not_exist_user1'@'fakehost' to 'foobar'@'fakehost', 'not_exist_user2'@'fakehost' to 'barfoo'@'fakehost'; @@ -106,10 +106,10 @@ DROP USER 11544_u2@localhost; DROP USER 11544_u3@localhost; include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 # Query # # use `test`; CREATE USER 'foo'@'fakehost' IDENTIFIED WITH 'caching_sha2_password' +master-bin.000001 # Query # # use `test`; CREATE USER 'abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890'@'fakehost' IDENTIFIED WITH 'caching_sha2_password' master-bin.000001 # Query # # use `test`; CREATE USER 'bar'@'fakehost' IDENTIFIED WITH 'caching_sha2_password' master-bin.000001 # Query # # use `test`; CREATE USER 'foo1'@'fakehost' IDENTIFIED WITH 'mysql_native_password' AS '*6EAC5249D53050AE649BDB0CC4B85D1AE90CA16E','foo2'@'fakehost' IDENTIFIED WITH 'mysql_native_password' AS '*1111111111111111111111111111111111111111','foo3'@'fakehost' IDENTIFIED WITH 'caching_sha2_password' -master-bin.000001 # Query # # use `test`; rename user 'foo'@'fakehost' to 'foofoo'@'fakehost' +master-bin.000001 # Query # # use `test`; rename user 'abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890'@'fakehost' to 'foofoo'@'fakehost' master-bin.000001 # Query # # use `test`; drop user 'foofoo'@'fakehost' master-bin.000001 # Query # # use `test`; drop user 'bar'@'fakehost' master-bin.000001 # Query # # use `test`; drop user 'foo1'@'fakehost', 'foo2'@'fakehost', 'foo3'@'fakehost' diff --git a/mysql-test/suite/rpl/t/rpl_slave_status.test b/mysql-test/suite/rpl/t/rpl_slave_status.test index 84135ead1382..a8e3a117de3e 100644 --- a/mysql-test/suite/rpl/t/rpl_slave_status.test +++ b/mysql-test/suite/rpl/t/rpl_slave_status.test @@ -31,16 +31,16 @@ --echo ==== Create new replication user ==== --echo [on master] connection master; -CREATE USER rpluser_with_length_32_123456789@127.0.0.1 IDENTIFIED BY 'rpl'; +CREATE USER rpluser_with_length_80_abcdefghij1234567890abcdefghij1234567890abcdefghij123456@127.0.0.1 IDENTIFIED BY 'rpl'; --error ER_WRONG_STRING_LENGTH -CREATE USER rpluser_with_length_32_1234567890@127.0.0.1 IDENTIFIED BY 'rpl'; -GRANT REPLICATION SLAVE ON *.* TO rpluser_with_length_32_123456789@127.0.0.1; +CREATE USER rpluser_with_length_84_abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890@127.0.0.1 IDENTIFIED BY 'rpl'; +GRANT REPLICATION SLAVE ON *.* TO rpluser_with_length_80_abcdefghij1234567890abcdefghij1234567890abcdefghij123456@127.0.0.1; --echo [on slave] --source include/sync_slave_sql_with_master.inc source include/stop_slave.inc; --replace_column 2 #### -CHANGE MASTER TO master_user='rpluser_with_length_32_123456789', +CHANGE MASTER TO master_user='rpluser_with_length_80_abcdefghij1234567890abcdefghij1234567890abcdefghij123456', master_password='rpl', get_master_public_key = 1; source include/start_slave.inc; @@ -56,7 +56,7 @@ SELECT * FROM t1; --echo ==== Delete new replication user ==== --echo [on master] connection master; -DROP USER rpluser_with_length_32_123456789@127.0.0.1; +DROP USER rpluser_with_length_80_abcdefghij1234567890abcdefghij1234567890abcdefghij123456@127.0.0.1; FLUSH PRIVILEGES; --echo [on slave] diff --git a/mysql-test/suite/rpl/t/rpl_user.test b/mysql-test/suite/rpl/t/rpl_user.test index ebcfa0cbf556..d0660c739d4d 100644 --- a/mysql-test/suite/rpl/t/rpl_user.test +++ b/mysql-test/suite/rpl/t/rpl_user.test @@ -20,9 +20,9 @@ set session sql_log_bin=1; # Test create user # connection master; -create user 'foo'@'fakehost'; +create user 'abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890'@'fakehost'; --error ER_CANNOT_USER -create user 'foo'@'fakehost', 'bar'@'fakehost'; +create user 'abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890'@'fakehost', 'bar'@'fakehost'; create user 'bar'@'fakehost'; # In log event, Plaintext password 'foo1' is replaced by ciphertext. @@ -38,7 +38,7 @@ source include/diff_tables.inc; # Test rename user # connection master; -rename user 'foo'@'fakehost' to 'foofoo'@'fakehost'; +rename user 'abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890'@'fakehost' to 'foofoo'@'fakehost'; --error ER_CANNOT_USER rename user 'not_exist_user1'@'fakehost' to 'foobar'@'fakehost', 'bar'@'fakehost' to 'barbar'@'fakehost'; --error ER_CANNOT_USER diff --git a/mysql-test/suite/rpl_gtid/r/rpl_current_user.result b/mysql-test/suite/rpl_gtid/r/rpl_current_user.result index f85b0e4d6af3..7ba75610cc74 100644 --- a/mysql-test/suite/rpl_gtid/r/rpl_current_user.result +++ b/mysql-test/suite/rpl_gtid/r/rpl_current_user.result @@ -18,10 +18,10 @@ CREATE USER 'bug48321_1-01234'@'localhost'; GRANT ALL PRIVILEGES ON *.* TO 'bug48321_1-01234'@'localhost' WITH GRANT OPTION; # Make sure the max lengths of user and host -# the user name is too lengh -GRANT CREATE USER ON *.* TO '012345678901234567890123456789012'@'fakehost'; -ERROR HY000: String '012345678901234567890123456789012' is too long for user name (should be no longer than 32) -# the host name is too lengh +# the user name is too long +GRANT CREATE USER ON *.* TO 'abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890a'@'fakehost'; +ERROR HY000: String 'abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij' is too long for user name (should be no longer than 80) +# the host name is too long GRANT CREATE USER ON *.* TO 'fakename'@'0123456789012345678901234567890123456789012345678901234567890'; ERROR HY000: String '0123456789012345678901234567890123456789012345678901234567890' is too long for host name (should be no longer than 60) diff --git a/mysql-test/suite/rpl_gtid/t/rpl_current_user.test b/mysql-test/suite/rpl_gtid/t/rpl_current_user.test index 3299a9070794..b5d80eb21001 100644 --- a/mysql-test/suite/rpl_gtid/t/rpl_current_user.test +++ b/mysql-test/suite/rpl_gtid/t/rpl_current_user.test @@ -47,10 +47,10 @@ GRANT ALL PRIVILEGES ON *.* TO 'bug48321_1-01234'@'localhost' WITH GRANT OPTION; --echo --echo # Make sure the max lengths of user and host ---echo # the user name is too lengh +--echo # the user name is too long --error 1470 -GRANT CREATE USER ON *.* TO '012345678901234567890123456789012'@'fakehost'; ---echo # the host name is too lengh +GRANT CREATE USER ON *.* TO 'abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890a'@'fakehost'; +--echo # the host name is too long --error 1470 GRANT CREATE USER ON *.* TO 'fakename'@'0123456789012345678901234567890123456789012345678901234567890'; diff --git a/mysql-test/suite/sysschema/r/v_io_by_thread_by_latency.result b/mysql-test/suite/sysschema/r/v_io_by_thread_by_latency.result index e5ec4a1e84a1..4ef2c18f63e3 100644 --- a/mysql-test/suite/sysschema/r/v_io_by_thread_by_latency.result +++ b/mysql-test/suite/sysschema/r/v_io_by_thread_by_latency.result @@ -1,6 +1,6 @@ DESC sys.io_by_thread_by_latency; Field Type Null Key Default Extra -user varchar(128) YES NULL +user varchar(141) YES NULL total decimal(42,0) YES NULL total_latency text YES NULL min_latency text YES NULL @@ -11,7 +11,7 @@ processlist_id bigint(20) unsigned YES NULL SELECT * FROM sys.io_by_thread_by_latency; DESC sys.x$io_by_thread_by_latency; Field Type Null Key Default Extra -user varchar(128) YES NULL +user varchar(141) YES NULL total decimal(42,0) YES NULL total_latency decimal(42,0) YES NULL min_latency bigint(20) unsigned YES NULL diff --git a/mysql-test/suite/sysschema/r/v_latest_file_io.result b/mysql-test/suite/sysschema/r/v_latest_file_io.result index 2501c96df2d5..28a4c8367cb3 100644 --- a/mysql-test/suite/sysschema/r/v_latest_file_io.result +++ b/mysql-test/suite/sysschema/r/v_latest_file_io.result @@ -1,6 +1,6 @@ DESC sys.latest_file_io; Field Type Null Key Default Extra -thread varchar(149) YES NULL +thread varchar(167) YES NULL file varchar(512) YES NULL latency text YES NULL operation varchar(32) NO NULL @@ -8,7 +8,7 @@ requested text YES NULL SELECT * FROM sys.latest_file_io; DESC sys.x$latest_file_io; Field Type Null Key Default Extra -thread varchar(149) YES NULL +thread varchar(167) YES NULL file varchar(512) YES NULL latency bigint(20) unsigned YES NULL operation varchar(32) NO NULL diff --git a/mysql-test/suite/sysschema/r/v_memory_by_thread_by_current_bytes.result b/mysql-test/suite/sysschema/r/v_memory_by_thread_by_current_bytes.result index cda7b520ab53..a6fbaa159984 100644 --- a/mysql-test/suite/sysschema/r/v_memory_by_thread_by_current_bytes.result +++ b/mysql-test/suite/sysschema/r/v_memory_by_thread_by_current_bytes.result @@ -1,7 +1,7 @@ DESC sys.memory_by_thread_by_current_bytes; Field Type Null Key Default Extra thread_id bigint(20) unsigned NO NULL -user varchar(128) YES NULL +user varchar(141) YES NULL current_count_used decimal(41,0) YES NULL current_allocated text YES NULL current_avg_alloc text YES NULL @@ -11,7 +11,7 @@ SELECT * FROM sys.memory_by_thread_by_current_bytes; DESC sys.x$memory_by_thread_by_current_bytes; Field Type Null Key Default Extra thread_id bigint(20) unsigned NO NULL -user varchar(128) YES NULL +user varchar(141) YES NULL current_count_used decimal(41,0) YES NULL current_allocated decimal(41,0) YES NULL current_avg_alloc decimal(45,4) NO 0.0000 diff --git a/mysql-test/suite/sysschema/r/v_processlist.result b/mysql-test/suite/sysschema/r/v_processlist.result index 64458a759788..d4dc949e410f 100644 --- a/mysql-test/suite/sysschema/r/v_processlist.result +++ b/mysql-test/suite/sysschema/r/v_processlist.result @@ -2,7 +2,7 @@ DESC sys.processlist; Field Type Null Key Default Extra thd_id bigint(20) unsigned NO NULL conn_id bigint(20) unsigned YES NULL -user varchar(128) YES NULL +user varchar(141) YES NULL db varchar(64) YES NULL command varchar(16) YES NULL state varchar(64) YES NULL @@ -33,7 +33,7 @@ DESC sys.x$processlist; Field Type Null Key Default Extra thd_id bigint(20) unsigned NO NULL conn_id bigint(20) unsigned YES NULL -user varchar(128) YES NULL +user varchar(141) YES NULL db varchar(64) YES NULL command varchar(16) YES NULL state varchar(64) YES NULL diff --git a/mysql-test/suite/sysschema/r/v_session.result b/mysql-test/suite/sysschema/r/v_session.result index 4acf2e0c14b5..83af83de9dec 100644 --- a/mysql-test/suite/sysschema/r/v_session.result +++ b/mysql-test/suite/sysschema/r/v_session.result @@ -2,7 +2,7 @@ DESC sys.session; Field Type Null Key Default Extra thd_id bigint(20) unsigned NO NULL conn_id bigint(20) unsigned YES NULL -user varchar(128) YES NULL +user varchar(141) YES NULL db varchar(64) YES NULL command varchar(16) YES NULL state varchar(64) YES NULL @@ -33,7 +33,7 @@ DESC sys.x$session; Field Type Null Key Default Extra thd_id bigint(20) unsigned NO NULL conn_id bigint(20) unsigned YES NULL -user varchar(128) YES NULL +user varchar(141) YES NULL db varchar(64) YES NULL command varchar(16) YES NULL state varchar(64) YES NULL diff --git a/mysql-test/suite/sysschema/r/v_user_summary.result b/mysql-test/suite/sysschema/r/v_user_summary.result index 2d6d443c691c..68bf705f92ce 100644 --- a/mysql-test/suite/sysschema/r/v_user_summary.result +++ b/mysql-test/suite/sysschema/r/v_user_summary.result @@ -1,6 +1,6 @@ DESC sys.user_summary; Field Type Null Key Default Extra -user varchar(32) YES NULL +user varchar(80) YES NULL statements decimal(64,0) YES NULL statement_latency text YES NULL statement_avg_latency text YES NULL @@ -15,7 +15,7 @@ total_memory_allocated text YES NULL SELECT * FROM sys.user_summary; DESC sys.x$user_summary; Field Type Null Key Default Extra -user varchar(32) YES NULL +user varchar(80) YES NULL statements decimal(64,0) YES NULL statement_latency decimal(64,0) YES NULL statement_avg_latency decimal(65,4) NO 0.0000 diff --git a/mysql-test/suite/sysschema/r/v_user_summary_by_file_io.result b/mysql-test/suite/sysschema/r/v_user_summary_by_file_io.result index 82431b67561c..dfcdbd734216 100644 --- a/mysql-test/suite/sysschema/r/v_user_summary_by_file_io.result +++ b/mysql-test/suite/sysschema/r/v_user_summary_by_file_io.result @@ -1,12 +1,12 @@ DESC sys.user_summary_by_file_io; Field Type Null Key Default Extra -user varchar(32) YES NULL +user varchar(80) YES NULL ios decimal(42,0) YES NULL io_latency text YES NULL SELECT * FROM sys.user_summary_by_file_io; DESC sys.x$user_summary_by_file_io; Field Type Null Key Default Extra -user varchar(32) YES NULL +user varchar(80) YES NULL ios decimal(42,0) YES NULL io_latency decimal(42,0) YES NULL SELECT * FROM sys.x$user_summary_by_file_io; diff --git a/mysql-test/suite/sysschema/r/v_user_summary_by_file_io_type.result b/mysql-test/suite/sysschema/r/v_user_summary_by_file_io_type.result index 55ae85ebefbb..21fa546f3d50 100644 --- a/mysql-test/suite/sysschema/r/v_user_summary_by_file_io_type.result +++ b/mysql-test/suite/sysschema/r/v_user_summary_by_file_io_type.result @@ -1,6 +1,6 @@ DESC sys.user_summary_by_file_io_type; Field Type Null Key Default Extra -user varchar(32) YES NULL +user varchar(80) YES NULL event_name varchar(128) NO NULL total bigint(20) unsigned NO NULL latency text YES NULL @@ -8,7 +8,7 @@ max_latency text YES NULL SELECT * FROM sys.user_summary_by_file_io_type; DESC sys.x$user_summary_by_file_io_type; Field Type Null Key Default Extra -user varchar(32) YES NULL +user varchar(80) YES NULL event_name varchar(128) NO NULL total bigint(20) unsigned NO NULL latency bigint(20) unsigned NO NULL diff --git a/mysql-test/suite/sysschema/r/v_user_summary_by_stages.result b/mysql-test/suite/sysschema/r/v_user_summary_by_stages.result index e37a4c14d01f..a91b4a3aa7e4 100644 --- a/mysql-test/suite/sysschema/r/v_user_summary_by_stages.result +++ b/mysql-test/suite/sysschema/r/v_user_summary_by_stages.result @@ -1,6 +1,6 @@ DESC sys.user_summary_by_stages; Field Type Null Key Default Extra -user varchar(32) YES NULL +user varchar(80) YES NULL event_name varchar(128) NO NULL total bigint(20) unsigned NO NULL total_latency text YES NULL @@ -8,7 +8,7 @@ avg_latency text YES NULL SELECT * FROM sys.user_summary_by_stages; DESC sys.x$user_summary_by_stages; Field Type Null Key Default Extra -user varchar(32) YES NULL +user varchar(80) YES NULL event_name varchar(128) NO NULL total bigint(20) unsigned NO NULL total_latency bigint(20) unsigned NO NULL diff --git a/mysql-test/suite/sysschema/r/v_user_summary_by_statement_latency.result b/mysql-test/suite/sysschema/r/v_user_summary_by_statement_latency.result index 7554e37ac8a1..04cd1060e509 100644 --- a/mysql-test/suite/sysschema/r/v_user_summary_by_statement_latency.result +++ b/mysql-test/suite/sysschema/r/v_user_summary_by_statement_latency.result @@ -1,6 +1,6 @@ DESC sys.user_summary_by_statement_latency; Field Type Null Key Default Extra -user varchar(32) YES NULL +user varchar(80) YES NULL total decimal(42,0) YES NULL total_latency text YES NULL max_latency text YES NULL @@ -12,7 +12,7 @@ full_scans decimal(43,0) YES NULL SELECT * FROM sys.user_summary_by_statement_latency; DESC sys.x$user_summary_by_statement_latency; Field Type Null Key Default Extra -user varchar(32) YES NULL +user varchar(80) YES NULL total decimal(42,0) YES NULL total_latency decimal(42,0) YES NULL max_latency decimal(42,0) YES NULL diff --git a/mysql-test/suite/sysschema/r/v_user_summary_by_statement_type.result b/mysql-test/suite/sysschema/r/v_user_summary_by_statement_type.result index 4921903abeba..5a33d362002e 100644 --- a/mysql-test/suite/sysschema/r/v_user_summary_by_statement_type.result +++ b/mysql-test/suite/sysschema/r/v_user_summary_by_statement_type.result @@ -1,6 +1,6 @@ DESC sys.user_summary_by_statement_type; Field Type Null Key Default Extra -user varchar(32) YES NULL +user varchar(80) YES NULL statement varchar(128) YES NULL total bigint(20) unsigned NO NULL total_latency text YES NULL @@ -13,7 +13,7 @@ full_scans bigint(21) unsigned NO 0 SELECT * FROM sys.user_summary_by_statement_type; DESC sys.x$user_summary_by_statement_type; Field Type Null Key Default Extra -user varchar(32) YES NULL +user varchar(80) YES NULL statement varchar(128) YES NULL total bigint(20) unsigned NO NULL total_latency bigint(20) unsigned NO NULL diff --git a/mysql-test/suite/sysschema/r/v_waits_by_user_by_latency.result b/mysql-test/suite/sysschema/r/v_waits_by_user_by_latency.result index 56c156b52c32..6c0962506271 100644 --- a/mysql-test/suite/sysschema/r/v_waits_by_user_by_latency.result +++ b/mysql-test/suite/sysschema/r/v_waits_by_user_by_latency.result @@ -1,6 +1,6 @@ DESC sys.waits_by_user_by_latency; Field Type Null Key Default Extra -user varchar(32) YES NULL +user varchar(80) YES NULL event varchar(128) NO NULL total bigint(20) unsigned NO NULL total_latency text YES NULL @@ -9,7 +9,7 @@ max_latency text YES NULL SELECT * FROM sys.waits_by_user_by_latency; DESC sys.x$waits_by_user_by_latency; Field Type Null Key Default Extra -user varchar(32) YES NULL +user varchar(80) YES NULL event varchar(128) NO NULL total bigint(20) unsigned NO NULL total_latency bigint(20) unsigned NO NULL diff --git a/mysql-test/t/dd_schema_definition_after_upgrade_debug.test b/mysql-test/t/dd_schema_definition_after_upgrade_debug.test index a52723b3e0f4..69ce3dd02738 100644 --- a/mysql-test/t/dd_schema_definition_after_upgrade_debug.test +++ b/mysql-test/t/dd_schema_definition_after_upgrade_debug.test @@ -102,6 +102,10 @@ let $file = $actual_table_defs; --force-rmdir $MYSQL_TMP_DIR/data_57022 +# Disabling the below part until FB8-220: Handle upgrade from FB-8.0.11 to FB-8.0.13 +# is implemented +--disable_testcase BUG#00000 + --echo ######################################################################## --echo # Unzip a 8.0.11 datadir, start the server against it and prepare a --echo # file containing the DD table definitions after upgrade. @@ -226,6 +230,7 @@ let $file = $actual_table_defs; --remove_file $actual_table_defs --force-rmdir $MYSQL_TMP_DIR/data_80012 +--enable_testcase --echo ######################################################################## --echo # Cleanup: Remove definition files and restart with default options. diff --git a/mysql-test/t/dd_upgrade_partition.test b/mysql-test/t/dd_upgrade_partition.test index 5e826d092abd..2f638977edda 100644 --- a/mysql-test/t/dd_upgrade_partition.test +++ b/mysql-test/t/dd_upgrade_partition.test @@ -46,6 +46,7 @@ call mtr.add_suppression("Error in checking mysql.slave_master_info repository i call mtr.add_suppression("Error creating master info: Error checking repositories."); call mtr.add_suppression("Slave: Failed to initialize the master info structure for channel"); call mtr.add_suppression("Failed to create or recover replication info repositories."); +call mtr.add_suppression("Cannot load from mysql.* The table is probably corrupted!"); --enable_query_log ######################### diff --git a/mysql-test/t/dictionary_tablespace.test b/mysql-test/t/dictionary_tablespace.test index 771207bdf88f..07caf8429aa9 100644 --- a/mysql-test/t/dictionary_tablespace.test +++ b/mysql-test/t/dictionary_tablespace.test @@ -52,6 +52,7 @@ call mtr.add_suppression("table is missing or has an incorrect definition"); call mtr.add_suppression("ACL DDLs will not work unless mysql_upgrade is executed"); call mtr.add_suppression(".* Native table .* has the wrong structure"); call mtr.add_suppression("Column count of mysql.* is wrong"); +call mtr.add_suppression("Cannot load from mysql.* The table is probably corrupted!"); call mtr.add_suppression("The privilege system failed to initialize correctly.*"); call mtr.add_suppression(".*Missing system table mysql.global_grants.*"); call mtr.add_suppression("ACL table mysql.[a-z_]* missing. Some operations may fail."); diff --git a/mysql-test/t/grant.test b/mysql-test/t/grant.test index e645d6436882..b05151666adb 100644 --- a/mysql-test/t/grant.test +++ b/mysql-test/t/grant.test @@ -831,7 +831,7 @@ disconnect master; # Bug#10668 CREATE USER does not enforce username length limit # --error ER_WRONG_STRING_LENGTH -create user mysqltest1_thisisreallyreallyreallyreallyreallyireallyreallytoolong; +create user abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890a; # # Test for Bug#16899 Possible buffer overflow in handling of DEFINER-clause. @@ -921,13 +921,13 @@ USE test; # Working with database-level privileges. --error ER_WRONG_STRING_LENGTH -GRANT CREATE ON mysqltest.* TO 1234567890abcdefGHIKL1234567890abcdefGHIKL@localhost; +GRANT CREATE ON mysqltest.* TO abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890a@localhost; --error ER_WRONG_STRING_LENGTH GRANT CREATE ON mysqltest.* TO some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY; --error ER_WRONG_STRING_LENGTH -REVOKE CREATE ON mysqltest.* FROM 1234567890abcdefGHIKL1234567890abcdefGHIKL@localhost; +REVOKE CREATE ON mysqltest.* FROM abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890a@localhost; --error ER_WRONG_STRING_LENGTH REVOKE CREATE ON mysqltest.* FROM some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY; @@ -935,13 +935,13 @@ REVOKE CREATE ON mysqltest.* FROM some_user_name@1234567890abcdefghij1234567890a # Working with table-level privileges. --error ER_WRONG_STRING_LENGTH -GRANT CREATE ON t1 TO 1234567890abcdefGHIKL1234567890abcdefGHIKL@localhost; +GRANT CREATE ON t1 TO abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890a@localhost; --error ER_WRONG_STRING_LENGTH GRANT CREATE ON t1 TO some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY; --error ER_WRONG_STRING_LENGTH -REVOKE CREATE ON t1 FROM 1234567890abcdefGHIKL1234567890abcdefGHIKL@localhost; +REVOKE CREATE ON t1 FROM abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890a@localhost; --error ER_WRONG_STRING_LENGTH REVOKE CREATE ON t1 FROM some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY; @@ -949,13 +949,13 @@ REVOKE CREATE ON t1 FROM some_user_name@1234567890abcdefghij1234567890abcdefghij # Working with routine-level privileges. --error ER_WRONG_STRING_LENGTH -GRANT EXECUTE ON PROCEDURE p1 TO 1234567890abcdefGHIKL1234567890abcdefGHIKL@localhost; +GRANT EXECUTE ON PROCEDURE p1 TO abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890a@localhost; --error ER_WRONG_STRING_LENGTH GRANT EXECUTE ON PROCEDURE p1 TO some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY; --error ER_WRONG_STRING_LENGTH -REVOKE EXECUTE ON PROCEDURE p1 FROM 1234567890abcdefGHIKL1234567890abcdefGHIKL@localhost; +REVOKE EXECUTE ON PROCEDURE p1 FROM abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890a@localhost; --error ER_WRONG_STRING_LENGTH REVOKE EXECUTE ON PROCEDURE t1 FROM some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY; @@ -1603,7 +1603,7 @@ grant select on test.* to юзер_юзер@localhost; revoke all on test.* from юзер_юзер@localhost; drop user юзер_юзер@localhost; --error ER_WRONG_STRING_LENGTH -grant select on test.* to очень_длинный_юзер_very_long_user@localhost; +grant select on test.* to очень_длинный_юзерочень_длинный_юзер_очень_длинный_юзерочень_длинный_юзер_юзерррр@localhost; set names default; # @@ -2454,10 +2454,10 @@ CREATE USER user_name_len_22_01234@localhost; CREATE USER user_name_len_32_012345678901234@localhost; --error ER_WRONG_STRING_LENGTH -CREATE USER user_name_len_33_0123456789012345@localhost; +CREATE USER user_with_length_81_abcdefghij1234567890abcdefghij1234567890abcdefghij12345678901@localhost; --error ER_WRONG_STRING_LENGTH -CREATE USER user_name_len_40_01234567890123456789012@localhost; +CREATE USER user_with_length_84_abcdefghij1234567890abcdefghij1234567890abcdefghij12345678901234@localhost; # Working with database-level privileges. @@ -2466,20 +2466,20 @@ GRANT CREATE ON mysqltest.* TO user_name_len_22_01234@localhost; GRANT CREATE ON mysqltest.* TO user_name_len_32_012345678901234@localhost; --error ER_WRONG_STRING_LENGTH -GRANT CREATE ON mysqltest.* TO user_name_len_33_0123456789012345@localhost; +GRANT CREATE ON mysqltest.* TO user_with_length_81_abcdefghij1234567890abcdefghij1234567890abcdefghij12345678901@localhost; --error ER_WRONG_STRING_LENGTH -GRANT CREATE ON mysqltest.* TO user_name_len_40_01234567890123456789012@localhost; +GRANT CREATE ON mysqltest.* TO user_with_length_84_abcdefghij1234567890abcdefghij1234567890abcdefghij12345678901234@localhost; REVOKE CREATE ON mysqltest.* FROM user_name_len_16@localhost; REVOKE CREATE ON mysqltest.* FROM user_name_len_22_01234@localhost; REVOKE CREATE ON mysqltest.* FROM user_name_len_32_012345678901234@localhost; --error ER_WRONG_STRING_LENGTH -REVOKE CREATE ON mysqltest.* FROM user_name_len_33_0123456789012345@localhost; +REVOKE CREATE ON mysqltest.* FROM user_with_length_81_abcdefghij1234567890abcdefghij1234567890abcdefghij12345678901@localhost; --error ER_WRONG_STRING_LENGTH -REVOKE CREATE ON mysqltest.* FROM user_name_len_40_01234567890123456789012@localhost; +REVOKE CREATE ON mysqltest.* FROM user_with_length_84_abcdefghij1234567890abcdefghij1234567890abcdefghij12345678901234@localhost; # Working with table-level privileges. @@ -2488,40 +2488,40 @@ GRANT CREATE ON t1 TO user_name_len_22_01234@localhost; GRANT CREATE ON t1 TO user_name_len_32_012345678901234@localhost; --error ER_WRONG_STRING_LENGTH -GRANT CREATE ON t1 TO user_name_len_33_0123456789012345@localhost; +GRANT CREATE ON t1 TO user_with_length_81_abcdefghij1234567890abcdefghij1234567890abcdefghij12345678901@localhost; --error ER_WRONG_STRING_LENGTH -GRANT CREATE ON t1 TO user_name_len_40_01234567890123456789012@localhost; +GRANT CREATE ON t1 TO user_with_length_84_abcdefghij1234567890abcdefghij1234567890abcdefghij12345678901234@localhost; REVOKE CREATE ON t1 FROM user_name_len_16@localhost; REVOKE CREATE ON t1 FROM user_name_len_22_01234@localhost; REVOKE CREATE ON t1 FROM user_name_len_32_012345678901234@localhost; --error ER_WRONG_STRING_LENGTH -REVOKE CREATE ON t1 FROM user_name_len_33_0123456789012345@localhost; +REVOKE CREATE ON t1 FROM user_with_length_81_abcdefghij1234567890abcdefghij1234567890abcdefghij12345678901@localhost; --error ER_WRONG_STRING_LENGTH -REVOKE CREATE ON t1 FROM user_name_len_40_01234567890123456789012@localhost; +REVOKE CREATE ON t1 FROM user_with_length_84_abcdefghij1234567890abcdefghij1234567890abcdefghij12345678901234@localhost; GRANT SELECT ON t1 TO user_name_len_16@localhost; GRANT SELECT ON t1 TO user_name_len_22_01234@localhost; GRANT SELECT ON t1 TO user_name_len_32_012345678901234@localhost; --error ER_WRONG_STRING_LENGTH -GRANT SELECT ON t1 TO user_name_len_33_0123456789012345@localhost; +GRANT SELECT ON t1 TO user_with_length_81_abcdefghij1234567890abcdefghij1234567890abcdefghij12345678901@localhost; --error ER_WRONG_STRING_LENGTH -GRANT SELECT ON t1 TO user_name_len_40_01234567890123456789012@localhost; +GRANT SELECT ON t1 TO user_with_length_84_abcdefghij1234567890abcdefghij1234567890abcdefghij12345678901234@localhost; REVOKE SELECT ON t1 FROM user_name_len_16@localhost; REVOKE SELECT ON t1 FROM user_name_len_22_01234@localhost; REVOKE SELECT ON t1 FROM user_name_len_32_012345678901234@localhost; --error ER_WRONG_STRING_LENGTH -REVOKE SELECT ON t1 FROM user_name_len_33_0123456789012345@localhost; +REVOKE SELECT ON t1 FROM user_with_length_81_abcdefghij1234567890abcdefghij1234567890abcdefghij12345678901@localhost; --error ER_WRONG_STRING_LENGTH -REVOKE SELECT ON t1 FROM user_name_len_40_01234567890123456789012@localhost; +REVOKE SELECT ON t1 FROM user_with_length_84_abcdefghij1234567890abcdefghij1234567890abcdefghij12345678901234@localhost; # Working with routine-level privileges. @@ -2530,23 +2530,23 @@ GRANT EXECUTE ON PROCEDURE p1 TO user_name_len_22_01234@localhost; GRANT EXECUTE ON PROCEDURE p1 TO user_name_len_32_012345678901234@localhost; --error ER_WRONG_STRING_LENGTH -GRANT EXECUTE ON PROCEDURE p1 TO user_name_len_33_0123456789012345@localhost; +GRANT EXECUTE ON PROCEDURE p1 TO user_with_length_81_abcdefghij1234567890abcdefghij1234567890abcdefghij12345678901@localhost; --error ER_WRONG_STRING_LENGTH -GRANT EXECUTE ON PROCEDURE p1 TO user_name_len_40_01234567890123456789012@localhost; +GRANT EXECUTE ON PROCEDURE p1 TO user_with_length_84_abcdefghij1234567890abcdefghij1234567890abcdefghij12345678901234@localhost; REVOKE EXECUTE ON PROCEDURE p1 FROM user_name_len_16@localhost; REVOKE EXECUTE ON PROCEDURE p1 FROM user_name_len_22_01234@localhost; REVOKE EXECUTE ON PROCEDURE p1 FROM user_name_len_32_012345678901234@localhost; --error ER_WRONG_STRING_LENGTH -REVOKE EXECUTE ON PROCEDURE p1 FROM user_name_len_33_0123456789012345@localhost; +REVOKE EXECUTE ON PROCEDURE p1 FROM user_with_length_81_abcdefghij1234567890abcdefghij1234567890abcdefghij12345678901@localhost; --error ER_WRONG_STRING_LENGTH -REVOKE EXECUTE ON PROCEDURE p1 FROM user_name_len_40_01234567890123456789012@localhost; +REVOKE EXECUTE ON PROCEDURE p1 FROM user_with_length_84_abcdefghij1234567890abcdefghij1234567890abcdefghij12345678901234@localhost; --error ER_WRONG_STRING_LENGTH -DROP USER user_name_len_40_01234567890123456789012@localhost; +DROP USER user_with_length_84_abcdefghij1234567890abcdefghij1234567890abcdefghij12345678901234@localhost; --character_set utf8 set names utf8; @@ -2559,64 +2559,63 @@ CREATE USER очень_очень_длинный_юзер@localhost; CREATE USER очень_очень_очень_длинный_юзер__@localhost; # 36 characters user name --error ER_WRONG_STRING_LENGTH -CREATE USER очень_очень_очень_очень_длинный_юзер@localhost; +CREATE USER очень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзер@localhost; GRANT CREATE ON mysqltest.* TO очень_длинный_юз@localhost; GRANT CREATE ON mysqltest.* TO очень_очень_длинный_юзер@localhost; GRANT CREATE ON mysqltest.* TO очень_очень_очень_длинный_юзер__@localhost; --error ER_WRONG_STRING_LENGTH -GRANT CREATE ON mysqltest.* TO очень_очень_очень_очень_длинный_юзер@localhost; +GRANT CREATE ON mysqltest.* TO очень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзер@localhost; REVOKE CREATE ON mysqltest.* FROM очень_длинный_юз@localhost; REVOKE CREATE ON mysqltest.* FROM очень_очень_длинный_юзер@localhost; REVOKE CREATE ON mysqltest.* FROM очень_очень_очень_длинный_юзер__@localhost; --error ER_WRONG_STRING_LENGTH -REVOKE CREATE ON mysqltest.* FROM очень_очень_очень_очень_длинный_юзер@localhost; +REVOKE CREATE ON mysqltest.* FROM очень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзер@localhost; GRANT CREATE ON t1 TO очень_длинный_юз@localhost; GRANT CREATE ON t1 TO очень_очень_длинный_юзер@localhost; GRANT CREATE ON t1 TO очень_очень_очень_длинный_юзер__@localhost; --error ER_WRONG_STRING_LENGTH -GRANT CREATE ON t1 TO очень_очень_очень_очень_длинный_юзер@localhost; +GRANT CREATE ON t1 TO очень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзер@localhost; REVOKE CREATE ON t1 FROM очень_длинный_юз@localhost; REVOKE CREATE ON t1 FROM очень_очень_длинный_юзер@localhost; REVOKE CREATE ON t1 FROM очень_очень_очень_длинный_юзер__@localhost; --error ER_WRONG_STRING_LENGTH -REVOKE CREATE ON t1 FROM очень_очень_очень_очень_длинный_юзер@localhost; +REVOKE CREATE ON t1 FROM очень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзер@localhost; GRANT SELECT ON t1 TO очень_длинный_юз@localhost; GRANT SELECT ON t1 TO очень_очень_длинный_юзер@localhost; GRANT SELECT ON t1 TO очень_очень_очень_длинный_юзер__@localhost; --error ER_WRONG_STRING_LENGTH -GRANT SELECT ON t1 TO очень_очень_очень_очень_длинный_юзер@localhost; +GRANT SELECT ON t1 TO очень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзер@localhost; REVOKE SELECT ON t1 FROM очень_длинный_юз@localhost; REVOKE SELECT ON t1 FROM очень_очень_длинный_юзер@localhost; REVOKE SELECT ON t1 FROM очень_очень_очень_длинный_юзер__@localhost; --error ER_WRONG_STRING_LENGTH -REVOKE SELECT ON t1 FROM очень_очень_очень_очень_длинный_юзер@localhost; +REVOKE SELECT ON t1 FROM очень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзер@localhost; GRANT EXECUTE ON PROCEDURE p1 TO очень_длинный_юз@localhost; GRANT EXECUTE ON PROCEDURE p1 TO очень_очень_длинный_юзер@localhost; GRANT EXECUTE ON PROCEDURE p1 TO очень_очень_очень_длинный_юзер__@localhost; --error ER_WRONG_STRING_LENGTH -GRANT EXECUTE ON PROCEDURE p1 TO очень_очень_очень_очень_длинный_юзер@localhost; +GRANT EXECUTE ON PROCEDURE p1 TO очень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзер@localhost; REVOKE EXECUTE ON PROCEDURE p1 FROM очень_длинный_юз@localhost; REVOKE EXECUTE ON PROCEDURE p1 FROM очень_очень_длинный_юзер@localhost; REVOKE EXECUTE ON PROCEDURE p1 FROM очень_очень_очень_длинный_юзер__@localhost; --error ER_WRONG_STRING_LENGTH -REVOKE EXECUTE ON PROCEDURE p1 FROM очень_очень_очень_очень_длинный_юзер@localhost; - +REVOKE EXECUTE ON PROCEDURE p1 FROM очень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзер@localhost; --echo # Create a user, assign privileges, try to connect and use the granted --echo # privileges. Trying out different connections (socket/TCP/SSL). @@ -2700,7 +2699,7 @@ DROP USER очень_длинный_юз@localhost; DROP USER очень_очень_длинный_юзер@localhost; DROP USER очень_очень_очень_длинный_юзер__@localhost; --error ER_WRONG_STRING_LENGTH -DROP USER очень_очень_очень_очень_длинный_юзер@localhost; +DROP USER очень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзерочень_очень_очень_очень_длинный_юзер@localhost; set names default; diff --git a/mysql-test/t/grant_dynamic.test b/mysql-test/t/grant_dynamic.test index b4bb17ed2763..571358bdc23a 100644 --- a/mysql-test/t/grant_dynamic.test +++ b/mysql-test/t/grant_dynamic.test @@ -474,7 +474,7 @@ DROP DATABASE db1_protected; --echo # Restore missing system table and restart the server. CREATE TABLE IF NOT EXISTS mysql.global_grants ( - USER CHAR(32) BINARY DEFAULT '' NOT NULL, + USER CHAR(80) BINARY DEFAULT '' NOT NULL, HOST CHAR(60) BINARY DEFAULT '' NOT NULL, PRIV CHAR(32) COLLATE UTF8_GENERAL_CI DEFAULT '' NOT NULL, WITH_GRANT_OPTION ENUM('N','Y') COLLATE UTF8_GENERAL_CI DEFAULT 'N' NOT NULL, diff --git a/mysql-test/t/roles.test b/mysql-test/t/roles.test index 68db658530d7..88d07c41c254 100644 --- a/mysql-test/t/roles.test +++ b/mysql-test/t/roles.test @@ -720,7 +720,7 @@ REVOKE u1234567890123456789012345678901 FROM u1@localhost; DROP ROLE u1234567890123456789012345678901; DROP USER u1@localhost; --error ER_WRONG_STRING_LENGTH -CREATE ROLE `u12345678901234567890123456789012`; +CREATE ROLE `user_with_length_81_abcdefghij1234567890abcdefghij1234567890abcdefghij12345678901`; CREATE ROLE `PUBLIC`,`EVENT_SCHEDULER`,`127.0.0.1`,`a b`; DROP ROLE `PUBLIC`,`EVENT_SCHEDULER`,`127.0.0.1`,`a b`; CREATE ROLE PUBLIC; diff --git a/mysql-test/t/sp.test b/mysql-test/t/sp.test index 751f6783233a..6312a5df58f6 100644 --- a/mysql-test/t/sp.test +++ b/mysql-test/t/sp.test @@ -9721,7 +9721,7 @@ connection con_user_16; CALL test1.p1_len22(); --error ER_WRONG_STRING_LENGTH -CREATE DEFINER=user_name_len_33_0123456789012345@localhost PROCEDURE test1.p1_len33() +CREATE DEFINER=abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890a@localhost PROCEDURE test1.p1_len33() SELECT * FROM test1.t1; connection default; @@ -9770,7 +9770,7 @@ CALL test1.p1_len22(); connection default; --error ER_WRONG_STRING_LENGTH -CREATE DEFINER=user_name_len_33_0123456789012345@localhost FUNCTION test1.f1_len33() RETURNS INT +CREATE DEFINER=abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890a@localhost FUNCTION test1.f1_len33() RETURNS INT RETURN (SELECT COUNT(*) FROM test1.t1); # Cleanup diff --git a/mysql-test/t/trigger.test b/mysql-test/t/trigger.test index f3d30e33647e..a828b8fbe6e0 100644 --- a/mysql-test/t/trigger.test +++ b/mysql-test/t/trigger.test @@ -1344,7 +1344,7 @@ CREATE TABLE t1(c INT); CREATE TABLE t2(c INT); --error ER_WRONG_STRING_LENGTH -CREATE DEFINER=1234567890abcdefGHIKL1234567890abcdefGHIKL@localhost +CREATE DEFINER=abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890a@localhost TRIGGER t1_bi BEFORE INSERT ON t1 FOR EACH ROW SET @a = 1; --error ER_WRONG_STRING_LENGTH @@ -3924,7 +3924,7 @@ SELECT @a; connection default; --error ER_WRONG_STRING_LENGTH -CREATE DEFINER=user_name_len_33_0123456789012345@localhost +CREATE DEFINER=abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890a@localhost TRIGGER test1.t1_bi BEFORE INSERT ON test1.t1 FOR EACH ROW SET @a = (SELECT COUNT(*) FROM test1.t1); #Cleanup diff --git a/mysql-test/t/view.test b/mysql-test/t/view.test index 1f1cfaa06d2a..0de3ee71a8fd 100644 --- a/mysql-test/t/view.test +++ b/mysql-test/t/view.test @@ -2984,7 +2984,7 @@ DROP VIEW IF EXISTS v2; CREATE TABLE t1(a INT, b INT); --error ER_WRONG_STRING_LENGTH -CREATE DEFINER=1234567890abcdefGHIKL1234567890abcdefGHIKL@localhost +CREATE DEFINER=abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890a@localhost VIEW v1 AS SELECT a FROM t1; --error ER_WRONG_STRING_LENGTH diff --git a/mysql-test/t/view_grant.test b/mysql-test/t/view_grant.test index 58547151c24b..6b3b2b6cbe92 100644 --- a/mysql-test/t/view_grant.test +++ b/mysql-test/t/view_grant.test @@ -3018,7 +3018,7 @@ SELECT * FROM test1.v1; connection default; --error ER_WRONG_STRING_LENGTH -CREATE DEFINER=user_name_len_33_0123456789012345@localhost +CREATE DEFINER=user_with_length_81_abcdefghij1234567890abcdefghij1234567890abcdefghij12345678901@localhost VIEW test1.v2 AS SELECT int_field FROM test1.t1; #Cleanup diff --git a/scripts/mysql_system_tables.sql b/scripts/mysql_system_tables.sql index 8a2c6cd9bf62..797300e3e62e 100644 --- a/scripts/mysql_system_tables.sql +++ b/scripts/mysql_system_tables.sql @@ -38,7 +38,7 @@ CREATE TABLE IF NOT EXISTS db ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, -User char(32) binary DEFAULT '' NOT NULL, +User char(80) binary DEFAULT '' NOT NULL, Select_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Insert_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Update_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, @@ -68,7 +68,7 @@ set @had_db_table= @@warning_count != 0; CREATE TABLE IF NOT EXISTS user ( Host char(60) binary DEFAULT '' NOT NULL, -User char(32) binary DEFAULT '' NOT NULL, +User char(80) binary DEFAULT '' NOT NULL, Select_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Insert_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Update_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, @@ -123,25 +123,25 @@ PRIMARY KEY Host (Host,User) CREATE TABLE IF NOT EXISTS default_roles ( HOST CHAR(60) BINARY DEFAULT '' NOT NULL, -USER CHAR(32) BINARY DEFAULT '' NOT NULL, +USER CHAR(80) BINARY DEFAULT '' NOT NULL, DEFAULT_ROLE_HOST CHAR(60) BINARY DEFAULT '%' NOT NULL, -DEFAULT_ROLE_USER CHAR(32) BINARY DEFAULT '' NOT NULL, +DEFAULT_ROLE_USER CHAR(80) BINARY DEFAULT '' NOT NULL, PRIMARY KEY (HOST, USER, DEFAULT_ROLE_HOST, DEFAULT_ROLE_USER) ) engine=InnoDB STATS_PERSISTENT=0 CHARACTER SET utf8 COLLATE utf8_bin comment='Default roles' TABLESPACE=mysql; CREATE TABLE IF NOT EXISTS role_edges ( FROM_HOST CHAR(60) BINARY DEFAULT '' NOT NULL, -FROM_USER CHAR(32) BINARY DEFAULT '' NOT NULL, +FROM_USER CHAR(80) BINARY DEFAULT '' NOT NULL, TO_HOST CHAR(60) BINARY DEFAULT '' NOT NULL, -TO_USER CHAR(32) BINARY DEFAULT '' NOT NULL, +TO_USER CHAR(80) BINARY DEFAULT '' NOT NULL, WITH_ADMIN_OPTION ENUM('N', 'Y') COLLATE UTF8_GENERAL_CI DEFAULT 'N' NOT NULL, PRIMARY KEY (FROM_HOST,FROM_USER,TO_HOST,TO_USER) ) engine=InnoDB STATS_PERSISTENT=0 CHARACTER SET utf8 COLLATE utf8_bin comment='Role hierarchy and role grants' TABLESPACE=mysql; CREATE TABLE IF NOT EXISTS global_grants ( -USER CHAR(32) BINARY DEFAULT '' NOT NULL, +USER CHAR(80) BINARY DEFAULT '' NOT NULL, HOST CHAR(60) BINARY DEFAULT '' NOT NULL, PRIV CHAR(32) COLLATE UTF8_GENERAL_CI DEFAULT '' NOT NULL, WITH_GRANT_OPTION ENUM('N','Y') COLLATE UTF8_GENERAL_CI DEFAULT 'N' NOT NULL, @@ -154,7 +154,7 @@ set @had_user_table= @@warning_count != 0; CREATE TABLE IF NOT EXISTS password_history ( Host CHAR(60) BINARY DEFAULT '' NOT NULL, - User CHAR(32) BINARY DEFAULT '' NOT NULL, + User CHAR(80) BINARY DEFAULT '' NOT NULL, Password_timestamp TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), Password TEXT, PRIMARY KEY(Host, User, Password_timestamp DESC) @@ -171,9 +171,9 @@ CREATE TABLE IF NOT EXISTS plugin ( name varchar(64) DEFAULT '' NOT NULL, dl var CREATE TABLE IF NOT EXISTS servers ( Server_name char(64) NOT NULL DEFAULT '', Host char(64) NOT NULL DEFAULT '', Db char(64) NOT NULL DEFAULT '', Username char(64) NOT NULL DEFAULT '', Password char(64) NOT NULL DEFAULT '', Port INT(4) NOT NULL DEFAULT '0', Socket char(64) NOT NULL DEFAULT '', Wrapper char(64) NOT NULL DEFAULT '', Owner char(64) NOT NULL DEFAULT '', PRIMARY KEY (Server_name)) engine=InnoDB STATS_PERSISTENT=0 CHARACTER SET utf8 comment='MySQL Foreign Servers table' TABLESPACE=mysql; -CREATE TABLE IF NOT EXISTS tables_priv ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(32) binary DEFAULT '' NOT NULL, Table_name char(64) binary DEFAULT '' NOT NULL, Grantor char(93) DEFAULT '' NOT NULL, Timestamp timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, Table_priv set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger') COLLATE utf8_general_ci DEFAULT '' NOT NULL, Column_priv set('Select','Insert','Update','References') COLLATE utf8_general_ci DEFAULT '' NOT NULL, PRIMARY KEY (Host,Db,User,Table_name), KEY Grantor (Grantor) ) engine=INNODB STATS_PERSISTENT=0 CHARACTER SET utf8 engine=InnoDB STATS_PERSISTENT=0 CHARACTER SET utf8 COLLATE utf8_bin comment='Table privileges' TABLESPACE=mysql; +CREATE TABLE IF NOT EXISTS tables_priv ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(80) binary DEFAULT '' NOT NULL, Table_name char(64) binary DEFAULT '' NOT NULL, Grantor char(93) DEFAULT '' NOT NULL, Timestamp timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, Table_priv set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger') COLLATE utf8_general_ci DEFAULT '' NOT NULL, Column_priv set('Select','Insert','Update','References') COLLATE utf8_general_ci DEFAULT '' NOT NULL, PRIMARY KEY (Host,Db,User,Table_name), KEY Grantor (Grantor) ) engine=INNODB STATS_PERSISTENT=0 CHARACTER SET utf8 engine=InnoDB STATS_PERSISTENT=0 CHARACTER SET utf8 COLLATE utf8_bin comment='Table privileges' TABLESPACE=mysql; -CREATE TABLE IF NOT EXISTS columns_priv ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(32) binary DEFAULT '' NOT NULL, Table_name char(64) binary DEFAULT '' NOT NULL, Column_name char(64) binary DEFAULT '' NOT NULL, Timestamp timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, Column_priv set('Select','Insert','Update','References') COLLATE utf8_general_ci DEFAULT '' NOT NULL, PRIMARY KEY (Host,Db,User,Table_name,Column_name) ) engine=InnoDB STATS_PERSISTENT=0 CHARACTER SET utf8 COLLATE utf8_bin comment='Column privileges' TABLESPACE=mysql; +CREATE TABLE IF NOT EXISTS columns_priv ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(80) binary DEFAULT '' NOT NULL, Table_name char(64) binary DEFAULT '' NOT NULL, Column_name char(64) binary DEFAULT '' NOT NULL, Timestamp timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, Column_priv set('Select','Insert','Update','References') COLLATE utf8_general_ci DEFAULT '' NOT NULL, PRIMARY KEY (Host,Db,User,Table_name,Column_name) ) engine=InnoDB STATS_PERSISTENT=0 CHARACTER SET utf8 COLLATE utf8_bin comment='Column privileges' TABLESPACE=mysql; CREATE TABLE IF NOT EXISTS help_topic ( help_topic_id int unsigned not null, name char(64) not null, help_category_id smallint unsigned not null, description text not null, example text not null, url text not null, primary key (help_topic_id), unique index (name) ) engine=INNODB STATS_PERSISTENT=0 CHARACTER SET utf8 comment='help topics' TABLESPACE=mysql; @@ -203,7 +203,7 @@ CREATE TABLE IF NOT EXISTS time_zone_transition_type ( Time_zone_id int unsign CREATE TABLE IF NOT EXISTS time_zone_leap_second ( Transition_time bigint signed NOT NULL, Correction int signed NOT NULL, PRIMARY KEY TranTime (Transition_time) ) engine=INNODB STATS_PERSISTENT=0 CHARACTER SET utf8 comment='Leap seconds information for time zones' TABLESPACE=mysql; -CREATE TABLE IF NOT EXISTS procs_priv ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(32) binary DEFAULT '' NOT NULL, Routine_name char(64) COLLATE utf8_general_ci DEFAULT '' NOT NULL, Routine_type enum('FUNCTION','PROCEDURE') NOT NULL, Grantor char(93) DEFAULT '' NOT NULL, Proc_priv set('Execute','Alter Routine','Grant') COLLATE utf8_general_ci DEFAULT '' NOT NULL, Timestamp timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (Host,Db,User,Routine_name,Routine_type), KEY Grantor (Grantor) ) engine=InnoDB STATS_PERSISTENT=0 CHARACTER SET utf8 COLLATE utf8_bin comment='Procedure privileges' TABLESPACE=mysql; +CREATE TABLE IF NOT EXISTS procs_priv ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(80) binary DEFAULT '' NOT NULL, Routine_name char(64) COLLATE utf8_general_ci DEFAULT '' NOT NULL, Routine_type enum('FUNCTION','PROCEDURE') NOT NULL, Grantor char(93) DEFAULT '' NOT NULL, Proc_priv set('Execute','Alter Routine','Grant') COLLATE utf8_general_ci DEFAULT '' NOT NULL, Timestamp timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (Host,Db,User,Routine_name,Routine_type), KEY Grantor (Grantor) ) engine=InnoDB STATS_PERSISTENT=0 CHARACTER SET utf8 COLLATE utf8_bin comment='Procedure privileges' TABLESPACE=mysql; -- Create general_log CREATE TABLE IF NOT EXISTS general_log (event_time TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), user_host MEDIUMTEXT NOT NULL, thread_id BIGINT(21) UNSIGNED NOT NULL, server_id INTEGER UNSIGNED NOT NULL, command_type VARCHAR(64) NOT NULL, argument MEDIUMBLOB NOT NULL) engine=CSV CHARACTER SET utf8 comment="General log"; @@ -352,7 +352,7 @@ INSERT IGNORE INTO engine_cost(engine_name, device_type, cost_name) VALUES ("default", 0, "io_block_read_cost"); -CREATE TABLE IF NOT EXISTS proxies_priv (Host char(60) binary DEFAULT '' NOT NULL, User char(32) binary DEFAULT '' NOT NULL, Proxied_host char(60) binary DEFAULT '' NOT NULL, Proxied_user char(32) binary DEFAULT '' NOT NULL, With_grant BOOL DEFAULT 0 NOT NULL, Grantor char(93) DEFAULT '' NOT NULL, Timestamp timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY Host (Host,User,Proxied_host,Proxied_user), KEY Grantor (Grantor) ) engine=InnoDB STATS_PERSISTENT=0 CHARACTER SET utf8 COLLATE utf8_bin comment='User proxy privileges' TABLESPACE=mysql; +CREATE TABLE IF NOT EXISTS proxies_priv (Host char(60) binary DEFAULT '' NOT NULL, User char(80) binary DEFAULT '' NOT NULL, Proxied_host char(60) binary DEFAULT '' NOT NULL, Proxied_user char(80) binary DEFAULT '' NOT NULL, With_grant BOOL DEFAULT 0 NOT NULL, Grantor char(93) DEFAULT '' NOT NULL, Timestamp timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY Host (Host,User,Proxied_host,Proxied_user), KEY Grantor (Grantor) ) engine=InnoDB STATS_PERSISTENT=0 CHARACTER SET utf8 COLLATE utf8_bin comment='User proxy privileges' TABLESPACE=mysql; -- Remember for later if proxies_priv table already existed set @had_proxies_priv_table= @@warning_count != 0; diff --git a/scripts/mysql_system_tables_fix.sql b/scripts/mysql_system_tables_fix.sql index 41b3361b5a59..a2f366fb556e 100644 --- a/scripts/mysql_system_tables_fix.sql +++ b/scripts/mysql_system_tables_fix.sql @@ -146,7 +146,7 @@ ALTER TABLE tables_priv ALTER TABLE tables_priv MODIFY Host char(60) NOT NULL default '', MODIFY Db char(64) NOT NULL default '', - MODIFY User char(32) NOT NULL default '', + MODIFY User char(80) NOT NULL default '', MODIFY Table_name char(64) NOT NULL default '', MODIFY Grantor char(93) NOT NULL default '', CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin; @@ -173,7 +173,7 @@ ALTER TABLE columns_priv ALTER TABLE columns_priv MODIFY Host char(60) NOT NULL default '', MODIFY Db char(64) NOT NULL default '', - MODIFY User char(32) NOT NULL default '', + MODIFY User char(80) NOT NULL default '', MODIFY Table_name char(64) NOT NULL default '', MODIFY Column_name char(64) NOT NULL default '', CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin, @@ -222,8 +222,8 @@ ADD max_connections int(11) unsigned NOT NULL DEFAULT 0 AFTER max_updates; # # Update proxies_priv definition. # -ALTER TABLE proxies_priv MODIFY User char(32) binary DEFAULT '' NOT NULL; -ALTER TABLE proxies_priv MODIFY Proxied_user char(32) binary DEFAULT '' NOT NULL; +ALTER TABLE proxies_priv MODIFY User char(80) binary DEFAULT '' NOT NULL; +ALTER TABLE proxies_priv MODIFY Proxied_user char(80) binary DEFAULT '' NOT NULL; ALTER TABLE proxies_priv MODIFY Grantor char(93) DEFAULT '' NOT NULL; # @@ -245,7 +245,7 @@ alter table func comment='User defined functions'; # and reset all char columns to correct width ALTER TABLE user MODIFY Host char(60) NOT NULL default '', - MODIFY User char(32) NOT NULL default '', + MODIFY User char(80) NOT NULL default '', CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin; ALTER TABLE user MODIFY Select_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, @@ -274,7 +274,7 @@ ALTER TABLE user ALTER TABLE db MODIFY Host char(60) NOT NULL default '', MODIFY Db char(64) NOT NULL default '', - MODIFY User char(32) NOT NULL default '', + MODIFY User char(80) NOT NULL default '', CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin; ALTER TABLE db MODIFY Select_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, @@ -422,7 +422,7 @@ UPDATE user LEFT JOIN db USING (Host,User) SET Create_user_priv='Y' # ALTER TABLE procs_priv - MODIFY User char(32) NOT NULL default '', + MODIFY User char(80) NOT NULL default '', CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin; ALTER TABLE procs_priv diff --git a/sql/log_event.cc b/sql/log_event.cc index 3fd40bc4484b..66ca54511e62 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -2361,14 +2361,14 @@ void Log_event::print_base64(IO_CACHE *file, PRINT_EVENT_INFO *print_event_info, if (print_event_info->base64_output_mode != BASE64_OUTPUT_DECODE_ROWS) { if (my_b_tell(file) == 0) { my_b_printf(file, "\nBINLOG '\n"); - print_event_info->inside_binlog= true; + print_event_info->inside_binlog = true; } my_b_printf(file, "%s\n", tmp_str); if (!more) { my_b_printf(file, "'%s\n", print_event_info->delimiter); - print_event_info->inside_binlog= false; + print_event_info->inside_binlog = false; } } @@ -2409,12 +2409,11 @@ void Log_event::print_base64(IO_CACHE *file, PRINT_EVENT_INFO *print_event_info, } if (print_event_info->inside_binlog) { - if (ev) - print_event_info->verbose_events.push_back(ev); + if (ev) print_event_info->verbose_events.push_back(ev); } else { - std::vector &evs= print_event_info->verbose_events; - for (size_t i= 0; i < evs.size(); ++i) { - Rows_log_event *rle= evs.at(i); + std::vector &evs = print_event_info->verbose_events; + for (size_t i = 0; i < evs.size(); ++i) { + Rows_log_event *rle = evs.at(i); rle->print_verbose(file, print_event_info); delete rle; } @@ -3475,9 +3474,10 @@ bool Query_log_event::write(Basic_ostream *ostream) { *start++ = Q_INVOKER; /* - Store user length and user. The max length of use is 16, so 1 byte is + Store user length and user. The max length of use is 80, so 1 byte is enough to store the user's length. */ + assert(invoker_user.length < UINT_MAX8); *start++ = (uchar)invoker_user.length; memcpy(start, invoker_user.str, invoker_user.length); start += invoker_user.length; diff --git a/storage/perfschema/pfs_dd_version.h b/storage/perfschema/pfs_dd_version.h index d3efd58c08fb..f9527b30f2fd 100644 --- a/storage/perfschema/pfs_dd_version.h +++ b/storage/perfschema/pfs_dd_version.h @@ -90,7 +90,34 @@ - session_query_attrs added. - The last three digits reprents Facebook specific MySQL Schema changes. Version published is now 80011001. i.e. 8.0.11 facebook schema change no. 1. + + 80011002: + performance_schema tables changed: + - Schema of the following PFS tables are changed to have username of 80 chars + length (Upstream has username of 32 chars length). + table_accounts + table_ees_by_account_by_error + table_ees_by_user_by_error + table_esgs_by_account_by_event_name + table_esgs_by_user_by_event_name + table_esms_by_account_by_event_name + table_esms_by_user_by_event_name + table_ets_by_account_by_event_name + table_ets_by_user_by_event_name + table_ews_by_account_by_event_name + table_ews_by_user_by_event_name + table_replication_connection_configuration + table_setup_actors + table_status_by_account + table_status_by_user + table_threads + table_users + table_variables_info + + - The last three digits reprents Facebook specific MySQL Schema changes. + Version published is now 80011002. i.e. 8.0.11 facebook schema change no. 2. + */ -static const uint PFS_DD_VERSION = 80011001; +static const uint PFS_DD_VERSION = 80011002; #endif /* PFS_DD_VERSION_H */ diff --git a/storage/perfschema/table_accounts.cc b/storage/perfschema/table_accounts.cc index bcf74996b1b1..ef6850abc9ce 100644 --- a/storage/perfschema/table_accounts.cc +++ b/storage/perfschema/table_accounts.cc @@ -50,7 +50,7 @@ Plugin_table table_accounts::m_table_def( /* Name */ "accounts", /* Definition */ - " USER CHAR(32) collate utf8mb4_bin default null,\n" + " USER CHAR(80) collate utf8mb4_bin default null,\n" " HOST CHAR(60) collate utf8mb4_bin default null,\n" " CURRENT_CONNECTIONS bigint not null,\n" " TOTAL_CONNECTIONS bigint not null,\n" diff --git a/storage/perfschema/table_ees_by_account_by_error.cc b/storage/perfschema/table_ees_by_account_by_error.cc index 6dbb16f788ce..3baece7a76cd 100644 --- a/storage/perfschema/table_ees_by_account_by_error.cc +++ b/storage/perfschema/table_ees_by_account_by_error.cc @@ -49,7 +49,7 @@ Plugin_table table_ees_by_account_by_error::m_table_def( /* Name */ "events_errors_summary_by_account_by_error", /* Definition */ - " USER CHAR(32) collate utf8mb4_bin default null,\n" + " USER CHAR(80) collate utf8mb4_bin default null,\n" " HOST CHAR(60) collate utf8mb4_bin default null,\n" " ERROR_NUMBER INTEGER,\n" " ERROR_NAME VARCHAR(64),\n" diff --git a/storage/perfschema/table_ees_by_user_by_error.cc b/storage/perfschema/table_ees_by_user_by_error.cc index 5b428e9f189f..e2cd0bbbb289 100644 --- a/storage/perfschema/table_ees_by_user_by_error.cc +++ b/storage/perfschema/table_ees_by_user_by_error.cc @@ -50,7 +50,7 @@ Plugin_table table_ees_by_user_by_error::m_table_def( /* Name */ "events_errors_summary_by_user_by_error", /* Definition */ - " USER CHAR(32) collate utf8mb4_bin default null,\n" + " USER CHAR(80) collate utf8mb4_bin default null,\n" " ERROR_NUMBER INTEGER,\n" " ERROR_NAME VARCHAR(64),\n" " SQL_STATE VARCHAR(5),\n" diff --git a/storage/perfschema/table_esgs_by_account_by_event_name.cc b/storage/perfschema/table_esgs_by_account_by_event_name.cc index ccb6a305d1cc..b6ada8ae64b3 100644 --- a/storage/perfschema/table_esgs_by_account_by_event_name.cc +++ b/storage/perfschema/table_esgs_by_account_by_event_name.cc @@ -50,7 +50,7 @@ Plugin_table table_esgs_by_account_by_event_name::m_table_def( /* Name */ "events_stages_summary_by_account_by_event_name", /* Definition */ - " USER CHAR(32) collate utf8mb4_bin default null,\n" + " USER CHAR(80) collate utf8mb4_bin default null,\n" " HOST CHAR(60) collate utf8mb4_bin default null,\n" " EVENT_NAME VARCHAR(128) not null,\n" " COUNT_STAR BIGINT UNSIGNED not null,\n" diff --git a/storage/perfschema/table_esgs_by_user_by_event_name.cc b/storage/perfschema/table_esgs_by_user_by_event_name.cc index 5d0bb4f867ab..bc058c09af8c 100644 --- a/storage/perfschema/table_esgs_by_user_by_event_name.cc +++ b/storage/perfschema/table_esgs_by_user_by_event_name.cc @@ -51,7 +51,7 @@ Plugin_table table_esgs_by_user_by_event_name::m_table_def( /* Name */ "events_stages_summary_by_user_by_event_name", /* Definition */ - " USER CHAR(32) collate utf8mb4_bin default null,\n" + " USER CHAR(80) collate utf8mb4_bin default null,\n" " EVENT_NAME VARCHAR(128) not null,\n" " COUNT_STAR BIGINT unsigned not null,\n" " SUM_TIMER_WAIT BIGINT unsigned not null,\n" diff --git a/storage/perfschema/table_esms_by_account_by_event_name.cc b/storage/perfschema/table_esms_by_account_by_event_name.cc index f5cfb7772e61..5f0c4f383a69 100644 --- a/storage/perfschema/table_esms_by_account_by_event_name.cc +++ b/storage/perfschema/table_esms_by_account_by_event_name.cc @@ -50,7 +50,7 @@ Plugin_table table_esms_by_account_by_event_name::m_table_def( /* Name */ "events_statements_summary_by_account_by_event_name", /* Definition */ - " USER CHAR(32) collate utf8mb4_bin default null,\n" + " USER CHAR(80) collate utf8mb4_bin default null,\n" " HOST CHAR(60) collate utf8mb4_bin default null,\n" " EVENT_NAME VARCHAR(128) not null,\n" " COUNT_STAR BIGINT unsigned not null,\n" diff --git a/storage/perfschema/table_esms_by_user_by_event_name.cc b/storage/perfschema/table_esms_by_user_by_event_name.cc index b018aadfb65d..59d0ea037c5b 100644 --- a/storage/perfschema/table_esms_by_user_by_event_name.cc +++ b/storage/perfschema/table_esms_by_user_by_event_name.cc @@ -50,7 +50,7 @@ Plugin_table table_esms_by_user_by_event_name::m_table_def( /* Name */ "events_statements_summary_by_user_by_event_name", /* Definition */ - " USER CHAR(32) collate utf8mb4_bin default null,\n" + " USER CHAR(80) collate utf8mb4_bin default null,\n" " EVENT_NAME VARCHAR(128) not null,\n" " COUNT_STAR BIGINT unsigned not null,\n" " SUM_TIMER_WAIT BIGINT unsigned not null,\n" diff --git a/storage/perfschema/table_ets_by_account_by_event_name.cc b/storage/perfschema/table_ets_by_account_by_event_name.cc index 34fd41cc188a..1353432e8c63 100644 --- a/storage/perfschema/table_ets_by_account_by_event_name.cc +++ b/storage/perfschema/table_ets_by_account_by_event_name.cc @@ -50,7 +50,7 @@ Plugin_table table_ets_by_account_by_event_name::m_table_def( /* Name */ "events_transactions_summary_by_account_by_event_name", /* Definition */ - " USER CHAR(32) collate utf8mb4_bin default null,\n" + " USER CHAR(80) collate utf8mb4_bin default null,\n" " HOST CHAR(60) collate utf8mb4_bin default null,\n" " EVENT_NAME VARCHAR(128) not null,\n" " COUNT_STAR BIGINT unsigned not null,\n" diff --git a/storage/perfschema/table_ets_by_user_by_event_name.cc b/storage/perfschema/table_ets_by_user_by_event_name.cc index 14c78b57a4a1..591fb4a11754 100644 --- a/storage/perfschema/table_ets_by_user_by_event_name.cc +++ b/storage/perfschema/table_ets_by_user_by_event_name.cc @@ -51,7 +51,7 @@ Plugin_table table_ets_by_user_by_event_name::m_table_def( /* Name */ "events_transactions_summary_by_user_by_event_name", /* Definition */ - " USER CHAR(32) collate utf8mb4_bin default null,\n" + " USER CHAR(80) collate utf8mb4_bin default null,\n" " EVENT_NAME VARCHAR(128) not null,\n" " COUNT_STAR BIGINT unsigned not null,\n" " SUM_TIMER_WAIT BIGINT unsigned not null,\n" diff --git a/storage/perfschema/table_ews_by_account_by_event_name.cc b/storage/perfschema/table_ews_by_account_by_event_name.cc index 776c40bbd271..4bc30c65e439 100644 --- a/storage/perfschema/table_ews_by_account_by_event_name.cc +++ b/storage/perfschema/table_ews_by_account_by_event_name.cc @@ -50,7 +50,7 @@ Plugin_table table_ews_by_account_by_event_name::m_table_def( /* Name */ "events_waits_summary_by_account_by_event_name", /* Definition */ - " USER CHAR(32) collate utf8mb4_bin default null,\n" + " USER CHAR(80) collate utf8mb4_bin default null,\n" " HOST CHAR(60) collate utf8mb4_bin default null,\n" " EVENT_NAME VARCHAR(128) not null,\n" " COUNT_STAR BIGINT UNSIGNED not null,\n" diff --git a/storage/perfschema/table_ews_by_user_by_event_name.cc b/storage/perfschema/table_ews_by_user_by_event_name.cc index 22d9d84dd5f3..e0fc82ee4e76 100644 --- a/storage/perfschema/table_ews_by_user_by_event_name.cc +++ b/storage/perfschema/table_ews_by_user_by_event_name.cc @@ -51,7 +51,7 @@ Plugin_table table_ews_by_user_by_event_name::m_table_def( /* Name */ "events_waits_summary_by_user_by_event_name", /* Definition */ - " USER CHAR(32) collate utf8mb4_bin default null,\n" + " USER CHAR(80) collate utf8mb4_bin default null,\n" " EVENT_NAME VARCHAR(128) not null,\n" " COUNT_STAR BIGINT unsigned not null,\n" " SUM_TIMER_WAIT BIGINT unsigned not null,\n" diff --git a/storage/perfschema/table_replication_connection_configuration.cc b/storage/perfschema/table_replication_connection_configuration.cc index 9ea60261dd98..c38d2bba6801 100644 --- a/storage/perfschema/table_replication_connection_configuration.cc +++ b/storage/perfschema/table_replication_connection_configuration.cc @@ -53,7 +53,7 @@ Plugin_table table_replication_connection_configuration::m_table_def( " CHANNEL_NAME CHAR(64) not null,\n" " HOST CHAR(60) collate utf8mb4_bin not null,\n" " PORT INTEGER not null,\n" - " USER CHAR(32) collate utf8mb4_bin not null,\n" + " USER CHAR(80) collate utf8mb4_bin not null,\n" " NETWORK_INTERFACE CHAR(60) collate utf8mb4_bin not null,\n" " AUTO_POSITION ENUM('1','0') not null,\n" " SSL_ALLOWED ENUM('YES','NO','IGNORED') not null,\n" diff --git a/storage/perfschema/table_setup_actors.cc b/storage/perfschema/table_setup_actors.cc index 6e333e324f76..7f5cf645c738 100644 --- a/storage/perfschema/table_setup_actors.cc +++ b/storage/perfschema/table_setup_actors.cc @@ -49,7 +49,7 @@ Plugin_table table_setup_actors::m_table_def( "setup_actors", /* Definition */ " HOST CHAR(60) COLLATE utf8mb4_bin default '%' not null,\n" - " USER CHAR(32) COLLATE utf8mb4_bin default '%' not null,\n" + " USER CHAR(80) COLLATE utf8mb4_bin default '%' not null,\n" " `ROLE` CHAR(32) COLLATE utf8mb4_bin default '%' not null,\n" " ENABLED ENUM ('YES', 'NO') not null default 'YES',\n" " HISTORY ENUM ('YES', 'NO') not null default 'YES',\n" diff --git a/storage/perfschema/table_status_by_account.cc b/storage/perfschema/table_status_by_account.cc index 0fca18358be5..9569c090b2cb 100644 --- a/storage/perfschema/table_status_by_account.cc +++ b/storage/perfschema/table_status_by_account.cc @@ -52,7 +52,7 @@ Plugin_table table_status_by_account::m_table_def( /* Name */ "status_by_account", /* Definition */ - " USER CHAR(32) collate utf8mb4_bin default null,\n" + " USER CHAR(80) collate utf8mb4_bin default null,\n" " HOST CHAR(60) collate utf8mb4_bin default null,\n" " VARIABLE_NAME VARCHAR(64) not null,\n" " VARIABLE_VALUE VARCHAR(1024),\n" diff --git a/storage/perfschema/table_status_by_user.cc b/storage/perfschema/table_status_by_user.cc index f41cf9e81157..0f470bd1ec6f 100644 --- a/storage/perfschema/table_status_by_user.cc +++ b/storage/perfschema/table_status_by_user.cc @@ -53,7 +53,7 @@ Plugin_table table_status_by_user::m_table_def( /* Name */ "status_by_user", /* Definition */ - " USER CHAR(32) collate utf8mb4_bin default null,\n" + " USER CHAR(80) collate utf8mb4_bin default null,\n" " VARIABLE_NAME VARCHAR(64) not null,\n" " VARIABLE_VALUE VARCHAR(1024),\n" " UNIQUE KEY (USER, VARIABLE_NAME) USING HASH\n", diff --git a/storage/perfschema/table_threads.cc b/storage/perfschema/table_threads.cc index 4772d5bdcb14..1341bea5bb88 100644 --- a/storage/perfschema/table_threads.cc +++ b/storage/perfschema/table_threads.cc @@ -51,7 +51,7 @@ Plugin_table table_threads::m_table_def( " NAME VARCHAR(128) not null,\n" " TYPE VARCHAR(10) not null,\n" " PROCESSLIST_ID BIGINT unsigned,\n" - " PROCESSLIST_USER VARCHAR(32),\n" + " PROCESSLIST_USER VARCHAR(80),\n" " PROCESSLIST_HOST VARCHAR(60),\n" " PROCESSLIST_DB VARCHAR(64),\n" " PROCESSLIST_COMMAND VARCHAR(16),\n" diff --git a/storage/perfschema/table_users.cc b/storage/perfschema/table_users.cc index 379afc59d4a6..ebd0f90c7b84 100644 --- a/storage/perfschema/table_users.cc +++ b/storage/perfschema/table_users.cc @@ -51,7 +51,7 @@ Plugin_table table_users::m_table_def( /* Name */ "users", /* Definition */ - " USER CHAR(32) collate utf8mb4_bin default null,\n" + " USER CHAR(80) collate utf8mb4_bin default null,\n" " CURRENT_CONNECTIONS bigint not null,\n" " TOTAL_CONNECTIONS bigint not null,\n" " UNIQUE KEY (USER) USING HASH\n", diff --git a/storage/perfschema/table_variables_info.cc b/storage/perfschema/table_variables_info.cc index 58a5d22855ad..d20f369068bc 100644 --- a/storage/perfschema/table_variables_info.cc +++ b/storage/perfschema/table_variables_info.cc @@ -59,7 +59,7 @@ Plugin_table table_variables_info::m_table_def( " MIN_VALUE varchar(64),\n" " MAX_VALUE varchar(64),\n" " SET_TIME TIMESTAMP(6) default null,\n" - " SET_USER CHAR(32) collate utf8mb4_bin default null,\n" + " SET_USER CHAR(80) collate utf8mb4_bin default null,\n" " SET_HOST CHAR(60) collate utf8mb4_bin default null\n", /* Options */ " ENGINE=PERFORMANCE_SCHEMA",