Merge mysql.com:/usr/home/bar/mysql-4.1.b14406

into  mysql.com:/usr/home/bar/mysql-5.0


mysql-test/r/ps_grant.result:
  Auto merged
mysql-test/t/grant.test:
  Auto merged

mysql-test/t/grant.test

@@ -487,4 +487,16 @@ flush privileges;
 set @user123="non-existent";
 select * from mysql.db where user=@user123;
 
+set names koi8r;
+create database ;
+grant select on .* to root@localhost;
+select hex(Db) from mysql.db where Db='';
+show grants for root@localhost;
+flush privileges;
+show grants for root@localhost;
+drop database ;
+revoke all privileges on .* from root@localhost;
+show grants for root@localhost;
+set names latin1;
+
 # End of 4.1 tests