Merge dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0-opt

into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.1-opt


mysql-test/r/view_grant.result:
  Auto merged

mysql-test/r/view_grant.result

@@ -727,8 +727,7 @@ CREATE VIEW v1 AS SELECT * FROM t1;
 DROP USER def_17254@localhost;
 for a user
 SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'inv_17254'@'localhost' for table 'v1
-'
+ERROR 42000: SELECT command denied to user 'inv_17254'@'localhost' for table 'v1'
 for a superuser
 SELECT * FROM v1;
 ERROR HY000: There is no 'def_17254'@'localhost' registered