Patch clean up.

Fixed interference between tests: Users were added but not properly removed.
This caused later tests to fail.

mysql-test/r/grant.result

@@ -1146,8 +1146,8 @@ select col1 from test limit 1 into tmp;
 return '1';
 end|
 create view v1 as select test.* from test where test.col1=test_function();
-grant update (col1) on v1 to 'greg';
-revoke all privileges on v1 from 'greg';
+grant update (col1) on v1 to 'greg'@'localhost';
+drop user 'greg'@'localhost';
 drop view v1;
 drop table test;
 drop function test_function;

mysql-test/t/grant.test

@@ -1169,8 +1169,8 @@ begin
 end|
 delimiter ;|
 create view v1 as select test.* from test where test.col1=test_function();
-grant update (col1) on v1 to 'greg';
-revoke all privileges on v1 from 'greg';
+grant update (col1) on v1 to 'greg'@'localhost';
+drop user 'greg'@'localhost';
 drop view v1;
 drop table test;
 drop function test_function;