Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt

into  moonbone.local:/mnt/gentoo64/work/27878-bug-5.0-opt-mysql

Author: evgen@moonbone.local

mysql-test/r/grant.result

@@ -1121,7 +1121,7 @@ SELECT * FROM test.t1;
 f1	f2
 1	1
 2	2
-DROP VIEW v1;
+DROP DATABASE db27878;
 use test;
 DROP TABLE t1;
 End of 5.0 tests

mysql-test/t/grant.test

@@ -1144,7 +1144,7 @@ UPDATE v1 SET f2 = 4;
 SELECT * FROM test.t1;
 disconnect user1;
 connection default;
-DROP VIEW v1;
+DROP DATABASE db27878;
 use test;
 DROP TABLE t1;