1 files changed, 72 insertions, 0 deletions
diff --git a/mysql-test/suite/roles/none_public.result b/mysql-test/suite/roles/none_public.result
new file mode 100644
index 00000000..a6c896c9
--- /dev/null
+++ b/mysql-test/suite/roles/none_public.result
@@ -0,0 +1,72 @@
+create role role1;
+create role none;
+ERROR OP000: Invalid role specification `NONE`
+create role public;
+ERROR OP000: Invalid role specification `PUBLIC`
+drop role none;
+ERROR HY000: Operation DROP ROLE failed for 'NONE'
+drop role public;
+ERROR HY000: Operation DROP ROLE failed for PUBLIC
+grant none to role1;
+ERROR OP000: Invalid role specification `NONE`
+grant role1 to none;
+ERROR OP000: Invalid role specification `none`
+grant select on *.* to none;
+ERROR OP000: Invalid role specification `none`
+grant public to role1;
+ERROR OP000: Invalid role specification `PUBLIC`
+grant role1 to public;
+grant select on *.* to public;
+grant role1 to current_role;
+ERROR OP000: Invalid role specification `NONE`
+revoke none from role1;
+ERROR OP000: Invalid role specification `NONE`
+revoke role1 from none;
+ERROR OP000: Invalid role specification `none`
+revoke select on *.* from none;
+ERROR OP000: Invalid role specification `none`
+revoke public from role1;
+ERROR OP000: Invalid role specification `PUBLIC`
+revoke role1 from public;
+revoke select on *.* from public;
+show grants for none;
+ERROR OP000: Invalid role specification `none`
+show grants for public;
+Grants for PUBLIC
+create definer=none view test.v1 as select 1;
+ERROR OP000: Invalid role specification `none`
+create definer=public view test.v1 as select 1;
+ERROR OP000: Invalid role specification `public`
+drop role role1;
+create user foo@localhost;
+connect foo,localhost,foo;
+set default role public;
+ERROR OP000: Invalid role specification `PUBLIC`
+disconnect foo;
+connection default;
+update mysql.global_priv set priv=json_insert(priv, '$.default_role', 'none') where user='foo';
+connect foo,localhost,foo;
+show grants;
+Grants for foo@localhost
+GRANT USAGE ON *.* TO `foo`@`localhost`
+select * from information_schema.enabled_roles;
+ROLE_NAME
+NULL
+disconnect foo;
+connection default;
+update mysql.global_priv set priv=json_insert(priv, '$.default_role', 'public') where user='foo';
+connect foo,localhost,foo;
+show grants;
+Grants for foo@localhost
+GRANT USAGE ON *.* TO `foo`@`localhost`
+select * from information_schema.enabled_roles;
+ROLE_NAME
+NULL
+disconnect foo;
+connection default;
+drop user foo@localhost;
+insert mysql.global_priv values ('', 'none', '{"is_role":true}');
+flush privileges;
+Warnings:
+Error	1959	Invalid role specification `none`
+delete from mysql.global_priv where host='';