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

into mysql.com:/home/jonas/src/mysql-4.1

mysql-test/r/grant.result

@@ -228,7 +228,7 @@ GRANT USAGE ON *.* TO '
 GRANT SELECT () ON ``.`` TO ''@'localhost'
 REVOKE SELECT () ON . FROM @localhost;
 DROP DATABASE ;
-SET NAMES latin1;
+SET NAMES binary;
 insert into mysql.user (host, user) values ('localhost', 'test11');
 insert into mysql.db (host, db, user, select_priv) values 
 ('localhost', 'a%', 'test11', 'Y'), ('localhost', 'ab%', 'test11', 'Y');