Bug#6469 - REVOKE ALL synonymy bug

b6272b85 · acurtis@pcgem.rdg.cyberkinetica.com · 2f500447 · b6272b85
Commit b6272b85 authored Nov 10, 2004 by acurtis@pcgem.rdg.cyberkinetica.com
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

sql/sql_yacc.yy sql/sql_yacc.yy +7 -3

No files found.
--- 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;