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

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck

mysql-test/r/grant.result

@@ -436,6 +436,7 @@ revoke all privileges on mysqltest.t1 from mysqltest_1@localhost;
 delete from mysql.user where user=_binary'mysqltest_1';
 drop database mysqltest;
 use mysql;
-insert into tables_priv values ('','mysqltest_1','test_table','test_grantor','',CURRENT_TIMESTAMP,'Select','Select');
+insert into tables_priv values ('','test_db','mysqltest_1','test_table','test_grantor',CURRENT_TIMESTAMP,'Select','Select');
 flush privileges;
 delete from tables_priv where host = '' and user = 'mysqltest_1';
+flush privileges;

mysql-test/r/query_cache.result

@@ -1057,6 +1057,5 @@ Qcache_inserts	2
 show status like "Qcache_hits";
 Variable_name	Value
 Qcache_hits	1
-
 drop table t1;
 set GLOBAL query_cache_size=0;

mysql-test/t/grant.test

@@ -397,6 +397,7 @@ drop database mysqltest;
 #
 connection default;
 use mysql;
-insert into tables_priv values ('','mysqltest_1','test_table','test_grantor','',CURRENT_TIMESTAMP,'Select','Select');
+insert into tables_priv values ('','test_db','mysqltest_1','test_table','test_grantor',CURRENT_TIMESTAMP,'Select','Select');
 flush privileges;
 delete from tables_priv where host = '' and user = 'mysqltest_1';
+flush privileges;