Skip to content

Commit fafb35e

Browse files
committed
MDEV-20076: SHOW GRANTS does not quote role names properly
Quotes added to output.
1 parent b3ded21 commit fafb35e

File tree

103 files changed

+2124
-1997
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+2124
-1997
lines changed

mysql-test/main/connect.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,12 @@ update mysql.user set password=old_password("gambling2") where user=_binary"test
108108
flush privileges;
109109
show grants for test@localhost;
110110
Grants for test@localhost
111-
GRANT ALL PRIVILEGES ON *.* TO 'test'@'localhost' IDENTIFIED BY PASSWORD '2f27438961437573'
111+
GRANT ALL PRIVILEGES ON *.* TO `test`@`localhost` IDENTIFIED BY PASSWORD '2f27438961437573'
112112
update mysql.user set plugin='mysql_old_password' where user='test';
113113
flush privileges;
114114
show grants for test@localhost;
115115
Grants for test@localhost
116-
GRANT ALL PRIVILEGES ON *.* TO 'test'@'localhost' IDENTIFIED BY PASSWORD '2f27438961437573'
116+
GRANT ALL PRIVILEGES ON *.* TO `test`@`localhost` IDENTIFIED BY PASSWORD '2f27438961437573'
117117
connect con10,localhost,test,gambling2,;
118118
connect con5,localhost,test,gambling2,mysql;
119119
connection con5;

mysql-test/main/events_bugs.result

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp
618618
USE test;
619619
SHOW GRANTS FOR CURRENT_USER;
620620
Grants for root@localhost
621-
GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
621+
GRANT ALL PRIVILEGES ON *.* TO `root`@`localhost` WITH GRANT OPTION
622622
GRANT PROXY ON ''@'%' TO 'root'@'localhost' WITH GRANT OPTION
623623
SET GLOBAL event_scheduler = ON;
624624
CREATE TABLE events_test.event_log
@@ -632,9 +632,9 @@ GRANT create, insert, select, event ON events_test.* TO evtest1@localhost;
632632
GRANT select,insert ON test.* TO evtest1@localhost;
633633
SHOW GRANTS FOR evtest1@localhost;
634634
Grants for evtest1@localhost
635-
GRANT USAGE ON *.* TO 'evtest1'@'localhost' IDENTIFIED BY PASSWORD '*3170F3644E31580C25DE4A08F4C07CC9A2D40C32'
636-
GRANT SELECT, INSERT ON `test`.* TO 'evtest1'@'localhost'
637-
GRANT SELECT, INSERT, CREATE, EVENT ON `events_test`.* TO 'evtest1'@'localhost'
635+
GRANT USAGE ON *.* TO `evtest1`@`localhost` IDENTIFIED BY PASSWORD '*3170F3644E31580C25DE4A08F4C07CC9A2D40C32'
636+
GRANT SELECT, INSERT ON `test`.* TO `evtest1`@`localhost`
637+
GRANT SELECT, INSERT, CREATE, EVENT ON `events_test`.* TO `evtest1`@`localhost`
638638
connect e1,localhost,evtest1,ev1,events_test,$MASTER_MYPORT,$MASTER_MYSOCK;
639639
CREATE EVENT ev_sched_1823 ON SCHEDULE EVERY 2 SECOND
640640
DO BEGIN

mysql-test/main/events_grant.result

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ USER() DATABASE()
2323
ev_test@localhost events_test2
2424
SHOW GRANTS;
2525
Grants for ev_test@localhost
26-
GRANT USAGE ON *.* TO 'ev_test'@'localhost'
27-
GRANT ALL PRIVILEGES ON `events_test`.* TO 'ev_test'@'localhost'
28-
GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, TRIGGER, DELETE HISTORY ON `events_test2`.* TO 'ev_test'@'localhost'
26+
GRANT USAGE ON *.* TO `ev_test`@`localhost`
27+
GRANT ALL PRIVILEGES ON `events_test`.* TO `ev_test`@`localhost`
28+
GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, TRIGGER, DELETE HISTORY ON `events_test2`.* TO `ev_test`@`localhost`
2929
"Here comes an error:";
3030
SHOW EVENTS;
3131
ERROR 42000: Access denied for user 'ev_test'@'localhost' to database 'events_test2'

mysql-test/main/fix_priv_tables.result

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,25 @@ SELECT * FROM testdb.t1;
1010
GRANT CREATE VIEW, SHOW VIEW ON testdb.v1 TO 'show_view_tbl'@'localhost';
1111
SHOW GRANTS FOR 'show_view_tbl'@'localhost';
1212
Grants for show_view_tbl@localhost
13-
GRANT USAGE ON *.* TO 'show_view_tbl'@'localhost'
14-
GRANT CREATE VIEW, SHOW VIEW ON `testdb`.`v1` TO 'show_view_tbl'@'localhost'
13+
GRANT USAGE ON *.* TO `show_view_tbl`@`localhost`
14+
GRANT CREATE VIEW, SHOW VIEW ON `testdb`.`v1` TO `show_view_tbl`@`localhost`
1515

1616
GRANT SELECT(c1) on testdb.v1 to 'select_only_c1'@localhost;
1717
SHOW GRANTS FOR 'select_only_c1'@'localhost';
1818
Grants for select_only_c1@localhost
19-
GRANT USAGE ON *.* TO 'select_only_c1'@'localhost'
20-
GRANT SELECT (c1) ON `testdb`.`v1` TO 'select_only_c1'@'localhost'
19+
GRANT USAGE ON *.* TO `select_only_c1`@`localhost`
20+
GRANT SELECT (c1) ON `testdb`.`v1` TO `select_only_c1`@`localhost`
2121

2222
"after fix privs"
2323
SHOW GRANTS FOR 'show_view_tbl'@'localhost';
2424
Grants for show_view_tbl@localhost
25-
GRANT USAGE ON *.* TO 'show_view_tbl'@'localhost'
26-
GRANT CREATE VIEW, SHOW VIEW ON `testdb`.`v1` TO 'show_view_tbl'@'localhost'
25+
GRANT USAGE ON *.* TO `show_view_tbl`@`localhost`
26+
GRANT CREATE VIEW, SHOW VIEW ON `testdb`.`v1` TO `show_view_tbl`@`localhost`
2727

2828
SHOW GRANTS FOR 'select_only_c1'@'localhost';
2929
Grants for select_only_c1@localhost
30-
GRANT USAGE ON *.* TO 'select_only_c1'@'localhost'
31-
GRANT SELECT (c1) ON `testdb`.`v1` TO 'select_only_c1'@'localhost'
30+
GRANT USAGE ON *.* TO `select_only_c1`@`localhost`
31+
GRANT SELECT (c1) ON `testdb`.`v1` TO `select_only_c1`@`localhost`
3232

3333
DROP USER 'show_view_tbl'@'localhost';
3434
DROP USER 'select_only_c1'@'localhost';

0 commit comments

Comments
 (0)