diff options
| author | unknown <acurtis@pcgem.rdg.cyberkinetica.com> | 2004-11-10 18:53:16 +0000 |
|---|---|---|
| committer | unknown <acurtis@pcgem.rdg.cyberkinetica.com> | 2004-11-10 18:53:16 +0000 |
| commit | c2e3f7cf86ee257b7c95119580fc5bf52c6a5465 (patch) | |
| tree | 8a50d1baa457240a24083afbd8495bb7617e933a /sql/sql_yacc.yy | |
| parent | fdc79aa30a4dc00eb4f2666901b0ff388aab185a (diff) | |
| download | mariadb-git-c2e3f7cf86ee257b7c95119580fc5bf52c6a5465.tar.gz | |
Bug#6469 - REVOKE ALL synonymy bug
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 94c0fe3cf0c..2c1416e1bfd 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -5612,7 +5612,7 @@ revoke_command: grant_privileges ON opt_table FROM user_list {} | - ALL PRIVILEGES ',' GRANT OPTION FROM user_list + ALL opt_privileges ',' GRANT OPTION FROM user_list { Lex->sql_command = SQLCOM_REVOKE_ALL; } @@ -5638,10 +5638,14 @@ grant: grant_privileges: grant_privilege_list {} - | ALL PRIVILEGES { Lex->grant = GLOBAL_ACLS;} - | ALL { Lex->grant = GLOBAL_ACLS;} + | ALL opt_privileges { Lex->grant = GLOBAL_ACLS;} ; +opt_privileges: + /* empty */ + | PRIVILEGES + ; + grant_privilege_list: grant_privilege | grant_privilege_list ',' grant_privilege; |