Merge bk-internal.mysql.com:/home/bk/mysql-4.1

into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/bug6469

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;