Merge pcgem.rdg.cyberkinetica.com:/mnt/staff/repositories/mysql-4.1

into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/bug6469
This commit is contained in:
acurtis@pcgem.rdg.cyberkinetica.com 2004-11-11 17:07:57 +00:00
commit e0527b1750

View file

@ -5627,7 +5627,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;
}
@ -5653,10 +5653,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;