Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-4.1

into book.sanja.is.com.ua:/Users/bell/mysql/bk/work-4.1

mysql-test/r/grant_cache.result

 drop table if exists test.t1,mysqltest.t1,mysqltest.t2;
 drop database if exists mysqltest;
+set GLOBAL query_cache_size=1355776;
 reset query cache;
 flush status;
 show grants for current_user;
@@ -206,3 +207,4 @@ delete from mysql.columns_priv where user in ("mysqltest_1","mysqltest_2","mysql
 flush privileges;
 drop table test.t1,mysqltest.t1,mysqltest.t2;
 drop database mysqltest;
+set GLOBAL query_cache_size=default;

mysql-test/t/grant_cache-master.opt

---set-variable=query_cache_size=1355776

mysql-test/t/grant_cache.test

@@ -10,6 +10,8 @@ drop table if exists test.t1,mysqltest.t1,mysqltest.t2;
 drop database if exists mysqltest;
 --enable_warnings
 
+set GLOBAL query_cache_size=1355776;
+
 reset query cache;
 flush status;
 connect (root,localhost,root,,test,$MASTER_MYPORT,master.sock);
@@ -145,3 +147,5 @@ delete from mysql.columns_priv where user in ("mysqltest_1","mysqltest_2","mysql
 flush privileges;
 drop table test.t1,mysqltest.t1,mysqltest.t2;
 drop database mysqltest;
+
+set GLOBAL query_cache_size=default;