diff options
| author | unknown <acurtis@pcgem.rdg.cyberkinetica.com> | 2004-11-11 17:12:25 +0000 |
|---|---|---|
| committer | unknown <acurtis@pcgem.rdg.cyberkinetica.com> | 2004-11-11 17:12:25 +0000 |
| commit | 3afd8e79016be289cf14dafa268f08313899182f (patch) | |
| tree | bf7761682d8c30f5204dbede1a05b0fee6c1cb7c /sql | |
| parent | df6f09881393a00f7f33c9dade44868b835171f0 (diff) | |
| parent | e4a0b794d93fa393bd5cff0f3f1a8c705340d812 (diff) | |
| download | mariadb-git-3afd8e79016be289cf14dafa268f08313899182f.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/bug6469
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql')
| -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 7fa6549686b..d842b4b66bb 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -5628,7 +5628,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; } @@ -5654,10 +5654,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; |