diff --git a/include/mysql/components/services/bits/psi_thread_bits.h b/include/mysql/components/services/bits/psi_thread_bits.h index 9644d6078b4e..e075a8859d4a 100644 --- a/include/mysql/components/services/bits/psi_thread_bits.h +++ b/include/mysql/components/services/bits/psi_thread_bits.h @@ -458,7 +458,7 @@ typedef void (*get_thread_event_id_v2_t)(struct PSI_thread *psi, 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 (255) diff --git a/include/mysql/plugin_auth.h.pp b/include/mysql/plugin_auth.h.pp index c715c2b5075a..f2b0646df188 100644 --- a/include/mysql/plugin_auth.h.pp +++ b/include/mysql/plugin_auth.h.pp @@ -167,7 +167,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 afa14291bb11..ba6d2a0a0d03 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 b88556b1c3aa..b3b070f9162b 100644 --- a/include/mysql/psi/psi_abi_thread_v1.h.pp +++ b/include/mysql/psi/psi_abi_thread_v1.h.pp @@ -133,7 +133,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[(255)]; size_t m_hostname_length; diff --git a/include/mysql_com.h b/include/mysql_com.h index ff2abcca6403..c89999cb1cbc 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -60,8 +60,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 5eab4ba3cb91..eda5b387ca38 100644 --- a/mysql-test/r/create.result +++ b/mysql-test/r/create.result @@ -1149,7 +1149,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `ID` bigint unsigned NOT NULL DEFAULT '0', - `USER` varchar(32) NOT NULL DEFAULT '', + `USER` varchar(80) NOT NULL DEFAULT '', `HOST` varchar(261) NOT NULL DEFAULT '', `DB` varchar(64) DEFAULT NULL, `COMMAND` varchar(16) NOT NULL DEFAULT '', @@ -1163,7 +1163,7 @@ show create table t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( `ID` bigint unsigned NOT NULL DEFAULT '0', - `USER` varchar(32) NOT NULL DEFAULT '', + `USER` varchar(80) NOT NULL DEFAULT '', `HOST` varchar(261) NOT NULL DEFAULT '', `DB` varchar(64) DEFAULT NULL, `COMMAND` varchar(16) NOT NULL DEFAULT '', diff --git a/mysql-test/r/dd_is_compatibility_ci.result b/mysql-test/r/dd_is_compatibility_ci.result index 8fcf6facff52..6c76ffff4a18 100644 --- a/mysql-test/r/dd_is_compatibility_ci.result +++ b/mysql-test/r/dd_is_compatibility_ci.result @@ -123,7 +123,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `ID` bigint unsigned NOT NULL DEFAULT '0', - `USER` varchar(32) NOT NULL DEFAULT '', + `USER` varchar(80) NOT NULL DEFAULT '', `HOST` varchar(261) 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 96d9d904463b..f32805c1b0b5 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 unsigned NOT NULL DEFAULT '0', - `USER` varchar(32) NOT NULL DEFAULT '', + `USER` varchar(80) NOT NULL DEFAULT '', `HOST` varchar(261) NOT NULL DEFAULT '', `DB` varchar(64) DEFAULT NULL, `COMMAND` varchar(16) NOT NULL DEFAULT '', diff --git a/mysql-test/r/dd_upgrade_test.result b/mysql-test/r/dd_upgrade_test.result index 2c91e3c686a8..cbf23d3b5f79 100644 --- a/mysql-test/r/dd_upgrade_test.result +++ b/mysql-test/r/dd_upgrade_test.result @@ -194,7 +194,7 @@ SHOW CREATE TABLE mysql.user; Table Create Table user CREATE TABLE `user` ( `Host` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL DEFAULT '', - `User` char(32) COLLATE utf8mb3_bin NOT NULL DEFAULT '', + `User` char(80) COLLATE utf8mb3_bin NOT NULL DEFAULT '', `Select_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N', `Insert_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N', `Update_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N', @@ -446,7 +446,7 @@ threads CREATE TABLE `threads` ( `NAME` varchar(128) NOT NULL, `TYPE` varchar(10) NOT NULL, `PROCESSLIST_ID` bigint unsigned DEFAULT NULL, - `PROCESSLIST_USER` varchar(32) DEFAULT NULL, + `PROCESSLIST_USER` varchar(80) DEFAULT NULL, `PROCESSLIST_HOST` varchar(255) CHARACTER SET ascii COLLATE ascii_general_ci 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 2152ae9e159b..7e6648c1e633 100644 --- a/mysql-test/r/dictionary_tablespace.result +++ b/mysql-test/r/dictionary_tablespace.result @@ -166,6 +166,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(".*The system table mysql.global_grants is missing.*"); 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 dbddf2e88a22..0b3523d6c706 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 utf8mb3 DEFAULT NULL, - `user()` varchar(288) CHARACTER SET utf8mb3 NOT NULL DEFAULT '', + `user()` varchar(336) CHARACTER SET utf8mb3 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 8a6168d3ea94..5a6a9c2c9603 100644 --- a/mysql-test/r/grant.result +++ b/mysql-test/r/grant.result @@ -550,7 +550,7 @@ SHOW FIELDS FROM mysql.tables_priv; Field Type Null Key Default Extra Host char(255) NO PRI Db char(64) NO PRI -User char(32) NO PRI +User char(80) NO PRI Table_name char(64) NO PRI Grantor varchar(288) NO MUL Timestamp timestamp NO CURRENT_TIMESTAMP DEFAULT_GENERATED on update CURRENT_TIMESTAMP @@ -991,8 +991,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, @@ -1059,28 +1059,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@host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890X; ERROR HY000: String 'host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij12345' is too long for host name (should be no longer than 255) -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@host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890X; ERROR HY000: String 'host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij12345' is too long for host name (should be no longer than 255) -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@host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890X; ERROR HY000: String 'host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij12345' is too long for host name (should be no longer than 255) -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@host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890X; ERROR HY000: String 'host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij12345' is too long for host name (should be no longer than 255) -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@host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890X; ERROR HY000: String 'host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij12345' is too long for host name (should be no longer than 255) -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@host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890X; ERROR HY000: String 'host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij12345' is too long for host name (should be no longer than 255) CREATE USER bug23556@localhost; @@ -1560,8 +1560,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; @@ -2591,116 +2591,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 utf8mb3; Warnings: Warning 1287 'utf8mb3' is deprecated and will be removed in a future release. Please use utf8mb4 instead 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; @@ -2744,8 +2744,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 3988bd3429c2..13c3324b347f 100644 --- a/mysql-test/r/grant_dynamic.result +++ b/mysql-test/r/grant_dynamic.result @@ -1127,7 +1127,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(255) CHARACTER SET ASCII DEFAULT '' NOT NULL, PRIV CHAR(32) COLLATE utf8mb3_GENERAL_CI DEFAULT '' NOT NULL, WITH_GRANT_OPTION ENUM('N','Y') COLLATE utf8mb3_GENERAL_CI DEFAULT 'N' NOT NULL, diff --git a/mysql-test/r/join.result b/mysql-test/r/join.result index 4d87a6970d93..872562206ae3 100644 --- a/mysql-test/r/join.result +++ b/mysql-test/r/join.result @@ -793,7 +793,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 255 255 NULL NULL ascii ascii_general_ci char(255) 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 utf8mb3 utf8mb3_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 utf8mb3 utf8mb3_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 ce566dcd7000..2b3c2392b5bd 100644 --- a/mysql-test/r/mysqlshow_cs.result +++ b/mysql-test/r/mysqlshow_cs.result @@ -373,7 +373,7 @@ Database: mysql Table: user Wildcard: user +-------+----------+-------------+------+-----+---------+-------+---------------------------------+---------+ | Field | Type | Collation | Null | Key | Default | Extra | Privileges | Comment | +-------+----------+-------------+------+-----+---------+-------+---------------------------------+---------+ -| User | char(32) | utf8mb3_bin | NO | PRI | | | select,insert,update,references | | +| User | char(80) | utf8mb3_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 97f4a31b2c64..16970d2165f7 100644 --- a/mysql-test/r/persisted_variables_extended.result +++ b/mysql-test/r/persisted_variables_extended.result @@ -267,7 +267,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(255) CHARACTER SET ascii COLLATE ascii_general_ci 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 67b7920892e6..670fbe3db797 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(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL DEFAULT '', - `User` char(32) COLLATE utf8mb3_bin NOT NULL DEFAULT '', + `User` char(80) COLLATE utf8mb3_bin NOT NULL DEFAULT '', `Proxied_host` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL DEFAULT '', - `Proxied_user` char(32) COLLATE utf8mb3_bin NOT NULL DEFAULT '', + `Proxied_user` char(80) COLLATE utf8mb3_bin NOT NULL DEFAULT '', `With_grant` tinyint(1) NOT NULL DEFAULT '0', `Grantor` varchar(288) COLLATE utf8mb3_bin NOT NULL DEFAULT '', `Timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, @@ -472,9 +472,9 @@ SHOW CREATE TABLE mysql.proxies_priv; Table Create Table proxies_priv CREATE TABLE `proxies_priv` ( `Host` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL DEFAULT '', - `User` char(32) COLLATE utf8mb3_bin NOT NULL DEFAULT '', + `User` char(80) COLLATE utf8mb3_bin NOT NULL DEFAULT '', `Proxied_host` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL DEFAULT '', - `Proxied_user` char(32) COLLATE utf8mb3_bin NOT NULL DEFAULT '', + `Proxied_user` char(80) COLLATE utf8mb3_bin NOT NULL DEFAULT '', `With_grant` tinyint(1) NOT NULL DEFAULT '0', `Grantor` varchar(288) COLLATE utf8mb3_bin NOT NULL DEFAULT '', `Timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, @@ -504,9 +504,9 @@ SHOW CREATE TABLE mysql.proxies_priv; Table Create Table proxies_priv CREATE TABLE `proxies_priv` ( `Host` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL DEFAULT '', - `User` char(32) COLLATE utf8mb3_bin NOT NULL DEFAULT '', + `User` char(80) COLLATE utf8mb3_bin NOT NULL DEFAULT '', `Proxied_host` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL DEFAULT '', - `Proxied_user` char(32) COLLATE utf8mb3_bin NOT NULL DEFAULT '', + `Proxied_user` char(80) COLLATE utf8mb3_bin NOT NULL DEFAULT '', `With_grant` tinyint(1) NOT NULL DEFAULT '0', `Grantor` varchar(288) COLLATE utf8mb3_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 ab0873d3b4a2..5dc96f9a873d 100644 --- a/mysql-test/r/roles-upgrade.result +++ b/mysql-test/r/roles-upgrade.result @@ -22,9 +22,9 @@ SHOW CREATE TABLE mysql.role_edges; Table Create Table role_edges CREATE TABLE `role_edges` ( `FROM_HOST` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL DEFAULT '', - `FROM_USER` char(32) COLLATE utf8mb3_bin NOT NULL DEFAULT '', + `FROM_USER` char(80) COLLATE utf8mb3_bin NOT NULL DEFAULT '', `TO_HOST` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL DEFAULT '', - `TO_USER` char(32) COLLATE utf8mb3_bin NOT NULL DEFAULT '', + `TO_USER` char(80) COLLATE utf8mb3_bin NOT NULL DEFAULT '', `WITH_ADMIN_OPTION` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N', PRIMARY KEY (`FROM_HOST`,`FROM_USER`,`TO_HOST`,`TO_USER`) ) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='Role hierarchy and role grants' @@ -32,9 +32,9 @@ SHOW CREATE TABLE mysql.default_roles; Table Create Table default_roles CREATE TABLE `default_roles` ( `HOST` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL DEFAULT '', - `USER` char(32) COLLATE utf8mb3_bin NOT NULL DEFAULT '', + `USER` char(80) COLLATE utf8mb3_bin NOT NULL DEFAULT '', `DEFAULT_ROLE_HOST` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL DEFAULT '%', - `DEFAULT_ROLE_USER` char(32) COLLATE utf8mb3_bin NOT NULL DEFAULT '', + `DEFAULT_ROLE_USER` char(80) COLLATE utf8mb3_bin NOT NULL DEFAULT '', PRIMARY KEY (`HOST`,`USER`,`DEFAULT_ROLE_HOST`,`DEFAULT_ROLE_USER`) ) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='Default roles' CREATE USER u1; diff --git a/mysql-test/r/roles.result b/mysql-test/r/roles.result index 049bd281335c..f53f84a376af 100644 --- a/mysql-test/r/roles.result +++ b/mysql-test/r/roles.result @@ -977,8 +977,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 dc6c4c6bcf84..7d7933d5a5ba 100644 --- a/mysql-test/r/sp.result +++ b/mysql-test/r/sp.result @@ -5281,7 +5281,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@host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890X FUNCTION bug16899_f1() RETURNS INT BEGIN @@ -8338,9 +8338,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 @@ -8370,9 +8370,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 42cdd16e3764..90521c613eb2 100644 --- a/mysql-test/r/system_mysql_db.result +++ b/mysql-test/r/system_mysql_db.result @@ -42,7 +42,7 @@ Table Create Table db CREATE TABLE `db` ( `Host` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL DEFAULT '', `Db` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '', - `User` char(32) COLLATE utf8mb3_bin NOT NULL DEFAULT '', + `User` char(80) COLLATE utf8mb3_bin NOT NULL DEFAULT '', `Select_priv` enum('N','Y') COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N', `Insert_priv` enum('N','Y') COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N', `Update_priv` enum('N','Y') COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N', @@ -69,7 +69,7 @@ show create table user; Table Create Table user CREATE TABLE `user` ( `Host` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL DEFAULT '', - `User` char(32) COLLATE utf8mb3_bin NOT NULL DEFAULT '', + `User` char(80) COLLATE utf8mb3_bin NOT NULL DEFAULT '', `Select_priv` enum('N','Y') COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N', `Insert_priv` enum('N','Y') COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N', `Update_priv` enum('N','Y') COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N', @@ -135,7 +135,7 @@ Table Create Table tables_priv CREATE TABLE `tables_priv` ( `Host` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL DEFAULT '', `Db` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '', - `User` char(32) COLLATE utf8mb3_bin NOT NULL DEFAULT '', + `User` char(80) COLLATE utf8mb3_bin NOT NULL DEFAULT '', `Table_name` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '', `Grantor` varchar(288) COLLATE utf8mb3_bin NOT NULL DEFAULT '', `Timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, @@ -149,7 +149,7 @@ Table Create Table columns_priv CREATE TABLE `columns_priv` ( `Host` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL DEFAULT '', `Db` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '', - `User` char(32) COLLATE utf8mb3_bin NOT NULL DEFAULT '', + `User` char(80) COLLATE utf8mb3_bin NOT NULL DEFAULT '', `Table_name` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '', `Column_name` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '', `Timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, @@ -161,7 +161,7 @@ Table Create Table procs_priv CREATE TABLE `procs_priv` ( `Host` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL DEFAULT '', `Db` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '', - `User` char(32) COLLATE utf8mb3_bin NOT NULL DEFAULT '', + `User` char(80) COLLATE utf8mb3_bin NOT NULL DEFAULT '', `Routine_name` char(64) COLLATE utf8mb3_general_ci NOT NULL DEFAULT '', `Routine_type` enum('FUNCTION','PROCEDURE') COLLATE utf8mb3_bin NOT NULL, `Grantor` varchar(288) COLLATE utf8mb3_bin NOT NULL DEFAULT '', diff --git a/mysql-test/r/transactional_acl_tables.result b/mysql-test/r/transactional_acl_tables.result index 6b5e51ba650c..c8fcd5d18b5c 100644 --- a/mysql-test/r/transactional_acl_tables.result +++ b/mysql-test/r/transactional_acl_tables.result @@ -1514,6 +1514,7 @@ RENAME TABLE mysql.columns_priv_bak TO mysql.columns_priv; RENAME TABLE mysql.procs_priv_bak TO mysql.procs_priv; RENAME TABLE mysql.proxies_priv_bak TO mysql.proxies_priv; RENAME TABLE mysql.tables_priv_bak TO mysql.tables_priv; +ALTER TABLE mysql.columns_priv MODIFY User char(80) NOT NULL default ''; ######################################################################## # F. Upgrade/downgrade tests. diff --git a/mysql-test/r/trigger.result b/mysql-test/r/trigger.result index fd116e5e12db..e3e10002434c 100644 --- a/mysql-test/r/trigger.result +++ b/mysql-test/r/trigger.result @@ -1013,9 +1013,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@host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890X TRIGGER t2_bi BEFORE INSERT ON t2 FOR EACH ROW SET @a = 2; ERROR HY000: String 'host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij12345' is too long for host name (should be no longer than 255) @@ -3074,9 +3074,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 fafe6e0994ed..32fd4e5fea84 100644 --- a/mysql-test/r/view.result +++ b/mysql-test/r/view.result @@ -3009,9 +3009,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@host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890X VIEW v2 AS SELECT b FROM t1; ERROR HY000: String 'host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij12345' is too long for host name (should be no longer than 255) diff --git a/mysql-test/r/view_grant.result b/mysql-test/r/view_grant.result index d2fcb455ef27..61f5f65ff4b2 100644 --- a/mysql-test/r/view_grant.result +++ b/mysql-test/r/view_grant.result @@ -2674,9 +2674,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/r/wl14965.result b/mysql-test/r/wl14965.result index f41909a9f670..f063d20ac741 100644 --- a/mysql-test/r/wl14965.result +++ b/mysql-test/r/wl14965.result @@ -29,8 +29,6 @@ procs_priv 0 PRIMARY 3 User A 0 NULL NULL BTREE YES NULL procs_priv 0 PRIMARY 4 Routine_name A 0 NULL NULL BTREE YES NULL procs_priv 0 PRIMARY 5 Routine_type A 0 NULL NULL BTREE YES NULL procs_priv 1 Grantor 1 Grantor A 0 NULL NULL BTREE YES NULL -# Restart server without upgrade option -# restart # Restart server with upgrade option # restart:--upgrade=force SHOW KEYS FROM mysql.db; @@ -71,22 +69,22 @@ DROP USER wl14965_u2; # ensure that key_len is 351 which includes length of host(255) + user(96) EXPLAIN SELECT * FROM mysql.db WHERE host='' AND user=''; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE db NULL ref PRIMARY,User PRIMARY 351 const,const # # NULL +1 SIMPLE db NULL ref PRIMARY,User PRIMARY 495 const,const # # NULL Warnings: Note 1003 /* select#1 */ select `mysql`.`db`.`Host` AS `Host`,`mysql`.`db`.`Db` AS `Db`,`mysql`.`db`.`User` AS `User`,`mysql`.`db`.`Select_priv` AS `Select_priv`,`mysql`.`db`.`Insert_priv` AS `Insert_priv`,`mysql`.`db`.`Update_priv` AS `Update_priv`,`mysql`.`db`.`Delete_priv` AS `Delete_priv`,`mysql`.`db`.`Create_priv` AS `Create_priv`,`mysql`.`db`.`Drop_priv` AS `Drop_priv`,`mysql`.`db`.`Grant_priv` AS `Grant_priv`,`mysql`.`db`.`References_priv` AS `References_priv`,`mysql`.`db`.`Index_priv` AS `Index_priv`,`mysql`.`db`.`Alter_priv` AS `Alter_priv`,`mysql`.`db`.`Create_tmp_table_priv` AS `Create_tmp_table_priv`,`mysql`.`db`.`Lock_tables_priv` AS `Lock_tables_priv`,`mysql`.`db`.`Create_view_priv` AS `Create_view_priv`,`mysql`.`db`.`Show_view_priv` AS `Show_view_priv`,`mysql`.`db`.`Create_routine_priv` AS `Create_routine_priv`,`mysql`.`db`.`Alter_routine_priv` AS `Alter_routine_priv`,`mysql`.`db`.`Execute_priv` AS `Execute_priv`,`mysql`.`db`.`Event_priv` AS `Event_priv`,`mysql`.`db`.`Trigger_priv` AS `Trigger_priv` from `mysql`.`db` where ((`mysql`.`db`.`User` = '') and (`mysql`.`db`.`Host` = '')) EXPLAIN SELECT * FROM mysql.tables_priv WHERE host='' AND user=''; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE tables_priv NULL ref PRIMARY PRIMARY 351 const,const # # NULL +1 SIMPLE tables_priv NULL ref PRIMARY PRIMARY 495 const,const # # NULL Warnings: Note 1003 /* select#1 */ select `mysql`.`tables_priv`.`Host` AS `Host`,`mysql`.`tables_priv`.`Db` AS `Db`,`mysql`.`tables_priv`.`User` AS `User`,`mysql`.`tables_priv`.`Table_name` AS `Table_name`,`mysql`.`tables_priv`.`Grantor` AS `Grantor`,`mysql`.`tables_priv`.`Timestamp` AS `Timestamp`,`mysql`.`tables_priv`.`Table_priv` AS `Table_priv`,`mysql`.`tables_priv`.`Column_priv` AS `Column_priv` from `mysql`.`tables_priv` where ((`mysql`.`tables_priv`.`User` = '') and (`mysql`.`tables_priv`.`Host` = '')) EXPLAIN SELECT * FROM mysql.columns_priv WHERE host='' AND user=''; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE columns_priv NULL ref PRIMARY PRIMARY 351 const,const # # NULL +1 SIMPLE columns_priv NULL ref PRIMARY PRIMARY 495 const,const # # NULL Warnings: Note 1003 /* select#1 */ select `mysql`.`columns_priv`.`Host` AS `Host`,`mysql`.`columns_priv`.`Db` AS `Db`,`mysql`.`columns_priv`.`User` AS `User`,`mysql`.`columns_priv`.`Table_name` AS `Table_name`,`mysql`.`columns_priv`.`Column_name` AS `Column_name`,`mysql`.`columns_priv`.`Timestamp` AS `Timestamp`,`mysql`.`columns_priv`.`Column_priv` AS `Column_priv` from `mysql`.`columns_priv` where ((`mysql`.`columns_priv`.`User` = '') and (`mysql`.`columns_priv`.`Host` = '')) EXPLAIN SELECT * FROM mysql.procs_priv WHERE host='' AND user=''; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE procs_priv NULL ref PRIMARY PRIMARY 351 const,const # # NULL +1 SIMPLE procs_priv NULL ref PRIMARY PRIMARY 495 const,const # # NULL Warnings: Note 1003 /* select#1 */ select `mysql`.`procs_priv`.`Host` AS `Host`,`mysql`.`procs_priv`.`Db` AS `Db`,`mysql`.`procs_priv`.`User` AS `User`,`mysql`.`procs_priv`.`Routine_name` AS `Routine_name`,`mysql`.`procs_priv`.`Routine_type` AS `Routine_type`,`mysql`.`procs_priv`.`Grantor` AS `Grantor`,`mysql`.`procs_priv`.`Proc_priv` AS `Proc_priv`,`mysql`.`procs_priv`.`Timestamp` AS `Timestamp` from `mysql`.`procs_priv` where ((`mysql`.`procs_priv`.`User` = '') and (`mysql`.`procs_priv`.`Host` = '')) DROP DATABASE wl14965; 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 7a57c46e6912..b634046fa6b0 100644 --- a/mysql-test/std_data/dd/sdi/innodb_sdi/mysql.json +++ b/mysql-test/std_data/dd/sdi/innodb_sdi/mysql.json @@ -25720,7 +25720,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, @@ -25743,7 +25743,7 @@ "engine_attribute": "", "secondary_engine_attribute": "", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -26761,7 +26761,7 @@ }, { "ordinal_position": 2, - "length": 96, + "length": 240, "order": 2, "hidden": false, "column_opx": 2 @@ -26941,7 +26941,7 @@ "elements": [ { "ordinal_position": 1, - "length": 96, + "length": 240, "order": 2, "hidden": false, "column_opx": 2 @@ -27038,7 +27038,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, @@ -27061,7 +27061,7 @@ "engine_attribute": "", "secondary_engine_attribute": "", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -29371,7 +29371,7 @@ }, { "ordinal_position": 2, - "length": 96, + "length": 240, "order": 2, "hidden": false, "column_opx": 1 @@ -29811,7 +29811,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, @@ -29834,7 +29834,7 @@ "engine_attribute": "", "secondary_engine_attribute": "", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -29887,7 +29887,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, @@ -29910,7 +29910,7 @@ "engine_attribute": "", "secondary_engine_attribute": "", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -30035,7 +30035,7 @@ }, { "ordinal_position": 2, - "length": 96, + "length": 240, "order": 2, "hidden": false, "column_opx": 1 @@ -30049,7 +30049,7 @@ }, { "ordinal_position": 4, - "length": 96, + "length": 240, "order": 2, "hidden": false, "column_opx": 3 @@ -30146,7 +30146,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, @@ -30169,7 +30169,7 @@ "engine_attribute": "", "secondary_engine_attribute": "", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -30222,7 +30222,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, @@ -30245,7 +30245,7 @@ "engine_attribute": "", "secondary_engine_attribute": "", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -30417,7 +30417,7 @@ }, { "ordinal_position": 2, - "length": 96, + "length": 240, "order": 2, "hidden": false, "column_opx": 1 @@ -30431,7 +30431,7 @@ }, { "ordinal_position": 4, - "length": 96, + "length": 240, "order": 2, "hidden": false, "column_opx": 3 @@ -30497,7 +30497,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, @@ -30520,7 +30520,7 @@ "engine_attribute": "", "secondary_engine_attribute": "", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -30761,7 +30761,7 @@ "elements": [ { "ordinal_position": 1, - "length": 96, + "length": 240, "order": 2, "hidden": false, "column_opx": 0 @@ -30879,7 +30879,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, @@ -30902,7 +30902,7 @@ "engine_attribute": "", "secondary_engine_attribute": "", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -31103,7 +31103,7 @@ }, { "ordinal_position": 2, - "length": 96, + "length": 240, "order": 2, "hidden": false, "column_opx": 1 @@ -33472,7 +33472,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, @@ -33495,7 +33495,7 @@ "engine_attribute": "", "secondary_engine_attribute": "", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -33880,7 +33880,7 @@ }, { "ordinal_position": 2, - "length": 96, + "length": 240, "order": 2, "hidden": false, "column_opx": 2 @@ -34111,7 +34111,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, @@ -34134,7 +34134,7 @@ "engine_attribute": "", "secondary_engine_attribute": "", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -34428,7 +34428,7 @@ }, { "ordinal_position": 2, - "length": 96, + "length": 240, "order": 2, "hidden": false, "column_opx": 2 @@ -36290,7 +36290,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, @@ -36313,7 +36313,7 @@ "engine_attribute": "", "secondary_engine_attribute": "", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -36650,7 +36650,7 @@ }, { "ordinal_position": 2, - "length": 96, + "length": 240, "order": 2, "hidden": false, "column_opx": 2 @@ -43068,7 +43068,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, @@ -43091,7 +43091,7 @@ "engine_attribute": "", "secondary_engine_attribute": "", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -43144,7 +43144,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, @@ -43167,7 +43167,7 @@ "engine_attribute": "", "secondary_engine_attribute": "", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -43406,7 +43406,7 @@ }, { "ordinal_position": 2, - "length": 96, + "length": 240, "order": 2, "hidden": false, "column_opx": 1 @@ -43420,7 +43420,7 @@ }, { "ordinal_position": 4, - "length": 96, + "length": 240, "order": 2, "hidden": false, "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 f564a64d3b23..cd3cf4ab7e93 100644 --- a/mysql-test/std_data/dd/sdi/upgrade/mysql.json +++ b/mysql-test/std_data/dd/sdi/upgrade/mysql.json @@ -26912,7 +26912,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, @@ -26935,7 +26935,7 @@ "engine_attribute": "", "secondary_engine_attribute": "", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -26988,7 +26988,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, @@ -27011,7 +27011,7 @@ "engine_attribute": "", "secondary_engine_attribute": "", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -27136,7 +27136,7 @@ }, { "ordinal_position": 2, - "length": 96, + "length": 240, "order": 2, "hidden": false, "column_opx": 1 @@ -27150,7 +27150,7 @@ }, { "ordinal_position": 4, - "length": 96, + "length": 240, "order": 2, "hidden": false, "column_opx": 3 @@ -27672,7 +27672,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, @@ -27695,7 +27695,7 @@ "engine_attribute": "", "secondary_engine_attribute": "", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -27936,7 +27936,7 @@ "elements": [ { "ordinal_position": 1, - "length": 96, + "length": 240, "order": 2, "hidden": false, "column_opx": 0 @@ -29648,7 +29648,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, @@ -29671,7 +29671,7 @@ "engine_attribute": "", "secondary_engine_attribute": "", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -29872,7 +29872,7 @@ }, { "ordinal_position": 2, - "length": 96, + "length": 240, "order": 2, "hidden": false, "column_opx": 1 @@ -29983,7 +29983,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, @@ -30006,7 +30006,7 @@ "engine_attribute": "", "secondary_engine_attribute": "", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -30059,7 +30059,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, @@ -30082,7 +30082,7 @@ "engine_attribute": "", "secondary_engine_attribute": "", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -30321,7 +30321,7 @@ }, { "ordinal_position": 2, - "length": 96, + "length": 240, "order": 2, "hidden": false, "column_opx": 1 @@ -30335,7 +30335,7 @@ }, { "ordinal_position": 4, - "length": 96, + "length": 240, "order": 2, "hidden": false, "column_opx": 3 @@ -30507,7 +30507,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, @@ -30530,7 +30530,7 @@ "engine_attribute": "", "secondary_engine_attribute": "", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -30583,7 +30583,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, @@ -30606,7 +30606,7 @@ "engine_attribute": "", "secondary_engine_attribute": "", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -30778,7 +30778,7 @@ }, { "ordinal_position": 2, - "length": 96, + "length": 240, "order": 2, "hidden": false, "column_opx": 1 @@ -30792,7 +30792,7 @@ }, { "ordinal_position": 4, - "length": 96, + "length": 240, "order": 2, "hidden": false, "column_opx": 3 @@ -37845,7 +37845,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, @@ -37868,7 +37868,7 @@ "engine_attribute": "", "secondary_engine_attribute": "", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -40178,7 +40178,7 @@ }, { "ordinal_position": 2, - "length": 96, + "length": 240, "order": 2, "hidden": false, "column_opx": 1 @@ -40910,7 +40910,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, @@ -40933,7 +40933,7 @@ "engine_attribute": "", "secondary_engine_attribute": "", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -41951,7 +41951,7 @@ }, { "ordinal_position": 2, - "length": 96, + "length": 240, "order": 2, "hidden": false, "column_opx": 2 @@ -42131,7 +42131,7 @@ "elements": [ { "ordinal_position": 1, - "length": 96, + "length": 240, "order": 2, "hidden": false, "column_opx": 2 @@ -42266,7 +42266,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, @@ -42289,7 +42289,7 @@ "engine_attribute": "", "secondary_engine_attribute": "", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -42674,7 +42674,7 @@ }, { "ordinal_position": 2, - "length": 96, + "length": 240, "order": 2, "hidden": false, "column_opx": 2 @@ -42905,7 +42905,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, @@ -42928,7 +42928,7 @@ "engine_attribute": "", "secondary_engine_attribute": "", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -43222,7 +43222,7 @@ }, { "ordinal_position": 2, - "length": 96, + "length": 240, "order": 2, "hidden": false, "column_opx": 2 @@ -43392,7 +43392,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, @@ -43415,7 +43415,7 @@ "engine_attribute": "", "secondary_engine_attribute": "", "column_key": 2, - "column_type_utf8": "char(32)", + "column_type_utf8": "char(80)", "elements": [], "collation_id": X, "is_explicit_collation": false @@ -43752,7 +43752,7 @@ }, { "ordinal_position": 2, - "length": 96, + "length": 240, "order": 2, "hidden": false, "column_opx": 2 diff --git a/mysql-test/suite/auth_sec/r/ssl_mode.result b/mysql-test/suite/auth_sec/r/ssl_mode.result index 9a9ccf63bd97..94121b9c5932 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) | utf8mb3_bin | NO | PRI | | | select,insert,update,references | | +| User | char(80) | utf8mb3_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) | utf8mb3_bin | NO | PRI | | | select,insert,update,references | | +| User | char(80) | utf8mb3_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) | utf8mb3_bin | NO | PRI | | | select,insert,update,references | | +| User | char(80) | utf8mb3_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) | utf8mb3_bin | NO | PRI | | | select,insert,update,references | | +| User | char(80) | utf8mb3_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_column_privileges.result b/mysql-test/suite/funcs_1/r/is_column_privileges.result index 9a3e7171430a..ac722f11ae43 100644 --- a/mysql-test/suite/funcs_1/r/is_column_privileges.result +++ b/mysql-test/suite/funcs_1/r/is_column_privileges.result @@ -28,7 +28,7 @@ DROP FUNCTION test.f1; ######################################################################### DESCRIBE information_schema.COLUMN_PRIVILEGES; Field Type Null Key Default Extra -GRANTEE varchar(292) NO +GRANTEE varchar(340) NO TABLE_CATALOG varchar(512) NO TABLE_SCHEMA varchar(64) NO TABLE_NAME varchar(64) NO @@ -38,7 +38,7 @@ IS_GRANTABLE varchar(3) NO SHOW CREATE TABLE information_schema.COLUMN_PRIVILEGES; Table Create Table COLUMN_PRIVILEGES CREATE TEMPORARY TABLE `COLUMN_PRIVILEGES` ( - `GRANTEE` varchar(292) NOT NULL DEFAULT '', + `GRANTEE` varchar(340) NOT NULL DEFAULT '', `TABLE_CATALOG` varchar(512) NOT NULL DEFAULT '', `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '', `TABLE_NAME` varchar(64) NOT NULL DEFAULT '', @@ -48,7 +48,7 @@ COLUMN_PRIVILEGES CREATE TEMPORARY TABLE `COLUMN_PRIVILEGES` ( ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 SHOW COLUMNS FROM information_schema.COLUMN_PRIVILEGES; Field Type Null Key Default Extra -GRANTEE varchar(292) NO +GRANTEE varchar(340) NO TABLE_CATALOG varchar(512) NO TABLE_SCHEMA varchar(64) NO TABLE_NAME varchar(64) NO 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 003cdc9ec894..b19f3ba797f6 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 @@ -6,18 +6,18 @@ ORDER BY table_schema, table_name COLLATE utf8mb3_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 information_schema ADMINISTRABLE_ROLE_AUTHORIZATIONS USER 1 NULL YES varchar 97 291 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(97) select NULL +def information_schema ADMINISTRABLE_ROLE_AUTHORIZATIONS USER 1 NULL YES varchar 241 723 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(241) select NULL def information_schema ADMINISTRABLE_ROLE_AUTHORIZATIONS HOST 2 NULL YES varchar 256 768 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(256) select NULL -def information_schema ADMINISTRABLE_ROLE_AUTHORIZATIONS GRANTEE 3 NULL YES varchar 97 388 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(97) select NULL +def information_schema ADMINISTRABLE_ROLE_AUTHORIZATIONS GRANTEE 3 NULL YES varchar 241 964 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(241) select NULL def information_schema ADMINISTRABLE_ROLE_AUTHORIZATIONS GRANTEE_HOST 4 NULL YES varchar 256 1024 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(256) select NULL def information_schema ADMINISTRABLE_ROLE_AUTHORIZATIONS ROLE_NAME 5 NULL YES varchar 255 1020 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(255) select NULL def information_schema ADMINISTRABLE_ROLE_AUTHORIZATIONS ROLE_HOST 6 NULL YES varchar 256 1024 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(256) select NULL def information_schema ADMINISTRABLE_ROLE_AUTHORIZATIONS IS_GRANTABLE 7 NO varchar 3 9 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(3) select NULL def information_schema ADMINISTRABLE_ROLE_AUTHORIZATIONS IS_DEFAULT 8 NULL YES varchar 3 9 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(3) select NULL def information_schema ADMINISTRABLE_ROLE_AUTHORIZATIONS IS_MANDATORY 9 NO varchar 3 9 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(3) select NULL -def information_schema APPLICABLE_ROLES USER 1 NULL YES varchar 97 291 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(97) select NULL +def information_schema APPLICABLE_ROLES USER 1 NULL YES varchar 241 723 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(241) select NULL def information_schema APPLICABLE_ROLES HOST 2 NULL YES varchar 256 768 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(256) select NULL -def information_schema APPLICABLE_ROLES GRANTEE 3 NULL YES varchar 97 388 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(97) select NULL +def information_schema APPLICABLE_ROLES GRANTEE 3 NULL YES varchar 241 964 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(241) select NULL def information_schema APPLICABLE_ROLES GRANTEE_HOST 4 NULL YES varchar 256 1024 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(256) select NULL def information_schema APPLICABLE_ROLES ROLE_NAME 5 NULL YES varchar 255 1020 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(255) select NULL def information_schema APPLICABLE_ROLES ROLE_HOST 6 NULL YES varchar 256 1024 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(256) select NULL @@ -69,7 +69,7 @@ def information_schema COLUMNS_EXTENSIONS TABLE_NAME 3 NULL NO varchar 64 192 NU def information_schema COLUMNS_EXTENSIONS COLUMN_NAME 4 NULL YES varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_bin varchar(64) select NULL def information_schema COLUMNS_EXTENSIONS ENGINE_ATTRIBUTE 5 NULL YES json NULL NULL NULL NULL NULL NULL NULL json select NULL def information_schema COLUMNS_EXTENSIONS SECONDARY_ENGINE_ATTRIBUTE 6 NULL YES json NULL NULL NULL NULL NULL NULL NULL json select NULL -def information_schema COLUMN_PRIVILEGES GRANTEE 1 NO varchar 97 292 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(292) select NULL +def information_schema COLUMN_PRIVILEGES GRANTEE 1 NO varchar 113 340 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(340) select NULL def information_schema COLUMN_PRIVILEGES TABLE_CATALOG 2 NO varchar 170 512 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(512) select NULL def information_schema COLUMN_PRIVILEGES TABLE_SCHEMA 3 NO varchar 21 64 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) select NULL def information_schema COLUMN_PRIVILEGES TABLE_NAME 4 NO varchar 21 64 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) select NULL @@ -223,7 +223,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 utf8mb3 utf8mb3_general_ci varchar(80) select NULL def information_schema PLUGINS LOAD_OPTION 11 NO varchar 21 64 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) select NULL def information_schema PROCESSLIST ID 1 NO bigint NULL NULL NULL NULL NULL NULL NULL bigint unsigned select NULL -def information_schema PROCESSLIST USER 2 NO varchar 10 32 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) select NULL +def information_schema PROCESSLIST USER 2 NO varchar 26 80 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(80) select NULL def information_schema PROCESSLIST HOST 3 NO varchar 87 261 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(261) select NULL def information_schema PROCESSLIST DB 4 YES varchar 21 64 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) select NULL def information_schema PROCESSLIST COMMAND 5 NO varchar 5 16 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(16) select NULL @@ -360,9 +360,9 @@ def information_schema ROCKSDB_TRX HAS_DEADLOCK_DETECTION 12 NO int NULL NULL N def information_schema ROCKSDB_TRX NUM_ONGOING_BULKLOAD 13 NO int NULL NULL NULL NULL NULL NULL NULL int select NULL def information_schema ROCKSDB_TRX THREAD_ID 14 NO int NULL NULL NULL NULL NULL NULL NULL int select NULL def information_schema ROCKSDB_TRX QUERY 15 NO varchar 64 193 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(193) select NULL -def information_schema ROLE_COLUMN_GRANTS GRANTOR 1 NULL YES varchar 97 291 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(97) select NULL +def information_schema ROLE_COLUMN_GRANTS GRANTOR 1 NULL YES varchar 241 723 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(241) select NULL def information_schema ROLE_COLUMN_GRANTS GRANTOR_HOST 2 NULL YES varchar 256 768 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(256) select NULL -def information_schema ROLE_COLUMN_GRANTS GRANTEE 3 NO char 32 96 NULL NULL NULL utf8mb3 utf8mb3_bin char(32) select NULL +def information_schema ROLE_COLUMN_GRANTS GRANTEE 3 NO char 80 240 NULL NULL NULL utf8mb3 utf8mb3_bin char(80) select NULL def information_schema ROLE_COLUMN_GRANTS GRANTEE_HOST 4 NO char 255 255 NULL NULL NULL ascii ascii_general_ci char(255) select NULL def information_schema ROLE_COLUMN_GRANTS TABLE_CATALOG 5 NO varchar 3 9 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(3) select NULL def information_schema ROLE_COLUMN_GRANTS TABLE_SCHEMA 6 NO char 64 192 NULL NULL NULL utf8mb3 utf8mb3_bin char(64) select NULL @@ -370,9 +370,9 @@ def information_schema ROLE_COLUMN_GRANTS TABLE_NAME 7 NO char 64 192 NULL NULL def information_schema ROLE_COLUMN_GRANTS COLUMN_NAME 8 NO char 64 192 NULL NULL NULL utf8mb3 utf8mb3_bin char(64) select NULL def information_schema ROLE_COLUMN_GRANTS PRIVILEGE_TYPE 9 NO set 31 93 NULL NULL NULL utf8mb3 utf8mb3_general_ci set('Select','Insert','Update','References') select NULL def information_schema ROLE_COLUMN_GRANTS IS_GRANTABLE 10 NO varchar 3 9 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(3) select NULL -def information_schema ROLE_ROUTINE_GRANTS GRANTOR 1 NULL YES varchar 97 291 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(97) select NULL +def information_schema ROLE_ROUTINE_GRANTS GRANTOR 1 NULL YES varchar 241 723 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(241) select NULL def information_schema ROLE_ROUTINE_GRANTS GRANTOR_HOST 2 NULL YES varchar 256 768 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(256) select NULL -def information_schema ROLE_ROUTINE_GRANTS GRANTEE 3 NO char 32 96 NULL NULL NULL utf8mb3 utf8mb3_bin char(32) select NULL +def information_schema ROLE_ROUTINE_GRANTS GRANTEE 3 NO char 80 240 NULL NULL NULL utf8mb3 utf8mb3_bin char(80) select NULL def information_schema ROLE_ROUTINE_GRANTS GRANTEE_HOST 4 NO char 255 255 NULL NULL NULL ascii ascii_general_ci char(255) select NULL def information_schema ROLE_ROUTINE_GRANTS SPECIFIC_CATALOG 5 NO varchar 3 9 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(3) select NULL def information_schema ROLE_ROUTINE_GRANTS SPECIFIC_SCHEMA 6 NO char 64 192 NULL NULL NULL utf8mb3 utf8mb3_bin char(64) select NULL @@ -382,9 +382,9 @@ def information_schema ROLE_ROUTINE_GRANTS ROUTINE_SCHEMA 9 NO char 64 192 NULL def information_schema ROLE_ROUTINE_GRANTS ROUTINE_NAME 10 NO char 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci char(64) select NULL def information_schema ROLE_ROUTINE_GRANTS PRIVILEGE_TYPE 11 NO set 27 81 NULL NULL NULL utf8mb3 utf8mb3_general_ci set('Execute','Alter Routine','Grant') select NULL def information_schema ROLE_ROUTINE_GRANTS IS_GRANTABLE 12 NO varchar 3 9 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(3) select NULL -def information_schema ROLE_TABLE_GRANTS GRANTOR 1 NULL YES varchar 97 291 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(97) select NULL +def information_schema ROLE_TABLE_GRANTS GRANTOR 1 NULL YES varchar 241 723 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(241) select NULL def information_schema ROLE_TABLE_GRANTS GRANTOR_HOST 2 NULL YES varchar 256 768 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(256) select NULL -def information_schema ROLE_TABLE_GRANTS GRANTEE 3 NO char 32 96 NULL NULL NULL utf8mb3 utf8mb3_bin char(32) select NULL +def information_schema ROLE_TABLE_GRANTS GRANTEE 3 NO char 80 240 NULL NULL NULL utf8mb3 utf8mb3_bin char(80) select NULL def information_schema ROLE_TABLE_GRANTS GRANTEE_HOST 4 NO char 255 255 NULL NULL NULL ascii ascii_general_ci char(255) select NULL def information_schema ROLE_TABLE_GRANTS TABLE_CATALOG 5 NO varchar 3 9 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(3) select NULL def information_schema ROLE_TABLE_GRANTS TABLE_SCHEMA 6 NO char 64 192 NULL NULL NULL utf8mb3 utf8mb3_bin char(64) select NULL @@ -431,7 +431,7 @@ def information_schema SCHEMATA DEFAULT_ENCRYPTION 6 NULL NO enum 3 9 NULL NULL def information_schema SCHEMATA_EXTENSIONS CATALOG_NAME 1 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_bin varchar(64) select NULL def information_schema SCHEMATA_EXTENSIONS SCHEMA_NAME 2 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_bin varchar(64) select NULL def information_schema SCHEMATA_EXTENSIONS OPTIONS 3 NULL YES varchar 256 768 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(256) select NULL -def information_schema SCHEMA_PRIVILEGES GRANTEE 1 NO varchar 97 292 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(292) select NULL +def information_schema SCHEMA_PRIVILEGES GRANTEE 1 NO varchar 113 340 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(340) select NULL def information_schema SCHEMA_PRIVILEGES TABLE_CATALOG 2 NO varchar 170 512 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(512) select NULL def information_schema SCHEMA_PRIVILEGES TABLE_SCHEMA 3 NO varchar 21 64 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) select NULL def information_schema SCHEMA_PRIVILEGES PRIVILEGE_TYPE 4 NO varchar 21 64 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) select NULL @@ -521,7 +521,7 @@ def information_schema TABLE_CONSTRAINTS_EXTENSIONS CONSTRAINT_NAME 3 NULL NO va def information_schema TABLE_CONSTRAINTS_EXTENSIONS TABLE_NAME 4 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_bin varchar(64) select NULL def information_schema TABLE_CONSTRAINTS_EXTENSIONS ENGINE_ATTRIBUTE 5 NULL YES json NULL NULL NULL NULL NULL NULL NULL json select NULL def information_schema TABLE_CONSTRAINTS_EXTENSIONS SECONDARY_ENGINE_ATTRIBUTE 6 NULL YES json NULL NULL NULL NULL NULL NULL NULL json select NULL -def information_schema TABLE_PRIVILEGES GRANTEE 1 NO varchar 97 292 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(292) select NULL +def information_schema TABLE_PRIVILEGES GRANTEE 1 NO varchar 113 340 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(340) select NULL def information_schema TABLE_PRIVILEGES TABLE_CATALOG 2 NO varchar 170 512 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(512) select NULL def information_schema TABLE_PRIVILEGES TABLE_SCHEMA 3 NO varchar 21 64 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) select NULL def information_schema TABLE_PRIVILEGES TABLE_NAME 4 NO varchar 21 64 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) select NULL @@ -549,10 +549,10 @@ def information_schema TRIGGERS DEFINER 19 NULL NO varchar 288 864 NULL NULL NUL def information_schema TRIGGERS CHARACTER_SET_CLIENT 20 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) select NULL def information_schema TRIGGERS COLLATION_CONNECTION 21 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) select NULL def information_schema TRIGGERS DATABASE_COLLATION 22 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) select NULL -def information_schema USER_ATTRIBUTES USER 1 NO char 32 96 NULL NULL NULL utf8mb3 utf8mb3_bin char(32) select NULL +def information_schema USER_ATTRIBUTES USER 1 NO char 80 240 NULL NULL NULL utf8mb3 utf8mb3_bin char(80) select NULL def information_schema USER_ATTRIBUTES HOST 2 NO char 255 255 NULL NULL NULL ascii ascii_general_ci char(255) select NULL def information_schema USER_ATTRIBUTES ATTRIBUTE 3 NULL YES longtext 4294967295 4294967295 NULL NULL NULL utf8mb4 utf8mb4_bin longtext select NULL -def information_schema USER_PRIVILEGES GRANTEE 1 NO varchar 97 292 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(292) select NULL +def information_schema USER_PRIVILEGES GRANTEE 1 NO varchar 113 340 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(340) select NULL def information_schema USER_PRIVILEGES TABLE_CATALOG 2 NO varchar 170 512 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(512) select NULL def information_schema USER_PRIVILEGES PRIVILEGE_TYPE 3 NO varchar 21 64 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) select NULL def information_schema USER_PRIVILEGES IS_GRANTABLE 4 NO varchar 1 3 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(3) select NULL @@ -619,7 +619,7 @@ COL_CML DATA_TYPE CHARACTER_SET_NAME COLLATION_NAME 3.0000 varchar utf8mb3 utf8mb3_general_ci 3.0029 varchar utf8mb3 utf8mb3_general_ci 3.0075 varchar utf8mb3 utf8mb3_general_ci -3.0103 varchar utf8mb3 utf8mb3_general_ci +3.0088 varchar utf8mb3 utf8mb3_general_ci 3.0118 varchar utf8mb3 utf8mb3_general_ci 3.0156 varchar utf8mb3 utf8mb3_general_ci 3.0238 varchar utf8mb3 utf8mb3_general_ci @@ -669,18 +669,18 @@ WHERE table_schema = 'information_schema' AND table_name <> 'PROFILING' AND table_name not like 'INNODB_%' AND table_name not like 'ndb%' ORDER BY TABLE_SCHEMA, TABLE_NAME COLLATE utf8mb3_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 information_schema ADMINISTRABLE_ROLE_AUTHORIZATIONS USER varchar 97 291 utf8mb3 utf8mb3_general_ci varchar(97) +3.0000 information_schema ADMINISTRABLE_ROLE_AUTHORIZATIONS USER varchar 241 723 utf8mb3 utf8mb3_general_ci varchar(241) 3.0000 information_schema ADMINISTRABLE_ROLE_AUTHORIZATIONS HOST varchar 256 768 utf8mb3 utf8mb3_general_ci varchar(256) -4.0000 information_schema ADMINISTRABLE_ROLE_AUTHORIZATIONS GRANTEE varchar 97 388 utf8mb4 utf8mb4_0900_ai_ci varchar(97) +4.0000 information_schema ADMINISTRABLE_ROLE_AUTHORIZATIONS GRANTEE varchar 241 964 utf8mb4 utf8mb4_0900_ai_ci varchar(241) 4.0000 information_schema ADMINISTRABLE_ROLE_AUTHORIZATIONS GRANTEE_HOST varchar 256 1024 utf8mb4 utf8mb4_0900_ai_ci varchar(256) 4.0000 information_schema ADMINISTRABLE_ROLE_AUTHORIZATIONS ROLE_NAME varchar 255 1020 utf8mb4 utf8mb4_0900_ai_ci varchar(255) 4.0000 information_schema ADMINISTRABLE_ROLE_AUTHORIZATIONS ROLE_HOST varchar 256 1024 utf8mb4 utf8mb4_0900_ai_ci varchar(256) 3.0000 information_schema ADMINISTRABLE_ROLE_AUTHORIZATIONS IS_GRANTABLE varchar 3 9 utf8mb3 utf8mb3_general_ci varchar(3) 3.0000 information_schema ADMINISTRABLE_ROLE_AUTHORIZATIONS IS_DEFAULT varchar 3 9 utf8mb3 utf8mb3_general_ci varchar(3) 3.0000 information_schema ADMINISTRABLE_ROLE_AUTHORIZATIONS IS_MANDATORY varchar 3 9 utf8mb3 utf8mb3_general_ci varchar(3) -3.0000 information_schema APPLICABLE_ROLES USER varchar 97 291 utf8mb3 utf8mb3_general_ci varchar(97) +3.0000 information_schema APPLICABLE_ROLES USER varchar 241 723 utf8mb3 utf8mb3_general_ci varchar(241) 3.0000 information_schema APPLICABLE_ROLES HOST varchar 256 768 utf8mb3 utf8mb3_general_ci varchar(256) -4.0000 information_schema APPLICABLE_ROLES GRANTEE varchar 97 388 utf8mb4 utf8mb4_0900_ai_ci varchar(97) +4.0000 information_schema APPLICABLE_ROLES GRANTEE varchar 241 964 utf8mb4 utf8mb4_0900_ai_ci varchar(241) 4.0000 information_schema APPLICABLE_ROLES GRANTEE_HOST varchar 256 1024 utf8mb4 utf8mb4_0900_ai_ci varchar(256) 4.0000 information_schema APPLICABLE_ROLES ROLE_NAME varchar 255 1020 utf8mb4 utf8mb4_0900_ai_ci varchar(255) 4.0000 information_schema APPLICABLE_ROLES ROLE_HOST varchar 256 1024 utf8mb4 utf8mb4_0900_ai_ci varchar(256) @@ -732,7 +732,7 @@ NULL information_schema COLUMNS SRS_ID int NULL NULL NULL NULL int unsigned 3.0000 information_schema COLUMNS_EXTENSIONS COLUMN_NAME varchar 64 192 utf8mb3 utf8mb3_bin varchar(64) NULL information_schema COLUMNS_EXTENSIONS ENGINE_ATTRIBUTE json NULL NULL NULL NULL json NULL information_schema COLUMNS_EXTENSIONS SECONDARY_ENGINE_ATTRIBUTE json NULL NULL NULL NULL json -3.0103 information_schema COLUMN_PRIVILEGES GRANTEE varchar 97 292 utf8mb3 utf8mb3_general_ci varchar(292) +3.0088 information_schema COLUMN_PRIVILEGES GRANTEE varchar 113 340 utf8mb3 utf8mb3_general_ci varchar(340) 3.0118 information_schema COLUMN_PRIVILEGES TABLE_CATALOG varchar 170 512 utf8mb3 utf8mb3_general_ci varchar(512) 3.0476 information_schema COLUMN_PRIVILEGES TABLE_SCHEMA varchar 21 64 utf8mb3 utf8mb3_general_ci varchar(64) 3.0476 information_schema COLUMN_PRIVILEGES TABLE_NAME varchar 21 64 utf8mb3 utf8mb3_general_ci varchar(64) @@ -886,7 +886,7 @@ NULL information_schema PARTITIONS CHECKSUM bigint NULL NULL NULL NULL bigint 3.0769 information_schema PLUGINS PLUGIN_LICENSE varchar 26 80 utf8mb3 utf8mb3_general_ci varchar(80) 3.0476 information_schema PLUGINS LOAD_OPTION varchar 21 64 utf8mb3 utf8mb3_general_ci varchar(64) NULL information_schema PROCESSLIST ID bigint NULL NULL NULL NULL bigint unsigned -3.2000 information_schema PROCESSLIST USER varchar 10 32 utf8mb3 utf8mb3_general_ci varchar(32) +3.0769 information_schema PROCESSLIST USER varchar 26 80 utf8mb3 utf8mb3_general_ci varchar(80) 3.0000 information_schema PROCESSLIST HOST varchar 87 261 utf8mb3 utf8mb3_general_ci varchar(261) 3.0476 information_schema PROCESSLIST DB varchar 21 64 utf8mb3 utf8mb3_general_ci varchar(64) 3.2000 information_schema PROCESSLIST COMMAND varchar 5 16 utf8mb3 utf8mb3_general_ci varchar(16) @@ -1023,9 +1023,9 @@ NULL information_schema ROCKSDB_TRX HAS_DEADLOCK_DETECTION int NULL NULL NULL NU NULL information_schema ROCKSDB_TRX NUM_ONGOING_BULKLOAD int NULL NULL NULL NULL int NULL information_schema ROCKSDB_TRX THREAD_ID int NULL NULL NULL NULL int 3.0156 information_schema ROCKSDB_TRX QUERY varchar 64 193 utf8mb3 utf8mb3_general_ci varchar(193) -3.0000 information_schema ROLE_COLUMN_GRANTS GRANTOR varchar 97 291 utf8mb3 utf8mb3_general_ci varchar(97) +3.0000 information_schema ROLE_COLUMN_GRANTS GRANTOR varchar 241 723 utf8mb3 utf8mb3_general_ci varchar(241) 3.0000 information_schema ROLE_COLUMN_GRANTS GRANTOR_HOST varchar 256 768 utf8mb3 utf8mb3_general_ci varchar(256) -3.0000 information_schema ROLE_COLUMN_GRANTS GRANTEE char 32 96 utf8mb3 utf8mb3_bin char(32) +3.0000 information_schema ROLE_COLUMN_GRANTS GRANTEE char 80 240 utf8mb3 utf8mb3_bin char(80) 1.0000 information_schema ROLE_COLUMN_GRANTS GRANTEE_HOST char 255 255 ascii ascii_general_ci char(255) 3.0000 information_schema ROLE_COLUMN_GRANTS TABLE_CATALOG varchar 3 9 utf8mb3 utf8mb3_general_ci varchar(3) 3.0000 information_schema ROLE_COLUMN_GRANTS TABLE_SCHEMA char 64 192 utf8mb3 utf8mb3_bin char(64) @@ -1033,9 +1033,9 @@ NULL information_schema ROCKSDB_TRX THREAD_ID int NULL NULL NULL NULL int 3.0000 information_schema ROLE_COLUMN_GRANTS COLUMN_NAME char 64 192 utf8mb3 utf8mb3_bin char(64) 3.0000 information_schema ROLE_COLUMN_GRANTS PRIVILEGE_TYPE set 31 93 utf8mb3 utf8mb3_general_ci set('Select','Insert','Update','References') 3.0000 information_schema ROLE_COLUMN_GRANTS IS_GRANTABLE varchar 3 9 utf8mb3 utf8mb3_general_ci varchar(3) -3.0000 information_schema ROLE_ROUTINE_GRANTS GRANTOR varchar 97 291 utf8mb3 utf8mb3_general_ci varchar(97) +3.0000 information_schema ROLE_ROUTINE_GRANTS GRANTOR varchar 241 723 utf8mb3 utf8mb3_general_ci varchar(241) 3.0000 information_schema ROLE_ROUTINE_GRANTS GRANTOR_HOST varchar 256 768 utf8mb3 utf8mb3_general_ci varchar(256) -3.0000 information_schema ROLE_ROUTINE_GRANTS GRANTEE char 32 96 utf8mb3 utf8mb3_bin char(32) +3.0000 information_schema ROLE_ROUTINE_GRANTS GRANTEE char 80 240 utf8mb3 utf8mb3_bin char(80) 1.0000 information_schema ROLE_ROUTINE_GRANTS GRANTEE_HOST char 255 255 ascii ascii_general_ci char(255) 3.0000 information_schema ROLE_ROUTINE_GRANTS SPECIFIC_CATALOG varchar 3 9 utf8mb3 utf8mb3_general_ci varchar(3) 3.0000 information_schema ROLE_ROUTINE_GRANTS SPECIFIC_SCHEMA char 64 192 utf8mb3 utf8mb3_bin char(64) @@ -1045,9 +1045,9 @@ NULL information_schema ROCKSDB_TRX THREAD_ID int NULL NULL NULL NULL int 3.0000 information_schema ROLE_ROUTINE_GRANTS ROUTINE_NAME char 64 192 utf8mb3 utf8mb3_general_ci char(64) 3.0000 information_schema ROLE_ROUTINE_GRANTS PRIVILEGE_TYPE set 27 81 utf8mb3 utf8mb3_general_ci set('Execute','Alter Routine','Grant') 3.0000 information_schema ROLE_ROUTINE_GRANTS IS_GRANTABLE varchar 3 9 utf8mb3 utf8mb3_general_ci varchar(3) -3.0000 information_schema ROLE_TABLE_GRANTS GRANTOR varchar 97 291 utf8mb3 utf8mb3_general_ci varchar(97) +3.0000 information_schema ROLE_TABLE_GRANTS GRANTOR varchar 241 723 utf8mb3 utf8mb3_general_ci varchar(241) 3.0000 information_schema ROLE_TABLE_GRANTS GRANTOR_HOST varchar 256 768 utf8mb3 utf8mb3_general_ci varchar(256) -3.0000 information_schema ROLE_TABLE_GRANTS GRANTEE char 32 96 utf8mb3 utf8mb3_bin char(32) +3.0000 information_schema ROLE_TABLE_GRANTS GRANTEE char 80 240 utf8mb3 utf8mb3_bin char(80) 1.0000 information_schema ROLE_TABLE_GRANTS GRANTEE_HOST char 255 255 ascii ascii_general_ci char(255) 3.0000 information_schema ROLE_TABLE_GRANTS TABLE_CATALOG varchar 3 9 utf8mb3 utf8mb3_general_ci varchar(3) 3.0000 information_schema ROLE_TABLE_GRANTS TABLE_SCHEMA char 64 192 utf8mb3 utf8mb3_bin char(64) @@ -1094,7 +1094,7 @@ NULL information_schema SCHEMATA SQL_PATH binary 0 0 NULL NULL binary(0) 3.0000 information_schema SCHEMATA_EXTENSIONS CATALOG_NAME varchar 64 192 utf8mb3 utf8mb3_bin varchar(64) 3.0000 information_schema SCHEMATA_EXTENSIONS SCHEMA_NAME varchar 64 192 utf8mb3 utf8mb3_bin varchar(64) 3.0000 information_schema SCHEMATA_EXTENSIONS OPTIONS varchar 256 768 utf8mb3 utf8mb3_general_ci varchar(256) -3.0103 information_schema SCHEMA_PRIVILEGES GRANTEE varchar 97 292 utf8mb3 utf8mb3_general_ci varchar(292) +3.0088 information_schema SCHEMA_PRIVILEGES GRANTEE varchar 113 340 utf8mb3 utf8mb3_general_ci varchar(340) 3.0118 information_schema SCHEMA_PRIVILEGES TABLE_CATALOG varchar 170 512 utf8mb3 utf8mb3_general_ci varchar(512) 3.0476 information_schema SCHEMA_PRIVILEGES TABLE_SCHEMA varchar 21 64 utf8mb3 utf8mb3_general_ci varchar(64) 3.0476 information_schema SCHEMA_PRIVILEGES PRIVILEGE_TYPE varchar 21 64 utf8mb3 utf8mb3_general_ci varchar(64) @@ -1184,7 +1184,7 @@ NULL information_schema TABLES_EXTENSIONS SECONDARY_ENGINE_ATTRIBUTE json NULL N 3.0000 information_schema TABLE_CONSTRAINTS_EXTENSIONS TABLE_NAME varchar 64 192 utf8mb3 utf8mb3_bin varchar(64) NULL information_schema TABLE_CONSTRAINTS_EXTENSIONS ENGINE_ATTRIBUTE json NULL NULL NULL NULL json NULL information_schema TABLE_CONSTRAINTS_EXTENSIONS SECONDARY_ENGINE_ATTRIBUTE json NULL NULL NULL NULL json -3.0103 information_schema TABLE_PRIVILEGES GRANTEE varchar 97 292 utf8mb3 utf8mb3_general_ci varchar(292) +3.0088 information_schema TABLE_PRIVILEGES GRANTEE varchar 113 340 utf8mb3 utf8mb3_general_ci varchar(340) 3.0118 information_schema TABLE_PRIVILEGES TABLE_CATALOG varchar 170 512 utf8mb3 utf8mb3_general_ci varchar(512) 3.0476 information_schema TABLE_PRIVILEGES TABLE_SCHEMA varchar 21 64 utf8mb3 utf8mb3_general_ci varchar(64) 3.0476 information_schema TABLE_PRIVILEGES TABLE_NAME varchar 21 64 utf8mb3 utf8mb3_general_ci varchar(64) @@ -1212,10 +1212,10 @@ NULL information_schema TRIGGERS CREATED timestamp NULL NULL NULL NULL timestamp 3.0000 information_schema TRIGGERS CHARACTER_SET_CLIENT varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) 3.0000 information_schema TRIGGERS COLLATION_CONNECTION varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) 3.0000 information_schema TRIGGERS DATABASE_COLLATION varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) -3.0000 information_schema USER_ATTRIBUTES USER char 32 96 utf8mb3 utf8mb3_bin char(32) +3.0000 information_schema USER_ATTRIBUTES USER char 80 240 utf8mb3 utf8mb3_bin char(80) 1.0000 information_schema USER_ATTRIBUTES HOST char 255 255 ascii ascii_general_ci char(255) 1.0000 information_schema USER_ATTRIBUTES ATTRIBUTE longtext 4294967295 4294967295 utf8mb4 utf8mb4_bin longtext -3.0103 information_schema USER_PRIVILEGES GRANTEE varchar 97 292 utf8mb3 utf8mb3_general_ci varchar(292) +3.0088 information_schema USER_PRIVILEGES GRANTEE varchar 113 340 utf8mb3 utf8mb3_general_ci varchar(340) 3.0118 information_schema USER_PRIVILEGES TABLE_CATALOG varchar 170 512 utf8mb3 utf8mb3_general_ci varchar(512) 3.0476 information_schema USER_PRIVILEGES PRIVILEGE_TYPE varchar 21 64 utf8mb3 utf8mb3_general_ci varchar(64) 3.0000 information_schema USER_PRIVILEGES IS_GRANTABLE varchar 1 3 utf8mb3 utf8mb3_general_ci varchar(3) 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 715555566680..cc922ae0bcb8 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 255 255 NULL NULL NULL ascii ascii_general_ci char(255) PRI select,insert,update,references NULL def mysql columns_priv Db 2 NO char 64 192 NULL NULL NULL utf8mb3 utf8mb3_bin char(64) PRI select,insert,update,references NULL -def mysql columns_priv User 3 NO char 32 96 NULL NULL NULL utf8mb3 utf8mb3_bin char(32) PRI select,insert,update,references NULL +def mysql columns_priv User 3 NO char 80 240 NULL NULL NULL utf8mb3 utf8mb3_bin char(80) PRI select,insert,update,references NULL def mysql columns_priv Table_name 4 NO char 64 192 NULL NULL NULL utf8mb3 utf8mb3_bin char(64) PRI select,insert,update,references NULL def mysql columns_priv Column_name 5 NO char 64 192 NULL NULL NULL utf8mb3 utf8mb3_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 utf8mb3 utf8mb3_general_ci text select,insert,update,references NULL def mysql db Host 1 NO char 255 255 NULL NULL NULL ascii ascii_general_ci char(255) PRI select,insert,update,references NULL def mysql db Db 2 NO char 64 192 NULL NULL NULL utf8mb3 utf8mb3_bin char(64) PRI select,insert,update,references NULL -def mysql db User 3 NO char 32 96 NULL NULL NULL utf8mb3 utf8mb3_bin char(32) PRI select,insert,update,references NULL +def mysql db User 3 NO char 80 240 NULL NULL NULL utf8mb3 utf8mb3_bin char(80) PRI select,insert,update,references NULL def mysql db Select_priv 4 N NO enum 1 3 NULL NULL NULL utf8mb3 utf8mb3_general_ci enum('N','Y') select,insert,update,references NULL def mysql db Insert_priv 5 N NO enum 1 3 NULL NULL NULL utf8mb3 utf8mb3_general_ci enum('N','Y') select,insert,update,references NULL def mysql db Update_priv 6 N NO enum 1 3 NULL NULL NULL utf8mb3 utf8mb3_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 utf8mb3 utf8mb3_genera def mysql db Event_priv 21 N NO enum 1 3 NULL NULL NULL utf8mb3 utf8mb3_general_ci enum('N','Y') select,insert,update,references NULL def mysql db Trigger_priv 22 N NO enum 1 3 NULL NULL NULL utf8mb3 utf8mb3_general_ci enum('N','Y') select,insert,update,references NULL def mysql default_roles HOST 1 NO char 255 255 NULL NULL NULL ascii ascii_general_ci char(255) PRI select,insert,update,references NULL -def mysql default_roles USER 2 NO char 32 96 NULL NULL NULL utf8mb3 utf8mb3_bin char(32) PRI select,insert,update,references NULL +def mysql default_roles USER 2 NO char 80 240 NULL NULL NULL utf8mb3 utf8mb3_bin char(80) PRI select,insert,update,references NULL def mysql default_roles DEFAULT_ROLE_HOST 3 % NO char 255 255 NULL NULL NULL ascii ascii_general_ci char(255) PRI select,insert,update,references NULL -def mysql default_roles DEFAULT_ROLE_USER 4 NO char 32 96 NULL NULL NULL utf8mb3 utf8mb3_bin char(32) PRI select,insert,update,references NULL +def mysql default_roles DEFAULT_ROLE_USER 4 NO char 80 240 NULL NULL NULL utf8mb3 utf8mb3_bin char(80) PRI select,insert,update,references NULL def mysql engine_cost engine_name 1 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_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 PRI select,insert,update,references NULL def mysql engine_cost cost_name 3 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_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 unsigned select,insert,update,references NULL def mysql general_log command_type 5 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_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 utf8mb3 utf8mb3_bin char(32) PRI select,insert,update,references NULL +def mysql global_grants USER 1 NO char 80 240 NULL NULL NULL utf8mb3 utf8mb3_bin char(80) PRI select,insert,update,references NULL def mysql global_grants HOST 2 NO char 255 255 NULL NULL NULL ascii ascii_general_ci char(255) PRI select,insert,update,references NULL def mysql global_grants PRIV 3 NO char 32 96 NULL NULL NULL utf8mb3 utf8mb3_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 utf8mb3 utf8mb3_general_ci enum('N','Y') select,insert,update,references NULL @@ -95,23 +95,23 @@ 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 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 unsigned select,insert,update,references NULL def mysql password_history Host 1 NO char 255 255 NULL NULL NULL ascii ascii_general_ci char(255) PRI select,insert,update,references NULL -def mysql password_history User 2 NO char 32 96 NULL NULL NULL utf8mb3 utf8mb3_bin char(32) PRI select,insert,update,references NULL +def mysql password_history User 2 NO char 80 240 NULL NULL NULL utf8mb3 utf8mb3_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 utf8mb3 utf8mb3_bin text select,insert,update,references NULL def mysql plugin name 1 NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) PRI select,insert,update,references NULL def mysql plugin dl 2 NO varchar 128 384 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(128) select,insert,update,references NULL def mysql procs_priv Host 1 NO char 255 255 NULL NULL NULL ascii ascii_general_ci char(255) PRI select,insert,update,references NULL def mysql procs_priv Db 2 NO char 64 192 NULL NULL NULL utf8mb3 utf8mb3_bin char(64) PRI select,insert,update,references NULL -def mysql procs_priv User 3 NO char 32 96 NULL NULL NULL utf8mb3 utf8mb3_bin char(32) PRI select,insert,update,references NULL +def mysql procs_priv User 3 NO char 80 240 NULL NULL NULL utf8mb3 utf8mb3_bin char(80) PRI select,insert,update,references NULL def mysql procs_priv Routine_name 4 NO char 64 192 NULL NULL NULL utf8mb3 utf8mb3_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 utf8mb3 utf8mb3_bin enum('FUNCTION','PROCEDURE') PRI select,insert,update,references NULL def mysql procs_priv Grantor 6 NO varchar 288 864 NULL NULL NULL utf8mb3 utf8mb3_bin varchar(288) MUL select,insert,update,references NULL def mysql procs_priv Proc_priv 7 NO set 27 81 NULL NULL NULL utf8mb3 utf8mb3_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 255 255 NULL NULL NULL ascii ascii_general_ci char(255) PRI select,insert,update,references NULL -def mysql proxies_priv User 2 NO char 32 96 NULL NULL NULL utf8mb3 utf8mb3_bin char(32) PRI select,insert,update,references NULL +def mysql proxies_priv User 2 NO char 80 240 NULL NULL NULL utf8mb3 utf8mb3_bin char(80) PRI select,insert,update,references NULL def mysql proxies_priv Proxied_host 3 NO char 255 255 NULL NULL NULL ascii ascii_general_ci char(255) PRI select,insert,update,references NULL -def mysql proxies_priv Proxied_user 4 NO char 32 96 NULL NULL NULL utf8mb3 utf8mb3_bin char(32) PRI select,insert,update,references NULL +def mysql proxies_priv Proxied_user 4 NO char 80 240 NULL NULL NULL utf8mb3 utf8mb3_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 varchar 288 864 NULL NULL NULL utf8mb3 utf8mb3_bin varchar(288) 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 @@ -134,9 +134,9 @@ def mysql replication_group_member_actions type 4 NULL NO char 64 64 NULL NULL N def mysql replication_group_member_actions priority 5 NULL NO tinyint NULL NULL 3 0 NULL NULL NULL tinyint unsigned select,insert,update,references The order on which the action will be run, value between 1 and 100, lower values first. NULL def mysql replication_group_member_actions error_handling 6 NULL NO char 64 64 NULL NULL NULL ascii ascii_general_ci char(64) select,insert,update,references On errors during the action will be handled: IGNORE, CRITICAL. NULL def mysql role_edges FROM_HOST 1 NO char 255 255 NULL NULL NULL ascii ascii_general_ci char(255) PRI select,insert,update,references NULL -def mysql role_edges FROM_USER 2 NO char 32 96 NULL NULL NULL utf8mb3 utf8mb3_bin char(32) PRI select,insert,update,references NULL +def mysql role_edges FROM_USER 2 NO char 80 240 NULL NULL NULL utf8mb3 utf8mb3_bin char(80) PRI select,insert,update,references NULL def mysql role_edges TO_HOST 3 NO char 255 255 NULL NULL NULL ascii ascii_general_ci char(255) PRI select,insert,update,references NULL -def mysql role_edges TO_USER 4 NO char 32 96 NULL NULL NULL utf8mb3 utf8mb3_bin char(32) PRI select,insert,update,references NULL +def mysql role_edges TO_USER 4 NO char 80 240 NULL NULL NULL utf8mb3 utf8mb3_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 utf8mb3 utf8mb3_general_ci enum('N','Y') select,insert,update,references NULL def mysql servers Server_name 1 NO char 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci char(64) PRI select,insert,update,references NULL def mysql servers Host 2 NO char 255 255 NULL NULL NULL ascii ascii_general_ci char(255) select,insert,update,references NULL @@ -227,7 +227,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 unsigned select,insert,update,references NULL def mysql tables_priv Host 1 NO char 255 255 NULL NULL NULL ascii ascii_general_ci char(255) PRI select,insert,update,references NULL def mysql tables_priv Db 2 NO char 64 192 NULL NULL NULL utf8mb3 utf8mb3_bin char(64) PRI select,insert,update,references NULL -def mysql tables_priv User 3 NO char 32 96 NULL NULL NULL utf8mb3 utf8mb3_bin char(32) PRI select,insert,update,references NULL +def mysql tables_priv User 3 NO char 80 240 NULL NULL NULL utf8mb3 utf8mb3_bin char(80) PRI select,insert,update,references NULL def mysql tables_priv Table_name 4 NO char 64 192 NULL NULL NULL utf8mb3 utf8mb3_bin char(64) PRI select,insert,update,references NULL def mysql tables_priv Grantor 5 NO varchar 288 864 NULL NULL NULL utf8mb3 utf8mb3_bin varchar(288) 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 @@ -248,7 +248,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 unsigned select,insert,update,references NULL def mysql time_zone_transition_type Abbreviation 5 NO char 8 24 NULL NULL NULL utf8mb3 utf8mb3_general_ci char(8) select,insert,update,references NULL def mysql user Host 1 NO char 255 255 NULL NULL NULL ascii ascii_general_ci char(255) PRI select,insert,update,references NULL -def mysql user User 2 NO char 32 96 NULL NULL NULL utf8mb3 utf8mb3_bin char(32) PRI select,insert,update,references NULL +def mysql user User 2 NO char 80 240 NULL NULL NULL utf8mb3 utf8mb3_bin char(80) PRI select,insert,update,references NULL def mysql user Select_priv 3 N NO enum 1 3 NULL NULL NULL utf8mb3 utf8mb3_general_ci enum('N','Y') select,insert,update,references NULL def mysql user Insert_priv 4 N NO enum 1 3 NULL NULL NULL utf8mb3 utf8mb3_general_ci enum('N','Y') select,insert,update,references NULL def mysql user Update_priv 5 N NO enum 1 3 NULL NULL NULL utf8mb3 utf8mb3_general_ci enum('N','Y') select,insert,update,references NULL @@ -372,7 +372,7 @@ ORDER BY TABLE_SCHEMA, TABLE_NAME COLLATE utf8mb3_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 1.0000 mysql columns_priv Host char 255 255 ascii ascii_general_ci char(255) 3.0000 mysql columns_priv Db char 64 192 utf8mb3 utf8mb3_bin char(64) -3.0000 mysql columns_priv User char 32 96 utf8mb3 utf8mb3_bin char(32) +3.0000 mysql columns_priv User char 80 240 utf8mb3 utf8mb3_bin char(80) 3.0000 mysql columns_priv Table_name char 64 192 utf8mb3 utf8mb3_bin char(64) 3.0000 mysql columns_priv Column_name char 64 192 utf8mb3 utf8mb3_bin char(64) NULL mysql columns_priv Timestamp timestamp NULL NULL NULL NULL timestamp @@ -382,7 +382,7 @@ NULL mysql component component_group_id int NULL NULL NULL NULL int unsigned 1.0000 mysql component component_urn text 65535 65535 utf8mb3 utf8mb3_general_ci text 1.0000 mysql db Host char 255 255 ascii ascii_general_ci char(255) 3.0000 mysql db Db char 64 192 utf8mb3 utf8mb3_bin char(64) -3.0000 mysql db User char 32 96 utf8mb3 utf8mb3_bin char(32) +3.0000 mysql db User char 80 240 utf8mb3 utf8mb3_bin char(80) 3.0000 mysql db Select_priv enum 1 3 utf8mb3 utf8mb3_general_ci enum('N','Y') 3.0000 mysql db Insert_priv enum 1 3 utf8mb3 utf8mb3_general_ci enum('N','Y') 3.0000 mysql db Update_priv enum 1 3 utf8mb3 utf8mb3_general_ci enum('N','Y') @@ -403,9 +403,9 @@ NULL mysql component component_group_id int NULL NULL NULL NULL int unsigned 3.0000 mysql db Event_priv enum 1 3 utf8mb3 utf8mb3_general_ci enum('N','Y') 3.0000 mysql db Trigger_priv enum 1 3 utf8mb3 utf8mb3_general_ci enum('N','Y') 1.0000 mysql default_roles HOST char 255 255 ascii ascii_general_ci char(255) -3.0000 mysql default_roles USER char 32 96 utf8mb3 utf8mb3_bin char(32) +3.0000 mysql default_roles USER char 80 240 utf8mb3 utf8mb3_bin char(80) 1.0000 mysql default_roles DEFAULT_ROLE_HOST char 255 255 ascii ascii_general_ci char(255) -3.0000 mysql default_roles DEFAULT_ROLE_USER char 32 96 utf8mb3 utf8mb3_bin char(32) +3.0000 mysql default_roles DEFAULT_ROLE_USER char 80 240 utf8mb3 utf8mb3_bin char(80) 3.0000 mysql engine_cost engine_name varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) NULL mysql engine_cost device_type int NULL NULL NULL NULL int 3.0000 mysql engine_cost cost_name varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) @@ -423,7 +423,7 @@ NULL mysql general_log thread_id bigint NULL NULL NULL NULL bigint unsigned NULL mysql general_log server_id int NULL NULL NULL NULL int unsigned 3.0000 mysql general_log command_type varchar 64 192 utf8mb3 utf8mb3_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 utf8mb3 utf8mb3_bin char(32) +3.0000 mysql global_grants USER char 80 240 utf8mb3 utf8mb3_bin char(80) 1.0000 mysql global_grants HOST char 255 255 ascii ascii_general_ci char(255) 3.0000 mysql global_grants PRIV char 32 96 utf8mb3 utf8mb3_general_ci char(32) 3.0000 mysql global_grants WITH_GRANT_OPTION enum 1 3 utf8mb3 utf8mb3_general_ci enum('N','Y') @@ -460,23 +460,23 @@ NULL mysql innodb_table_stats n_rows bigint NULL NULL NULL NULL bigint unsigned NULL mysql innodb_table_stats clustered_index_size bigint NULL NULL NULL NULL bigint unsigned NULL mysql innodb_table_stats sum_of_other_index_sizes bigint NULL NULL NULL NULL bigint unsigned 1.0000 mysql password_history Host char 255 255 ascii ascii_general_ci char(255) -3.0000 mysql password_history User char 32 96 utf8mb3 utf8mb3_bin char(32) +3.0000 mysql password_history User char 80 240 utf8mb3 utf8mb3_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 utf8mb3 utf8mb3_bin text 3.0000 mysql plugin name varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) 3.0000 mysql plugin dl varchar 128 384 utf8mb3 utf8mb3_general_ci varchar(128) 1.0000 mysql procs_priv Host char 255 255 ascii ascii_general_ci char(255) 3.0000 mysql procs_priv Db char 64 192 utf8mb3 utf8mb3_bin char(64) -3.0000 mysql procs_priv User char 32 96 utf8mb3 utf8mb3_bin char(32) +3.0000 mysql procs_priv User char 80 240 utf8mb3 utf8mb3_bin char(80) 3.0000 mysql procs_priv Routine_name char 64 192 utf8mb3 utf8mb3_general_ci char(64) 3.0000 mysql procs_priv Routine_type enum 9 27 utf8mb3 utf8mb3_bin enum('FUNCTION','PROCEDURE') 3.0000 mysql procs_priv Grantor varchar 288 864 utf8mb3 utf8mb3_bin varchar(288) 3.0000 mysql procs_priv Proc_priv set 27 81 utf8mb3 utf8mb3_general_ci set('Execute','Alter Routine','Grant') NULL mysql procs_priv Timestamp timestamp NULL NULL NULL NULL timestamp 1.0000 mysql proxies_priv Host char 255 255 ascii ascii_general_ci char(255) -3.0000 mysql proxies_priv User char 32 96 utf8mb3 utf8mb3_bin char(32) +3.0000 mysql proxies_priv User char 80 240 utf8mb3 utf8mb3_bin char(80) 1.0000 mysql proxies_priv Proxied_host char 255 255 ascii ascii_general_ci char(255) -3.0000 mysql proxies_priv Proxied_user char 32 96 utf8mb3 utf8mb3_bin char(32) +3.0000 mysql proxies_priv Proxied_user char 80 240 utf8mb3 utf8mb3_bin char(80) NULL mysql proxies_priv With_grant tinyint NULL NULL NULL NULL tinyint(1) 3.0000 mysql proxies_priv Grantor varchar 288 864 utf8mb3 utf8mb3_bin varchar(288) NULL mysql proxies_priv Timestamp timestamp NULL NULL NULL NULL timestamp @@ -499,9 +499,9 @@ NULL mysql replication_group_member_actions enabled tinyint NULL NULL NULL NULL NULL mysql replication_group_member_actions priority tinyint NULL NULL NULL NULL tinyint unsigned 1.0000 mysql replication_group_member_actions error_handling char 64 64 ascii ascii_general_ci char(64) 1.0000 mysql role_edges FROM_HOST char 255 255 ascii ascii_general_ci char(255) -3.0000 mysql role_edges FROM_USER char 32 96 utf8mb3 utf8mb3_bin char(32) +3.0000 mysql role_edges FROM_USER char 80 240 utf8mb3 utf8mb3_bin char(80) 1.0000 mysql role_edges TO_HOST char 255 255 ascii ascii_general_ci char(255) -3.0000 mysql role_edges TO_USER char 32 96 utf8mb3 utf8mb3_bin char(32) +3.0000 mysql role_edges TO_USER char 80 240 utf8mb3 utf8mb3_bin char(80) 3.0000 mysql role_edges WITH_ADMIN_OPTION enum 1 3 utf8mb3 utf8mb3_general_ci enum('N','Y') 3.0000 mysql servers Server_name char 64 192 utf8mb3 utf8mb3_general_ci char(64) 1.0000 mysql servers Host char 255 255 ascii ascii_general_ci char(255) @@ -592,7 +592,7 @@ NULL mysql slow_log server_id int NULL NULL NULL NULL int unsigned NULL mysql slow_log thread_id bigint NULL NULL NULL NULL bigint unsigned 1.0000 mysql tables_priv Host char 255 255 ascii ascii_general_ci char(255) 3.0000 mysql tables_priv Db char 64 192 utf8mb3 utf8mb3_bin char(64) -3.0000 mysql tables_priv User char 32 96 utf8mb3 utf8mb3_bin char(32) +3.0000 mysql tables_priv User char 80 240 utf8mb3 utf8mb3_bin char(80) 3.0000 mysql tables_priv Table_name char 64 192 utf8mb3 utf8mb3_bin char(64) 3.0000 mysql tables_priv Grantor varchar 288 864 utf8mb3 utf8mb3_bin varchar(288) NULL mysql tables_priv Timestamp timestamp NULL NULL NULL NULL timestamp @@ -613,7 +613,7 @@ NULL mysql time_zone_transition_type Offset int NULL NULL NULL NULL int NULL mysql time_zone_transition_type Is_DST tinyint NULL NULL NULL NULL tinyint unsigned 3.0000 mysql time_zone_transition_type Abbreviation char 8 24 utf8mb3 utf8mb3_general_ci char(8) 1.0000 mysql user Host char 255 255 ascii ascii_general_ci char(255) -3.0000 mysql user User char 32 96 utf8mb3 utf8mb3_bin char(32) +3.0000 mysql user User char 80 240 utf8mb3 utf8mb3_bin char(80) 3.0000 mysql user Select_priv enum 1 3 utf8mb3 utf8mb3_general_ci enum('N','Y') 3.0000 mysql user Insert_priv enum 1 3 utf8mb3 utf8mb3_general_ci enum('N','Y') 3.0000 mysql user Update_priv enum 1 3 utf8mb3 utf8mb3_general_ci enum('N','Y') diff --git a/mysql-test/suite/funcs_1/r/is_schema_privileges.result b/mysql-test/suite/funcs_1/r/is_schema_privileges.result index f49a7419314e..c23a6200a5ca 100644 --- a/mysql-test/suite/funcs_1/r/is_schema_privileges.result +++ b/mysql-test/suite/funcs_1/r/is_schema_privileges.result @@ -28,7 +28,7 @@ DROP FUNCTION test.f1; ######################################################################### DESCRIBE information_schema.SCHEMA_PRIVILEGES; Field Type Null Key Default Extra -GRANTEE varchar(292) NO +GRANTEE varchar(340) NO TABLE_CATALOG varchar(512) NO TABLE_SCHEMA varchar(64) NO PRIVILEGE_TYPE varchar(64) NO @@ -36,7 +36,7 @@ IS_GRANTABLE varchar(3) NO SHOW CREATE TABLE information_schema.SCHEMA_PRIVILEGES; Table Create Table SCHEMA_PRIVILEGES CREATE TEMPORARY TABLE `SCHEMA_PRIVILEGES` ( - `GRANTEE` varchar(292) NOT NULL DEFAULT '', + `GRANTEE` varchar(340) NOT NULL DEFAULT '', `TABLE_CATALOG` varchar(512) NOT NULL DEFAULT '', `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '', `PRIVILEGE_TYPE` varchar(64) NOT NULL DEFAULT '', @@ -44,7 +44,7 @@ SCHEMA_PRIVILEGES CREATE TEMPORARY TABLE `SCHEMA_PRIVILEGES` ( ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 SHOW COLUMNS FROM information_schema.SCHEMA_PRIVILEGES; Field Type Null Key Default Extra -GRANTEE varchar(292) NO +GRANTEE varchar(340) NO TABLE_CATALOG varchar(512) NO TABLE_SCHEMA varchar(64) NO PRIVILEGE_TYPE varchar(64) NO diff --git a/mysql-test/suite/funcs_1/r/is_table_privileges.result b/mysql-test/suite/funcs_1/r/is_table_privileges.result index 2c1f19f28ea7..e4d93f3f78d2 100644 --- a/mysql-test/suite/funcs_1/r/is_table_privileges.result +++ b/mysql-test/suite/funcs_1/r/is_table_privileges.result @@ -28,7 +28,7 @@ DROP FUNCTION test.f1; ######################################################################### DESCRIBE information_schema.TABLE_PRIVILEGES; Field Type Null Key Default Extra -GRANTEE varchar(292) NO +GRANTEE varchar(340) NO TABLE_CATALOG varchar(512) NO TABLE_SCHEMA varchar(64) NO TABLE_NAME varchar(64) NO @@ -37,7 +37,7 @@ IS_GRANTABLE varchar(3) NO SHOW CREATE TABLE information_schema.TABLE_PRIVILEGES; Table Create Table TABLE_PRIVILEGES CREATE TEMPORARY TABLE `TABLE_PRIVILEGES` ( - `GRANTEE` varchar(292) NOT NULL DEFAULT '', + `GRANTEE` varchar(340) NOT NULL DEFAULT '', `TABLE_CATALOG` varchar(512) NOT NULL DEFAULT '', `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '', `TABLE_NAME` varchar(64) NOT NULL DEFAULT '', @@ -46,7 +46,7 @@ TABLE_PRIVILEGES CREATE TEMPORARY TABLE `TABLE_PRIVILEGES` ( ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 SHOW COLUMNS FROM information_schema.TABLE_PRIVILEGES; Field Type Null Key Default Extra -GRANTEE varchar(292) NO +GRANTEE varchar(340) NO TABLE_CATALOG varchar(512) NO TABLE_SCHEMA varchar(64) NO TABLE_NAME varchar(64) NO diff --git a/mysql-test/suite/funcs_1/r/is_user_privileges.result b/mysql-test/suite/funcs_1/r/is_user_privileges.result index cd0de33257f7..223f69b65c17 100644 --- a/mysql-test/suite/funcs_1/r/is_user_privileges.result +++ b/mysql-test/suite/funcs_1/r/is_user_privileges.result @@ -28,21 +28,21 @@ DROP FUNCTION test.f1; ######################################################################### DESCRIBE information_schema.USER_PRIVILEGES; Field Type Null Key Default Extra -GRANTEE varchar(292) NO +GRANTEE varchar(340) NO TABLE_CATALOG varchar(512) NO PRIVILEGE_TYPE varchar(64) NO IS_GRANTABLE varchar(3) NO SHOW CREATE TABLE information_schema.USER_PRIVILEGES; Table Create Table USER_PRIVILEGES CREATE TEMPORARY TABLE `USER_PRIVILEGES` ( - `GRANTEE` varchar(292) NOT NULL DEFAULT '', + `GRANTEE` varchar(340) NOT NULL DEFAULT '', `TABLE_CATALOG` varchar(512) NOT NULL DEFAULT '', `PRIVILEGE_TYPE` varchar(64) NOT NULL DEFAULT '', `IS_GRANTABLE` varchar(3) NOT NULL DEFAULT '' ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 SHOW COLUMNS FROM information_schema.USER_PRIVILEGES; Field Type Null Key Default Extra -GRANTEE varchar(292) NO +GRANTEE varchar(340) NO TABLE_CATALOG varchar(512) NO PRIVILEGE_TYPE varchar(64) NO IS_GRANTABLE varchar(3) NO 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 d0b8a2c7bb79..4536b619844e 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 unsigned NOT NULL DEFAULT '0', - `USER` varchar(32) NOT NULL DEFAULT '', + `USER` varchar(80) NOT NULL DEFAULT '', `HOST` varchar(261) NOT NULL DEFAULT '', `DB` varchar(64) DEFAULT NULL, `COMMAND` varchar(16) NOT NULL DEFAULT '', @@ -106,7 +106,7 @@ SHOW CREATE TABLE processlist; Table Create Table PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` ( `ID` bigint unsigned NOT NULL DEFAULT '0', - `USER` varchar(32) NOT NULL DEFAULT '', + `USER` varchar(80) NOT NULL DEFAULT '', `HOST` varchar(261) 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 85653ce5ef34..29a6ca0dc4d6 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 unsigned NOT NULL DEFAULT '0', - `USER` varchar(32) NOT NULL DEFAULT '', + `USER` varchar(80) NOT NULL DEFAULT '', `HOST` varchar(261) NOT NULL DEFAULT '', `DB` varchar(64) DEFAULT NULL, `COMMAND` varchar(16) NOT NULL DEFAULT '', diff --git a/mysql-test/suite/information_schema/r/i_s_schema_definition_debug.result b/mysql-test/suite/information_schema/r/i_s_schema_definition_debug.result index 955440430da7..c962450e82dd 100644 --- a/mysql-test/suite/information_schema/r/i_s_schema_definition_debug.result +++ b/mysql-test/suite/information_schema/r/i_s_schema_definition_debug.result @@ -118,7 +118,8 @@ include/assert.inc [All expected I_S system views are present.] # I_S system views. ######################################################################## # Print the actual I_S version stored on disk. -Current I_S_VERSION=80200 +Current I_S_VERSION=80300001 +Current I_S_VERSION_MAJOR=80300 CREATE TABLE I_S_check_table (id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, t TEXT NOT NULL, row_hash VARCHAR(64) DEFAULT NULL); @@ -1649,8 +1650,8 @@ SET debug = '-d,fetch_system_view_definition'; include/assert.inc [Found expected number of system views in DD.] include/assert.inc [Found expected number of system views in I_S_check_table.] include/assert.inc [The group concat max length is sufficient.] -The schema checksum corresponds to I_S version 80200. +The schema checksum corresponds to I_S version 80300001. include/assert.inc [The schema checksum corresponds to a known I_S version.] include/assert.inc [The schema checksum corresponds to -IS_VERSION 80200 stored on on disk.] +IS_VERSION 80300001 stored on on disk.] include/assert.inc [The stored I_S version is the latest published I_S version.] diff --git a/mysql-test/suite/information_schema/t/i_s_schema_definition_debug.test b/mysql-test/suite/information_schema/t/i_s_schema_definition_debug.test index 5194a9c180b9..28ecf68dc0cd 100644 --- a/mysql-test/suite/information_schema/t/i_s_schema_definition_debug.test +++ b/mysql-test/suite/information_schema/t/i_s_schema_definition_debug.test @@ -120,7 +120,9 @@ let $current_i_s_version = `SELECT SUBSTRING_INDEX( LOCATE('IS_VERSION', properties), 30), ';', 1) , '=', -1) AS I_S_VERSION FROM mysql.dd_properties`; +let $current_i_s_version_major = `SELECT SUBSTRING('$current_i_s_version', 1, 5)`; --echo Current I_S_VERSION=$current_i_s_version +--echo Current I_S_VERSION_MAJOR=$current_i_s_version_major let $current_mysqld_version = `SELECT SUBSTRING_INDEX( SUBSTRING_INDEX(SUBSTRING(properties, @@ -129,7 +131,7 @@ let $current_mysqld_version = `SELECT SUBSTRING_INDEX( FROM mysql.dd_properties`; # Check if the I_S version on disk is greater than MYSQLD_VERSION. -let $value = `SELECT $current_i_s_version > $current_mysqld_version`; +let $value = `SELECT $current_i_s_version_major > $current_mysqld_version`; if ($value) { echo Error: I_S_VERSION ($current_i_s_version) version found in sql/dd/info_schema/metadata.h is greater than MYSQLD_VERSION @@ -320,6 +322,12 @@ INSERT INTO I_S_published_schema INSERT INTO I_S_published_schema VALUES ('80200', '80200', 1, '043975d2bcbbf7eed996b8917c41b14363c2c2904658355a414d3ebbb96a8f2b'); +INSERT INTO I_S_published_schema + VALUES ('80300', '80300001', 0, + '440ace7756cd1a4c541af2996df7cfa21c04f15b8efb29b4153934795f8f0635'); +INSERT INTO I_S_published_schema + VALUES ('80300', '80300001', 1, + 'e4ab0147982615885ea8c62171f4d99a2a31669e91f9db2fc11140a1313a8fcc'); LET $checksum_version = `SELECT IF(ISNULL(mysqld_version), "0", i_s_version) FROM I_S_published_schema i RIGHT OUTER JOIN whole_schema w @@ -342,11 +350,11 @@ if ($checksum_version == "0") { "update_checksum", "insert_checksum") as ACTION FROM I_S_published_schema i WHERE i.mysqld_version = '$current_mysqld_version' AND - i.i_s_version = '$current_mysqld_version'`; + SUBSTRING(i.i_s_version, 1, 5) = '$current_mysqld_version'`; # Make sure that we always bump the I_S version equal to latest MySQLD # version. - let $bump_version = `SELECT $current_mysqld_version != $current_i_s_version`; + let $bump_version = `SELECT $current_mysqld_version != $current_i_s_version_major`; if ($bump_version == "1") { echo Please increase the I_S_VERSION in sql/dd/info_schema/metadata.h to $current_mysqld_version.; diff --git a/mysql-test/suite/innodb/r/upgrade_orphan.result b/mysql-test/suite/innodb/r/upgrade_orphan.result index 7078b4052227..37bf78aa2e8e 100644 --- a/mysql-test/suite/innodb/r/upgrade_orphan.result +++ b/mysql-test/suite/innodb/r/upgrade_orphan.result @@ -40,7 +40,7 @@ SHOW CREATE TABLE mysql.user; Table Create Table user CREATE TABLE `user` ( `Host` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL DEFAULT '', - `User` char(32) COLLATE utf8mb3_bin NOT NULL DEFAULT '', + `User` char(80) COLLATE utf8mb3_bin NOT NULL DEFAULT '', `Select_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N', `Insert_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N', `Update_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_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 7efce103dbc2..302bd4852023 100644 --- a/mysql-test/suite/perfschema/r/dd_version_check.result +++ b/mysql-test/suite/perfschema/r/dd_version_check.result @@ -1,4 +1,4 @@ "Checking the data dictionary properties ..." SUBSTRING_INDEX(SUBSTRING(properties, LOCATE('PS_VERSION', properties), 30), ';', 1) -PS_VERSION=80300001 +PS_VERSION=80300002 "Checking the performance schema database structure ..." diff --git a/mysql-test/suite/perfschema/r/idx_accounts.result b/mysql-test/suite/perfschema/r/idx_accounts.result index 5d8ff566eefb..98e8f3391768 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 < "2"; 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 385 const,const # 100.00 NULL +1 SIMPLE accounts NULL const ACCOUNT ACCOUNT 577 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 78c8d8d9f819..eb35e11b3d9b 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 385 const,const # 100.00 NULL +1 SIMPLE events_errors_summary_by_account_by_error NULL ref ACCOUNT ACCOUNT 577 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 385 const,const # 100.00 NULL +1 SIMPLE events_errors_summary_by_account_by_error NULL ref ACCOUNT ACCOUNT 577 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 385 const,const # 100.00 NULL +1 SIMPLE events_errors_summary_by_account_by_error NULL ref ACCOUNT ACCOUNT 577 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 385 const,const # 33.33 Using where +1 SIMPLE events_errors_summary_by_account_by_error NULL ref ACCOUNT ACCOUNT 577 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 < "2"; 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 385 const,const # 33.33 Using where +1 SIMPLE events_errors_summary_by_account_by_error NULL ref ACCOUNT ACCOUNT 577 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 390 const,const,const # 100.00 NULL +1 SIMPLE events_errors_summary_by_account_by_error NULL const ACCOUNT ACCOUNT 582 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 34b5d88444cf..6954b1635054 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 < "2"; 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 9055065cf79c..60dceeaa1f1c 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 385 const,const # 100.00 NULL +1 SIMPLE events_stages_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 577 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 385 const,const # 100.00 NULL +1 SIMPLE events_stages_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 577 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 385 const,const # 100.00 NULL +1 SIMPLE events_stages_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 577 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 385 const,const # 33.33 Using where +1 SIMPLE events_stages_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 577 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 < "2"; 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 385 const,const # 33.33 Using where +1 SIMPLE events_stages_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 577 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 899 const,const,const # 100.00 NULL +1 SIMPLE events_stages_summary_by_account_by_event_name NULL const ACCOUNT ACCOUNT 1091 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 511020c17202..b62e9c9c5318 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 < "2"; 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 c314334c2139..c5eb9ca020ff 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 385 const,const # 100.00 NULL +1 SIMPLE events_statements_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 577 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 385 const,const # 100.00 NULL +1 SIMPLE events_statements_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 577 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 385 const,const # 100.00 NULL +1 SIMPLE events_statements_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 577 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 385 const,const # 33.33 Using where +1 SIMPLE events_statements_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 577 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 < "2"; 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 385 const,const # 33.33 Using where +1 SIMPLE events_statements_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 577 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 899 const,const,const # 100.00 NULL +1 SIMPLE events_statements_summary_by_account_by_event_name NULL const ACCOUNT ACCOUNT 1091 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 04ad25efdc8b..f1b402806521 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 < "2"; 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 69d8d93c1205..026f8f2e4e2a 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 385 const,const # 100.00 NULL +1 SIMPLE events_transactions_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 577 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 385 const,const # 100.00 NULL +1 SIMPLE events_transactions_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 577 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 385 const,const # 100.00 NULL +1 SIMPLE events_transactions_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 577 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 385 const,const # 33.33 Using where +1 SIMPLE events_transactions_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 577 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 < "2"; 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 385 const,const # 33.33 Using where +1 SIMPLE events_transactions_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 577 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 899 const,const,const # 100.00 NULL +1 SIMPLE events_transactions_summary_by_account_by_event_name NULL const ACCOUNT ACCOUNT 1091 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 fd854942491a..403ec9793254 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 < "2"; 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 47a4864d9734..8355740a2280 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 385 const,const # 100.00 NULL +1 SIMPLE events_waits_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 577 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 385 const,const # 100.00 NULL +1 SIMPLE events_waits_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 577 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 385 const,const # 100.00 NULL +1 SIMPLE events_waits_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 577 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 385 const,const # 33.33 Using where +1 SIMPLE events_waits_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 577 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 < "2"; 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 385 const,const # 33.33 Using where +1 SIMPLE events_waits_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 577 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 899 const,const,const # 100.00 NULL +1 SIMPLE events_waits_summary_by_account_by_event_name NULL const ACCOUNT ACCOUNT 1091 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 dc1591ff4a93..cf4643238556 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 < "2"; 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 6d4dd1ccf84b..313d78e3a01b 100644 --- a/mysql-test/suite/perfschema/r/idx_joins.result +++ b/mysql-test/suite/perfschema/r/idx_joins.result @@ -9,7 +9,7 @@ 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 t2 NULL ALL HOST NULL NULL NULL # 100.00 Using where -1 SIMPLE t1 NULL eq_ref USER USER 129 performance_schema.t2.HOST # 100.00 Using where +1 SIMPLE t1 NULL eq_ref USER USER 321 performance_schema.t2.HOST # 100.00 Using where Warnings: Warning 1739 Cannot use ref access on index 'HOST' due to type or collation conversion on field 'HOST' 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`.`t1`.`MAX_SESSION_CONTROLLED_MEMORY` AS `MAX_SESSION_CONTROLLED_MEMORY`,`performance_schema`.`t1`.`MAX_SESSION_TOTAL_MEMORY` AS `MAX_SESSION_TOTAL_MEMORY`,`performance_schema`.`t2`.`HOST` AS `HOST`,`performance_schema`.`t2`.`CURRENT_CONNECTIONS` AS `CURRENT_CONNECTIONS`,`performance_schema`.`t2`.`TOTAL_CONNECTIONS` AS `TOTAL_CONNECTIONS`,`performance_schema`.`t2`.`MAX_SESSION_CONTROLLED_MEMORY` AS `MAX_SESSION_CONTROLLED_MEMORY`,`performance_schema`.`t2`.`MAX_SESSION_TOTAL_MEMORY` AS `MAX_SESSION_TOTAL_MEMORY` 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_mems_by_account_by_event_name.result b/mysql-test/suite/perfschema/r/idx_mems_by_account_by_event_name.result index 482ec2ac380f..3858ed4c8dea 100644 --- a/mysql-test/suite/perfschema/r/idx_mems_by_account_by_event_name.result +++ b/mysql-test/suite/perfschema/r/idx_mems_by_account_by_event_name.result @@ -34,14 +34,14 @@ from performance_schema.memory_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 memory_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 385 const,const # 100.00 NULL +1 SIMPLE memory_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 577 const,const # 100.00 NULL ############ Explain for Query #################################### explain select LOW_COUNT_USED from performance_schema.memory_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 memory_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 385 const,const # 100.00 NULL +1 SIMPLE memory_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 577 const,const # 100.00 NULL ############ Explain for Query #################################### explain select LOW_COUNT_USED from performance_schema.memory_summary_by_account_by_event_name @@ -62,7 +62,7 @@ from performance_schema.memory_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 memory_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 385 const,const # 100.00 NULL +1 SIMPLE memory_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 577 const,const # 100.00 NULL ############ Explain for Query #################################### explain select LOW_COUNT_USED from performance_schema.memory_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 memory_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 385 const,const # 33.33 Using where +1 SIMPLE memory_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 577 const,const # 33.33 Using where ############ Explain for Query #################################### explain select LOW_COUNT_USED from performance_schema.memory_summary_by_account_by_event_name @@ -94,7 +94,7 @@ where HOST = "localhost" and USER = "foo" and EVENT_NAME < "2"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE memory_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 385 const,const # 33.33 Using where +1 SIMPLE memory_summary_by_account_by_event_name NULL ref ACCOUNT ACCOUNT 577 const,const # 33.33 Using where ############ Explain for Query #################################### explain select LOW_COUNT_USED from performance_schema.memory_summary_by_account_by_event_name @@ -102,7 +102,7 @@ where HOST = "localhost" and USER = "foo" and EVENT_NAME = "memory/sql/help"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE memory_summary_by_account_by_event_name NULL const ACCOUNT ACCOUNT 899 const,const,const # 100.00 NULL +1 SIMPLE memory_summary_by_account_by_event_name NULL const ACCOUNT ACCOUNT 1091 const,const,const # 100.00 NULL ############# Explain End ######################################### flush status; select LOW_COUNT_USED diff --git a/mysql-test/suite/perfschema/r/idx_mems_by_user_by_event_name.result b/mysql-test/suite/perfschema/r/idx_mems_by_user_by_event_name.result index 4e16103454ed..2a85a92bd94d 100644 --- a/mysql-test/suite/perfschema/r/idx_mems_by_user_by_event_name.result +++ b/mysql-test/suite/perfschema/r/idx_mems_by_user_by_event_name.result @@ -13,7 +13,7 @@ explain select LOW_COUNT_USED from performance_schema.memory_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 memory_summary_by_user_by_event_name NULL ref USER USER 129 const # 100.00 NULL +1 SIMPLE memory_summary_by_user_by_event_name NULL ref USER USER 321 const # 100.00 NULL ############ Explain for Query #################################### explain select LOW_COUNT_USED from performance_schema.memory_summary_by_user_by_event_name @@ -31,7 +31,7 @@ explain select LOW_COUNT_USED from performance_schema.memory_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 memory_summary_by_user_by_event_name NULL ref USER USER 129 const # 100.00 NULL +1 SIMPLE memory_summary_by_user_by_event_name NULL ref USER USER 321 const # 100.00 NULL ############ Explain for Query #################################### explain select LOW_COUNT_USED from performance_schema.memory_summary_by_user_by_event_name @@ -52,21 +52,21 @@ from performance_schema.memory_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 memory_summary_by_user_by_event_name NULL ref USER USER 129 const # 33.33 Using where +1 SIMPLE memory_summary_by_user_by_event_name NULL ref USER USER 321 const # 33.33 Using where ############ Explain for Query #################################### explain select LOW_COUNT_USED from performance_schema.memory_summary_by_user_by_event_name where USER = "foo" and EVENT_NAME < "2"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE memory_summary_by_user_by_event_name NULL ref USER USER 129 const # 33.33 Using where +1 SIMPLE memory_summary_by_user_by_event_name NULL ref USER USER 321 const # 33.33 Using where ############ Explain for Query #################################### explain select LOW_COUNT_USED from performance_schema.memory_summary_by_user_by_event_name where USER = "foo" and EVENT_NAME = "memory/sql/help"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE memory_summary_by_user_by_event_name NULL const USER USER 643 const,const # 100.00 NULL +1 SIMPLE memory_summary_by_user_by_event_name NULL const USER USER 835 const,const # 100.00 NULL ############# Explain End ######################################### flush status; select LOW_COUNT_USED diff --git a/mysql-test/suite/perfschema/r/idx_setup_actors.result b/mysql-test/suite/perfschema/r/idx_setup_actors.result index 1dd862747390..5eddd8f90b76 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 383 const,const # 100.00 NULL +1 SIMPLE setup_actors NULL ref PRIMARY PRIMARY 575 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 511 const,const,const # 100.00 NULL +1 SIMPLE setup_actors NULL const PRIMARY PRIMARY 703 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 true ############# 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 5ee6401b8a8f..b5978aab2af4 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 385 const,const # 100.00 NULL +1 SIMPLE status_by_account NULL ref ACCOUNT ACCOUNT 577 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 385 const,const # 100.00 NULL +1 SIMPLE status_by_account NULL ref ACCOUNT ACCOUNT 577 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 < "2"; 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 385 const,const # 100.00 NULL +1 SIMPLE status_by_account NULL ref ACCOUNT ACCOUNT 577 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 385 const,const # 33.33 Using where +1 SIMPLE status_by_account NULL ref ACCOUNT ACCOUNT 577 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 < "2"; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE status_by_account NULL ref ACCOUNT ACCOUNT 385 const,const # 33.33 Using where +1 SIMPLE status_by_account NULL ref ACCOUNT ACCOUNT 577 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 643 const,const,const # 100.00 NULL +1 SIMPLE status_by_account NULL const ACCOUNT ACCOUNT 835 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 f1313c215ce6..56625e29a12c 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 < "2"; 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 f7b369b3b33d..8dc5add5b1a5 100644 --- a/mysql-test/suite/perfschema/r/idx_threads.result +++ b/mysql-test/suite/perfschema/r/idx_threads.result @@ -129,14 +129,14 @@ 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') @@ -170,35 +170,35 @@ thread_id thread_id = @tid name processlist_state processlist_info 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 389 const,const 10 100.00 NULL +1 SIMPLE threads NULL ref PROCESSLIST_ACCOUNT,PROCESSLIST_HOST PROCESSLIST_ACCOUNT 581 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 389 const,const 10 100.00 NULL +1 SIMPLE threads NULL ref PROCESSLIST_ACCOUNT,PROCESSLIST_HOST PROCESSLIST_ACCOUNT 581 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`,`performance_schema`.`threads`.`EXECUTION_ENGINE` AS `EXECUTION_ENGINE`,`performance_schema`.`threads`.`CONTROLLED_MEMORY` AS `CONTROLLED_MEMORY`,`performance_schema`.`threads`.`MAX_CONTROLLED_MEMORY` AS `MAX_CONTROLLED_MEMORY`,`performance_schema`.`threads`.`TOTAL_MEMORY` AS `TOTAL_MEMORY`,`performance_schema`.`threads`.`MAX_TOTAL_MEMORY` AS `MAX_TOTAL_MEMORY`,`performance_schema`.`threads`.`TELEMETRY_ACTIVE` AS `TELEMETRY_ACTIVE` 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`,`performance_schema`.`threads`.`EXECUTION_ENGINE` AS `EXECUTION_ENGINE`,`performance_schema`.`threads`.`CONTROLLED_MEMORY` AS `CONTROLLED_MEMORY`,`performance_schema`.`threads`.`MAX_CONTROLLED_MEMORY` AS `MAX_CONTROLLED_MEMORY`,`performance_schema`.`threads`.`TOTAL_MEMORY` AS `TOTAL_MEMORY`,`performance_schema`.`threads`.`MAX_TOTAL_MEMORY` AS `MAX_TOTAL_MEMORY`,`performance_schema`.`threads`.`TELEMETRY_ACTIVE` AS `TELEMETRY_ACTIVE` 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`,`performance_schema`.`threads`.`EXECUTION_ENGINE` AS `EXECUTION_ENGINE`,`performance_schema`.`threads`.`CONTROLLED_MEMORY` AS `CONTROLLED_MEMORY`,`performance_schema`.`threads`.`MAX_CONTROLLED_MEMORY` AS `MAX_CONTROLLED_MEMORY`,`performance_schema`.`threads`.`TOTAL_MEMORY` AS `TOTAL_MEMORY`,`performance_schema`.`threads`.`MAX_TOTAL_MEMORY` AS `MAX_TOTAL_MEMORY`,`performance_schema`.`threads`.`TELEMETRY_ACTIVE` AS `TELEMETRY_ACTIVE` from `performance_schema`.`threads` where ((`performance_schema`.`threads`.`PROCESSLIST_USER` = 'foo') and (`performance_schema`.`threads`.`PROCESSLIST_HOST` like 'bar%')) diff --git a/mysql-test/suite/perfschema/r/idx_users.result b/mysql-test/suite/perfschema/r/idx_users.result index 9e40c3e47c8b..77953f46156d 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 83b889996853..ff5f4bc3677f 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(255) CHARACTER SET ascii COLLATE ascii_general_ci 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 34aafa76c413..65af328a40fa 100644 --- a/mysql-test/suite/perfschema/r/schema.result +++ b/mysql-test/suite/perfschema/r/schema.result @@ -124,7 +124,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(255) CHARACTER SET ascii COLLATE ascii_general_ci DEFAULT NULL, `CURRENT_CONNECTIONS` bigint NOT NULL, `TOTAL_CONNECTIONS` bigint NOT NULL, @@ -217,7 +217,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 unsigned NOT NULL, `SUM_TIMER_WAIT` bigint unsigned NOT NULL, @@ -229,7 +229,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(255) CHARACTER SET ascii COLLATE ascii_general_ci DEFAULT NULL, `EVENT_NAME` varchar(128) NOT NULL, `COUNT_STAR` bigint unsigned NOT NULL, @@ -519,7 +519,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 unsigned NOT NULL, `SUM_TIMER_WAIT` bigint unsigned NOT NULL, @@ -554,7 +554,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(255) CHARACTER SET ascii COLLATE ascii_general_ci DEFAULT NULL, `EVENT_NAME` varchar(128) NOT NULL, `COUNT_STAR` bigint unsigned NOT NULL, @@ -754,7 +754,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 unsigned NOT NULL, `SUM_TIMER_WAIT` bigint unsigned NOT NULL, @@ -776,7 +776,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(255) CHARACTER SET ascii COLLATE ascii_general_ci DEFAULT NULL, `EVENT_NAME` varchar(128) NOT NULL, `COUNT_STAR` bigint unsigned NOT NULL, @@ -928,7 +928,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 unsigned NOT NULL, `SUM_TIMER_WAIT` bigint unsigned NOT NULL, @@ -940,7 +940,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(255) CHARACTER SET ascii COLLATE ascii_general_ci DEFAULT NULL, `EVENT_NAME` varchar(128) NOT NULL, `COUNT_STAR` bigint unsigned NOT NULL, @@ -998,7 +998,7 @@ memory_summary_by_thread_by_event_name CREATE TABLE `memory_summary_by_thread_by show create table memory_summary_by_user_by_event_name; Table Create Table memory_summary_by_user_by_event_name CREATE TABLE `memory_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_ALLOC` bigint unsigned NOT NULL, `COUNT_FREE` bigint unsigned NOT NULL, @@ -1015,7 +1015,7 @@ memory_summary_by_user_by_event_name CREATE TABLE `memory_summary_by_user_by_eve show create table memory_summary_by_account_by_event_name; Table Create Table memory_summary_by_account_by_event_name CREATE TABLE `memory_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(255) CHARACTER SET ascii COLLATE ascii_general_ci DEFAULT NULL, `EVENT_NAME` varchar(128) NOT NULL, `COUNT_ALLOC` bigint unsigned NOT NULL, @@ -1268,7 +1268,7 @@ show create table setup_actors; Table Create Table setup_actors CREATE TABLE `setup_actors` ( `HOST` char(255) CHARACTER SET ascii COLLATE ascii_general_ci 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', @@ -1558,7 +1558,7 @@ threads CREATE TABLE `threads` ( `NAME` varchar(128) NOT NULL, `TYPE` varchar(10) NOT NULL, `PROCESSLIST_ID` bigint unsigned DEFAULT NULL, - `PROCESSLIST_USER` varchar(32) DEFAULT NULL, + `PROCESSLIST_USER` varchar(80) DEFAULT NULL, `PROCESSLIST_HOST` varchar(255) CHARACTER SET ascii COLLATE ascii_general_ci DEFAULT NULL, `PROCESSLIST_DB` varchar(64) DEFAULT NULL, `PROCESSLIST_COMMAND` varchar(16) DEFAULT NULL, @@ -1589,7 +1589,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 NOT NULL, `TOTAL_CONNECTIONS` bigint NOT NULL, `MAX_SESSION_CONTROLLED_MEMORY` bigint unsigned NOT NULL, diff --git a/mysql-test/suite/perfschema/r/table_schema.result b/mysql-test/suite/perfschema/r/table_schema.result index 9a23b602e3a4..3b7e82d1a395 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 255 255 NULL NULL NULL ascii ascii_general_ci char(255) select,insert,update,references NULL def performance_schema accounts CURRENT_CONNECTIONS 3 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint select,insert,update,references NULL def performance_schema accounts TOTAL_CONNECTIONS 4 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint select,insert,update,references NULL @@ -55,7 +55,7 @@ def performance_schema error_log PRIO 3 NULL NO enum 7 28 NULL NULL NULL utf8mb4 def performance_schema error_log ERROR_CODE 4 NULL YES varchar 10 40 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(10) MUL select,insert,update,references NULL def performance_schema error_log SUBSYSTEM 5 NULL YES varchar 7 28 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(7) MUL select,insert,update,references NULL def performance_schema error_log DATA 6 NULL NO text 65535 65535 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci text 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 255 255 NULL NULL NULL ascii ascii_general_ci char(255) 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 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 @@ -80,7 +80,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 unsigned select,insert,update,references NULL def performance_schema events_errors_summary_by_thread_by_error FIRST_SEEN 7 NULL 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 NULL 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 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 @@ -131,7 +131,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 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 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 255 255 NULL NULL NULL ascii ascii_general_ci char(255) 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 unsigned select,insert,update,references NULL @@ -153,7 +153,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 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 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 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 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 unsigned select,insert,update,references NULL @@ -318,7 +318,7 @@ def performance_schema events_statements_history_long CPU_TIME 43 NULL NO bigint def performance_schema events_statements_history_long MAX_CONTROLLED_MEMORY 44 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint unsigned select,insert,update,references NULL def performance_schema events_statements_history_long MAX_TOTAL_MEMORY 45 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint unsigned select,insert,update,references NULL def performance_schema events_statements_history_long EXECUTION_ENGINE 46 NULL YES enum 9 36 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci enum('PRIMARY','SECONDARY') 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 255 255 NULL NULL NULL ascii ascii_general_ci char(255) 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 unsigned select,insert,update,references NULL @@ -484,7 +484,7 @@ def performance_schema events_statements_summary_by_thread_by_event_name SUM_CPU def performance_schema events_statements_summary_by_thread_by_event_name MAX_CONTROLLED_MEMORY 28 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint unsigned select,insert,update,references NULL def performance_schema events_statements_summary_by_thread_by_event_name MAX_TOTAL_MEMORY 29 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint unsigned select,insert,update,references NULL def performance_schema events_statements_summary_by_thread_by_event_name COUNT_SECONDARY 30 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint 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 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 unsigned select,insert,update,references NULL @@ -615,7 +615,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 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 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 255 255 NULL NULL NULL ascii ascii_general_ci char(255) 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 unsigned select,insert,update,references NULL @@ -667,7 +667,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 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 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 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 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 unsigned select,insert,update,references NULL @@ -757,7 +757,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 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 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 255 255 NULL NULL NULL ascii ascii_general_ci char(255) 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 unsigned select,insert,update,references NULL @@ -786,7 +786,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 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 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 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 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 unsigned select,insert,update,references NULL @@ -904,7 +904,7 @@ def performance_schema log_status SERVER_UUID 1 NULL NO char 36 144 NULL NULL NU def performance_schema log_status LOCAL 2 NULL NO json NULL NULL NULL NULL NULL NULL NULL json select,insert,update,references NULL def performance_schema log_status REPLICATION 3 NULL NO json NULL NULL NULL NULL NULL NULL NULL json select,insert,update,references NULL def performance_schema log_status STORAGE_ENGINES 4 NULL NO json NULL NULL NULL NULL NULL NULL NULL json select,insert,update,references NULL -def performance_schema memory_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 memory_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 memory_summary_by_account_by_event_name HOST 2 NULL YES char 255 255 NULL NULL NULL ascii ascii_general_ci char(255) select,insert,update,references NULL def performance_schema memory_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 memory_summary_by_account_by_event_name COUNT_ALLOC 4 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint unsigned select,insert,update,references NULL @@ -941,7 +941,7 @@ def performance_schema memory_summary_by_thread_by_event_name HIGH_COUNT_USED 9 def performance_schema memory_summary_by_thread_by_event_name LOW_NUMBER_OF_BYTES_USED 10 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint select,insert,update,references NULL def performance_schema memory_summary_by_thread_by_event_name CURRENT_NUMBER_OF_BYTES_USED 11 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint select,insert,update,references NULL def performance_schema memory_summary_by_thread_by_event_name HIGH_NUMBER_OF_BYTES_USED 12 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint select,insert,update,references NULL -def performance_schema memory_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 memory_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 memory_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 memory_summary_by_user_by_event_name COUNT_ALLOC 3 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint unsigned select,insert,update,references NULL def performance_schema memory_summary_by_user_by_event_name COUNT_FREE 4 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint unsigned select,insert,update,references NULL @@ -1114,7 +1114,7 @@ def performance_schema replication_asynchronous_connection_failover_managed CONF 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 255 255 NULL NULL NULL ascii ascii_general_ci char(255) select,insert,update,references NULL def performance_schema replication_connection_configuration PORT 3 NULL NO int NULL NULL 10 0 NULL NULL NULL int 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 @@ -1200,7 +1200,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 255 255 NULL NULL NULL ascii ascii_general_ci char(255) 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 @@ -1288,7 +1288,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 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 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 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 255 255 NULL NULL NULL ascii ascii_general_ci char(255) 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 @@ -1298,7 +1298,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 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 @@ -1458,7 +1458,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 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 255 255 NULL NULL NULL ascii ascii_general_ci varchar(255) 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 @@ -1481,7 +1481,7 @@ def performance_schema threads TELEMETRY_ACTIVE 24 NULL NO enum 3 12 NULL NULL N def performance_schema tls_channel_status CHANNEL 1 NULL NO varchar 128 512 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(128) select,insert,update,references NULL def performance_schema tls_channel_status PROPERTY 2 NULL NO varchar 128 512 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(128) select,insert,update,references NULL def performance_schema tls_channel_status VALUE 3 NULL NO varchar 2048 8192 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(2048) 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 select,insert,update,references NULL def performance_schema users TOTAL_CONNECTIONS 3 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint select,insert,update,references NULL def performance_schema users MAX_SESSION_CONTROLLED_MEMORY 4 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint unsigned select,insert,update,references NULL @@ -1503,7 +1503,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 255 255 NULL NULL NULL ascii ascii_general_ci char(255) 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/rpl/r/rpl_slave_status.result b/mysql-test/suite/rpl/r/rpl_slave_status.result index 7a1f75d3e853..990399665bfa 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 connection meta [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 REPLICATION SOURCE TO SOURCE_USER='rpluser_with_length_32_123456789', +CHANGE REPLICATION SOURCE TO SOURCE_USER='rpluser_with_length_80_abcdefghij1234567890abcdefghij1234567890abcdefghij123456', SOURCE_PASSWORD='rpl', GET_SOURCE_PUBLIC_KEY = 1, SOURCE_SSL = 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 fcc0da926d48..b4aa418ff98c 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 9b92b9600f79..b7c84cc23d64 100644 --- a/mysql-test/suite/rpl/t/rpl_slave_status.test +++ b/mysql-test/suite/rpl/t/rpl_slave_status.test @@ -33,16 +33,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 REPLICATION SOURCE TO SOURCE_USER='rpluser_with_length_32_123456789', +CHANGE REPLICATION SOURCE TO SOURCE_USER='rpluser_with_length_80_abcdefghij1234567890abcdefghij1234567890abcdefghij123456', SOURCE_PASSWORD='rpl', GET_SOURCE_PUBLIC_KEY = 1, SOURCE_SSL = 1; source include/start_slave.inc; @@ -58,7 +58,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 043bcfa82737..5f11821a2eb3 100644 --- a/mysql-test/suite/rpl/t/rpl_user.test +++ b/mysql-test/suite/rpl/t/rpl_user.test @@ -21,9 +21,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. @@ -39,7 +39,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 a9d9b4252c7c..be03ed8c24ca 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'@'host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890X'; ERROR HY000: String 'host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij12345' is too long for host name (should be no longer than 255) 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 9828d7802372..6ce82eab513e 100644 --- a/mysql-test/suite/rpl_gtid/t/rpl_current_user.test +++ b/mysql-test/suite/rpl_gtid/t/rpl_current_user.test @@ -48,10 +48,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'@'host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890X'; 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 40f1f4a9efff..59042f2bb228 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(288) YES NULL +user varchar(336) YES NULL total decimal(42,0) YES NULL total_latency varchar(11) YES NULL min_latency varchar(11) YES NULL @@ -11,7 +11,7 @@ processlist_id bigint 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(288) YES NULL +user varchar(336) YES NULL total decimal(42,0) YES NULL total_latency decimal(42,0) YES NULL min_latency bigint 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 d30a44a67d2c..39e071dba68c 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(317) YES NULL +thread varchar(365) YES NULL file varchar(512) YES NULL latency varchar(11) YES NULL operation varchar(32) NO NULL @@ -8,7 +8,7 @@ requested varchar(11) YES NULL SELECT * FROM sys.latest_file_io; DESC sys.x$latest_file_io; Field Type Null Key Default Extra -thread varchar(317) YES NULL +thread varchar(365) YES NULL file varchar(512) YES NULL latency bigint 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 20ef2d4d692e..7fd669d3ba7a 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 unsigned NO NULL -user varchar(288) YES NULL +user varchar(336) YES NULL current_count_used decimal(41,0) YES NULL current_allocated varchar(11) YES NULL current_avg_alloc varchar(11) 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 unsigned NO NULL -user varchar(288) YES NULL +user varchar(336) 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_memory_by_user_by_current_bytes.result b/mysql-test/suite/sysschema/r/v_memory_by_user_by_current_bytes.result index 2c6cc29b9166..32bf98cfc516 100644 --- a/mysql-test/suite/sysschema/r/v_memory_by_user_by_current_bytes.result +++ b/mysql-test/suite/sysschema/r/v_memory_by_user_by_current_bytes.result @@ -1,6 +1,6 @@ DESC sys.memory_by_user_by_current_bytes; Field Type Null Key Default Extra -user varchar(32) YES NULL +user varchar(80) YES NULL current_count_used decimal(41,0) YES NULL current_allocated varchar(11) YES NULL current_avg_alloc varchar(11) YES NULL @@ -9,7 +9,7 @@ total_allocated varchar(11) YES NULL SELECT * FROM sys.memory_by_user_by_current_bytes; DESC sys.x$memory_by_user_by_current_bytes; Field Type Null Key Default Extra -user varchar(32) YES NULL +user varchar(80) 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 4afa48be08ab..63c0c9f286c3 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 unsigned NO NULL conn_id bigint unsigned YES NULL -user varchar(288) YES NULL +user varchar(336) YES NULL db varchar(64) YES NULL command varchar(16) YES NULL state varchar(64) YES NULL @@ -35,7 +35,7 @@ DESC sys.x$processlist; Field Type Null Key Default Extra thd_id bigint unsigned NO NULL conn_id bigint unsigned YES NULL -user varchar(288) YES NULL +user varchar(336) 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 5a4d377e874c..5c33bd57f155 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 unsigned NO NULL conn_id bigint unsigned YES NULL -user varchar(288) YES NULL +user varchar(336) YES NULL db varchar(64) YES NULL command varchar(16) YES NULL state varchar(64) YES NULL @@ -35,7 +35,7 @@ DESC sys.x$session; Field Type Null Key Default Extra thd_id bigint unsigned NO NULL conn_id bigint unsigned YES NULL -user varchar(288) YES NULL +user varchar(336) 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 688c7f09fc05..3efc08b083ab 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 varchar(11) YES NULL statement_avg_latency varchar(11) YES NULL @@ -15,7 +15,7 @@ total_memory_allocated varchar(11) 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 e7f75fbe6338..e7a4c5160d83 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 varchar(11) 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 1d20308ba5ff..0daa62f266cd 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 unsigned NO NULL latency varchar(11) YES NULL @@ -8,7 +8,7 @@ max_latency varchar(11) 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 unsigned NO NULL latency bigint 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 79c6adc743fd..a40984a00a33 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 unsigned NO NULL total_latency varchar(11) YES NULL @@ -8,7 +8,7 @@ avg_latency varchar(11) 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 unsigned NO NULL total_latency bigint 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 711a0f2332ab..ac299b1d5ba2 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 varchar(11) YES NULL max_latency varchar(11) YES NULL @@ -13,7 +13,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 0f3e4062e997..32667f5e48e3 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 unsigned NO NULL total_latency varchar(11) YES NULL @@ -14,7 +14,7 @@ full_scans bigint 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 unsigned NO NULL total_latency bigint 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 6dc2f367e196..703989972328 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 unsigned NO NULL total_latency varchar(11) YES NULL @@ -9,7 +9,7 @@ max_latency varchar(11) 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 unsigned NO NULL total_latency bigint unsigned NO NULL diff --git a/mysql-test/t/dd_upgrade_partition.test b/mysql-test/t/dd_upgrade_partition.test index 61a2f2049360..15dfea02b2f3 100644 --- a/mysql-test/t/dd_upgrade_partition.test +++ b/mysql-test/t/dd_upgrade_partition.test @@ -45,6 +45,7 @@ call mtr.add_suppression("Info table is not ready to be used. Table 'mysql.slave call mtr.add_suppression("Error creating connection metadata: Error checking repositories."); call mtr.add_suppression("Replica: Failed to initialize the connection metadata 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 b6c13f76fe24..567f401cc8dd 100644 --- a/mysql-test/t/dictionary_tablespace.test +++ b/mysql-test/t/dictionary_tablespace.test @@ -53,6 +53,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(".*The system table mysql.global_grants is missing.*"); 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 58c9d5501eaf..ef52f2d8fca2 100644 --- a/mysql-test/t/grant.test +++ b/mysql-test/t/grant.test @@ -823,7 +823,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. @@ -913,13 +913,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@host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890X; --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@host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890X; @@ -927,13 +927,13 @@ REVOKE CREATE ON mysqltest.* FROM some_user_name@host_1234567890abcdefghij123456 # 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@host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890X; --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@host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890X; @@ -941,13 +941,13 @@ REVOKE CREATE ON t1 FROM some_user_name@host_1234567890abcdefghij1234567890abcde # 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@host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890X; --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@host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890X; @@ -1573,7 +1573,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; # @@ -2394,10 +2394,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. @@ -2406,20 +2406,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. @@ -2428,40 +2428,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. @@ -2470,23 +2470,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 utf8mb3 set names utf8mb3; @@ -2499,64 +2499,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). @@ -2640,7 +2639,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 fd441443dbee..21b41bbf9d4e 100644 --- a/mysql-test/t/grant_dynamic.test +++ b/mysql-test/t/grant_dynamic.test @@ -492,7 +492,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(255) CHARACTER SET ASCII DEFAULT '' NOT NULL, PRIV CHAR(32) COLLATE utf8mb3_GENERAL_CI DEFAULT '' NOT NULL, WITH_GRANT_OPTION ENUM('N','Y') COLLATE utf8mb3_GENERAL_CI DEFAULT 'N' NOT NULL, diff --git a/mysql-test/t/roles.test b/mysql-test/t/roles.test index 8a3e2b2fec16..946f577ac7ba 100644 --- a/mysql-test/t/roles.test +++ b/mysql-test/t/roles.test @@ -724,7 +724,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 8c0fb24d6576..505a8c20476a 100644 --- a/mysql-test/t/sp.test +++ b/mysql-test/t/sp.test @@ -9716,7 +9716,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; @@ -9765,7 +9765,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/transactional_acl_tables.test b/mysql-test/t/transactional_acl_tables.test index 23999e8a1959..e52c34929f15 100644 --- a/mysql-test/t/transactional_acl_tables.test +++ b/mysql-test/t/transactional_acl_tables.test @@ -1980,6 +1980,9 @@ RENAME TABLE mysql.procs_priv_bak TO mysql.procs_priv; RENAME TABLE mysql.proxies_priv_bak TO mysql.proxies_priv; RENAME TABLE mysql.tables_priv_bak TO mysql.tables_priv; +# Repair InnoDB's table to 80 bytes, otherwise upgrades will fail. +ALTER TABLE mysql.columns_priv MODIFY User char(80) NOT NULL default ''; + --echo --echo ######################################################################## --echo # F. Upgrade/downgrade tests. diff --git a/mysql-test/t/trigger.test b/mysql-test/t/trigger.test index 674c8c2a2f07..6c19cf55a318 100644 --- a/mysql-test/t/trigger.test +++ b/mysql-test/t/trigger.test @@ -1257,7 +1257,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 @@ -3746,7 +3746,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 26c46aa24996..43f1564c8b4c 100644 --- a/mysql-test/t/view.test +++ b/mysql-test/t/view.test @@ -2928,7 +2928,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 39dfe931ef5b..9e135ead4b7b 100644 --- a/mysql-test/t/view_grant.test +++ b/mysql-test/t/view_grant.test @@ -2994,7 +2994,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/mysql-test/t/wl14965.test b/mysql-test/t/wl14965.test index 681c513eddcf..e38df8f4646b 100644 --- a/mysql-test/t/wl14965.test +++ b/mysql-test/t/wl14965.test @@ -14,9 +14,6 @@ SHOW KEYS FROM mysql.tables_priv; SHOW KEYS FROM mysql.columns_priv; SHOW KEYS FROM mysql.procs_priv; ---echo # Restart server without upgrade option ---source include/restart_mysqld.inc - --echo # Restart server with upgrade option --let $restart_parameters=restart:--upgrade=force --let $wait_counter= 10000 diff --git a/scripts/mysql_system_tables.sql b/scripts/mysql_system_tables.sql index 5175444e9eb7..41ff655e7d44 100644 --- a/scripts/mysql_system_tables.sql +++ b/scripts/mysql_system_tables.sql @@ -39,7 +39,7 @@ SET @cmd = "CREATE TABLE IF NOT EXISTS db ( Host char(255) CHARACTER SET ASCII 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 utf8mb3_general_ci DEFAULT 'N' NOT NULL, Insert_priv enum('N','Y') COLLATE utf8mb3_general_ci DEFAULT 'N' NOT NULL, Update_priv enum('N','Y') COLLATE utf8mb3_general_ci DEFAULT 'N' NOT NULL, @@ -74,7 +74,7 @@ set @had_db_table= @@warning_count != 0; SET @cmd = "CREATE TABLE IF NOT EXISTS user ( Host char(255) CHARACTER SET ASCII DEFAULT '' NOT NULL, -User char(32) binary DEFAULT '' NOT NULL, +User char(80) binary DEFAULT '' NOT NULL, Select_priv enum('N','Y') COLLATE utf8mb3_general_ci DEFAULT 'N' NOT NULL, Insert_priv enum('N','Y') COLLATE utf8mb3_general_ci DEFAULT 'N' NOT NULL, Update_priv enum('N','Y') COLLATE utf8mb3_general_ci DEFAULT 'N' NOT NULL, @@ -135,9 +135,9 @@ DROP PREPARE stmt; SET @cmd = "CREATE TABLE IF NOT EXISTS default_roles ( HOST CHAR(255) CHARACTER SET ASCII DEFAULT '' NOT NULL, -USER CHAR(32) BINARY DEFAULT '' NOT NULL, +USER CHAR(80) BINARY DEFAULT '' NOT NULL, DEFAULT_ROLE_HOST CHAR(255) CHARACTER SET ASCII 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 utf8mb3 COLLATE utf8mb3_bin comment='Default roles' ROW_FORMAT=DYNAMIC TABLESPACE=mysql"; SET @str = CONCAT(@cmd, " ENCRYPTION='", @is_mysql_encrypted, "'"); @@ -149,9 +149,9 @@ DROP PREPARE stmt; SET @cmd = "CREATE TABLE IF NOT EXISTS role_edges ( FROM_HOST CHAR(255) CHARACTER SET ASCII DEFAULT '' NOT NULL, -FROM_USER CHAR(32) BINARY DEFAULT '' NOT NULL, +FROM_USER CHAR(80) BINARY DEFAULT '' NOT NULL, TO_HOST CHAR(255) CHARACTER SET ASCII 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 utf8mb3_general_ci DEFAULT 'N' NOT NULL, PRIMARY KEY (FROM_HOST,FROM_USER,TO_HOST,TO_USER) ) engine=InnoDB STATS_PERSISTENT=0 CHARACTER SET utf8mb3 COLLATE utf8mb3_bin comment='Role hierarchy and role grants' ROW_FORMAT=DYNAMIC TABLESPACE=mysql"; @@ -163,7 +163,7 @@ DROP PREPARE stmt; SET @cmd = "CREATE TABLE IF NOT EXISTS global_grants ( -USER CHAR(32) BINARY DEFAULT '' NOT NULL, +USER CHAR(80) BINARY DEFAULT '' NOT NULL, HOST CHAR(255) CHARACTER SET ASCII DEFAULT '' NOT NULL, PRIV CHAR(32) COLLATE utf8mb3_general_ci DEFAULT '' NOT NULL, WITH_GRANT_OPTION ENUM('N','Y') COLLATE utf8mb3_general_ci DEFAULT 'N' NOT NULL, @@ -181,7 +181,7 @@ set @had_user_table= @@warning_count != 0; SET @cmd = "CREATE TABLE IF NOT EXISTS password_history ( Host CHAR(255) CHARACTER SET ASCII 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) @@ -246,7 +246,7 @@ SET @cmd = "CREATE TABLE IF NOT EXISTS tables_priv ( Host char(255) CHARACTER SET ASCII DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, - User char(32) binary DEFAULT '' NOT NULL, + User char(80) binary DEFAULT '' NOT NULL, Table_name char(64) binary DEFAULT '' NOT NULL, Grantor varchar(288) DEFAULT '' NOT NULL, Timestamp timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, @@ -266,7 +266,7 @@ SET @cmd = "CREATE TABLE IF NOT EXISTS columns_priv ( Host char(255) CHARACTER SET ASCII DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, - User char(32) 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, @@ -332,7 +332,7 @@ SET @cmd = "CREATE TABLE IF NOT EXISTS procs_priv ( Host char(255) CHARACTER SET ASCII DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, - User char(32) binary DEFAULT '' NOT NULL, + User char(80) binary DEFAULT '' NOT NULL, Routine_name char(64) COLLATE utf8mb3_general_ci DEFAULT '' NOT NULL, Routine_type enum('FUNCTION','PROCEDURE') NOT NULL, Grantor varchar(288) DEFAULT '' NOT NULL, @@ -582,7 +582,7 @@ INSERT IGNORE INTO engine_cost(engine_name, device_type, cost_name) VALUES ("default", 0, "io_block_read_cost"); -SET @cmd = "CREATE TABLE IF NOT EXISTS proxies_priv (Host char(255) CHARACTER SET ASCII DEFAULT '' NOT NULL, User char(32) binary DEFAULT '' NOT NULL, Proxied_host char(255) CHARACTER SET ASCII DEFAULT '' NOT NULL, Proxied_user char(32) binary DEFAULT '' NOT NULL, With_grant BOOL DEFAULT 0 NOT NULL, Grantor varchar(288) 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 utf8mb3 COLLATE utf8mb3_bin comment='User proxy privileges' ROW_FORMAT=DYNAMIC TABLESPACE=mysql"; +SET @cmd = "CREATE TABLE IF NOT EXISTS proxies_priv (Host char(255) CHARACTER SET ASCII DEFAULT '' NOT NULL, User char(80) binary DEFAULT '' NOT NULL, Proxied_host char(255) CHARACTER SET ASCII DEFAULT '' NOT NULL, Proxied_user char(80) binary DEFAULT '' NOT NULL, With_grant BOOL DEFAULT 0 NOT NULL, Grantor varchar(288) 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 utf8mb3 COLLATE utf8mb3_bin comment='User proxy privileges' ROW_FORMAT=DYNAMIC TABLESPACE=mysql"; SET @str = CONCAT(@cmd, " ENCRYPTION='", @is_mysql_encrypted, "'"); PREPARE stmt FROM @str; EXECUTE stmt; diff --git a/scripts/mysql_system_tables_fix.sql b/scripts/mysql_system_tables_fix.sql index 1708a694491a..45ac5679aa90 100644 --- a/scripts/mysql_system_tables_fix.sql +++ b/scripts/mysql_system_tables_fix.sql @@ -83,7 +83,7 @@ ALTER TABLE tables_priv ALTER TABLE tables_priv 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 '', CONVERT TO CHARACTER SET utf8mb3 COLLATE utf8mb3_bin; @@ -110,7 +110,7 @@ ALTER TABLE columns_priv ALTER TABLE columns_priv 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 utf8mb3 COLLATE utf8mb3_bin, @@ -159,8 +159,8 @@ ADD max_connections int 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 Host char(255) CHARACTER SET ASCII DEFAULT '' NOT NULL, ENGINE=InnoDB; ALTER TABLE proxies_priv MODIFY Proxied_host char(255) CHARACTER SET ASCII DEFAULT '' NOT NULL; ALTER TABLE proxies_priv MODIFY Grantor varchar(288) DEFAULT '' NOT NULL; @@ -183,7 +183,7 @@ alter table func comment='User defined functions'; # Convert all tables to UTF-8 with binary collation # and reset all char columns to correct width ALTER TABLE user - MODIFY User char(32) NOT NULL default '', + MODIFY User char(80) NOT NULL default '', CONVERT TO CHARACTER SET utf8mb3 COLLATE utf8mb3_bin; ALTER TABLE user MODIFY Select_priv enum('N','Y') COLLATE utf8mb3_general_ci DEFAULT 'N' NOT NULL, @@ -211,7 +211,7 @@ ALTER TABLE user ALTER TABLE db 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 utf8mb3 COLLATE utf8mb3_bin; ALTER TABLE db MODIFY Select_priv enum('N','Y') COLLATE utf8mb3_general_ci DEFAULT 'N' NOT NULL, @@ -362,7 +362,7 @@ UPDATE user LEFT JOIN db USING (Host,User) SET Create_user_priv='Y' SET SESSION innodb_strict_mode=OFF; ALTER TABLE procs_priv - MODIFY User char(32) NOT NULL default '', + MODIFY User char(80) NOT NULL default '', CONVERT TO CHARACTER SET utf8mb3 COLLATE utf8mb3_bin; ALTER TABLE procs_priv @@ -1410,6 +1410,25 @@ ALTER TABLE procs_priv MODIFY Host char(255) CHARACTER SET ASCII DEFAULT '' NOT NULL, MODIFY Grantor varchar(288) DEFAULT '' NOT NULL; +# Increase the length of the user column + +ALTER TABLE default_roles +MODIFY USER CHAR(80) BINARY DEFAULT '' NOT NULL, +MODIFY DEFAULT_ROLE_USER char (80) binary DEFAULT '' NOT NULL; + +ALTER TABLE role_edges +MODIFY FROM_USER CHAR(80) BINARY DEFAULT '' NOT NULL, +MODIFY TO_USER CHAR(80) BINARY DEFAULT '' NOT NULL; + +ALTER TABLE global_grants +MODIFY USER CHAR(80) BINARY DEFAULT '' NOT NULL; + +ALTER TABLE password_history +MODIFY User CHAR(80) BINARY DEFAULT '' NOT NULL; + +ALTER TABLE columns_priv +MODIFY User char(80) binary DEFAULT '' NOT NULL; + # Update the table row format to DYNAMIC ALTER TABLE columns_priv ROW_FORMAT=DYNAMIC; ALTER TABLE db ROW_FORMAT=DYNAMIC; diff --git a/sql/dd/info_schema/metadata.h b/sql/dd/info_schema/metadata.h index 195157cb48f3..44af0d4662fe 100644 --- a/sql/dd/info_schema/metadata.h +++ b/sql/dd/info_schema/metadata.h @@ -255,11 +255,14 @@ namespace info_schema { Changed the status column of information_schema.events to show correct terminology + + 80300-001: + - information_schema tables changed to have username of 80 chars */ -static const uint IS_DD_VERSION = 80200; +static const uint IS_DD_VERSION = 80300001; static_assert((IS_DD_VERSION <= MYSQL_VERSION_ID) || - ((IS_DD_VERSION == 800201) && (MYSQL_VERSION_ID >= 80020)), + ((IS_DD_VERSION == 80300001) && (MYSQL_VERSION_ID >= 80300)), "This release can not use a version number from the future"); /** diff --git a/sql/log_event.cc b/sql/log_event.cc index a1e943ac411d..c5237968d213 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -3520,9 +3520,10 @@ bool Query_log_event::write(Basic_ostream *ostream) { }); /* - 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/ha_perfschema.cc b/storage/perfschema/ha_perfschema.cc index 8955863b36b4..3c469da872c0 100644 --- a/storage/perfschema/ha_perfschema.cc +++ b/storage/perfschema/ha_perfschema.cc @@ -93,7 +93,7 @@ */ static_assert((PFS_DD_VERSION <= MYSQL_VERSION_ID) || - ((PFS_DD_VERSION == 80300001) && (MYSQL_VERSION_ID == 80300)), + ((PFS_DD_VERSION == 80300002) && (MYSQL_VERSION_ID == 80300)), "This release can not use a version number from the future"); class KEY; diff --git a/storage/perfschema/pfs_dd_version.h b/storage/perfschema/pfs_dd_version.h index fb372bcf4ba8..78707731e1b8 100644 --- a/storage/perfschema/pfs_dd_version.h +++ b/storage/perfschema/pfs_dd_version.h @@ -236,10 +236,33 @@ performance_schema tables changed: - session_query_attrs added. + 80300-002: + 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 80300-001. i.e. 8.3.0 Facebook schema change no. 1. + Version published is now 80300-002. i.e. 8.3.0 Facebook schema change no. 2. */ -static const uint PFS_DD_VERSION = 80300001; +static const uint PFS_DD_VERSION = 80300002; #endif /* PFS_DD_VERSION_H */ diff --git a/storage/perfschema/table_accounts.cc b/storage/perfschema/table_accounts.cc index d0446780b202..b8caff8b96ff 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(255) CHARACTER SET ASCII 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 20ed276c4b6d..b1893328f559 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(255) CHARACTER SET ASCII 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 fd9235f1530d..5fb5f26593d3 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 e55340c04ef5..14568c7fbcd3 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(255) CHARACTER SET ASCII 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 cb1bc7809d22..61ad8c3b9a0d 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 8dc72c0a0dc2..6dce0b18fff9 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(255) CHARACTER SET ASCII 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 271b2124924e..3ce2ac1e9f12 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 d52659d54441..ebfb726efe0f 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(255) CHARACTER SET ASCII 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 06f58689b028..9648826d0c65 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 7f0e005dedae..13aff7fc8b97 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(255) CHARACTER SET ASCII 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 4d8ff3903b4b..eaff44d2c93e 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_mems_by_account_by_event_name.cc b/storage/perfschema/table_mems_by_account_by_event_name.cc index f124dac8d778..5f8b716a6086 100644 --- a/storage/perfschema/table_mems_by_account_by_event_name.cc +++ b/storage/perfschema/table_mems_by_account_by_event_name.cc @@ -50,7 +50,7 @@ Plugin_table table_mems_by_account_by_event_name::m_table_def( /* Name */ "memory_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(255) CHARACTER SET ASCII default null,\n" " EVENT_NAME VARCHAR(128) not null,\n" " COUNT_ALLOC BIGINT unsigned not null,\n" diff --git a/storage/perfschema/table_mems_by_user_by_event_name.cc b/storage/perfschema/table_mems_by_user_by_event_name.cc index 91a743a8239d..729c1aaa96c0 100644 --- a/storage/perfschema/table_mems_by_user_by_event_name.cc +++ b/storage/perfschema/table_mems_by_user_by_event_name.cc @@ -50,7 +50,7 @@ Plugin_table table_mems_by_user_by_event_name::m_table_def( /* Name */ "memory_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_ALLOC BIGINT UNSIGNED not null,\n" " COUNT_FREE BIGINT UNSIGNED not null,\n" diff --git a/storage/perfschema/table_processlist.cc b/storage/perfschema/table_processlist.cc index 7d7fb8bc4bf9..684620b594f4 100644 --- a/storage/perfschema/table_processlist.cc +++ b/storage/perfschema/table_processlist.cc @@ -48,7 +48,7 @@ THR_LOCK table_processlist::m_table_lock; -static_assert(USERNAME_CHAR_LENGTH == 32, "Fix USER size"); +static_assert(USERNAME_CHAR_LENGTH == 80, "Fix USER size"); static_assert(HOST_AND_PORT_LENGTH == 261, "Fix HOST size"); Plugin_table table_processlist::m_table_def( diff --git a/storage/perfschema/table_replication_connection_configuration.cc b/storage/perfschema/table_replication_connection_configuration.cc index e72e98982b7e..5a65a0e4c22f 100644 --- a/storage/perfschema/table_replication_connection_configuration.cc +++ b/storage/perfschema/table_replication_connection_configuration.cc @@ -54,7 +54,7 @@ Plugin_table table_replication_connection_configuration::m_table_def( " CHANNEL_NAME CHAR(64) not null,\n" " HOST CHAR(255) CHARACTER SET ASCII 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 b50ed6120dee..fd82ae1525c4 100644 --- a/storage/perfschema/table_setup_actors.cc +++ b/storage/perfschema/table_setup_actors.cc @@ -52,7 +52,7 @@ Plugin_table table_setup_actors::m_table_def( "setup_actors", /* Definition */ " HOST CHAR(255) CHARACTER SET ASCII 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 8cb278956457..7948685d6b3f 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(255) CHARACTER SET ASCII 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 afcacf0952a7..93dc580daf57 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 4912e50e3408..0206c210753e 100644 --- a/storage/perfschema/table_threads.cc +++ b/storage/perfschema/table_threads.cc @@ -54,7 +54,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(255) CHARACTER SET ASCII default null,\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 2b0ff4a7adde..4fb4706df3be 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" " MAX_SESSION_CONTROLLED_MEMORY BIGINT unsigned not null,\n" diff --git a/storage/perfschema/table_variables_info.cc b/storage/perfschema/table_variables_info.cc index 23c5c570479a..33c109e8d264 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(255) CHARACTER SET ASCII default null\n", /* Options */ " ENGINE=PERFORMANCE_SCHEMA",