bzr push into mysql-5.5 branch (sneha.modi:3599 to 3600) Bug#28211 Bug#11754170

[Sneha Modi]

 3600 Sneha Modi	2011-11-10
       Bug#11754170:45729: TEST CASE FOR BUG#28211 IS DISABLED IN QUERY_CACHE.TEST
            
            A patch for this bug has already been pushed. A minor change is made here.
            The database to be used after re-enabling the disabled code is 'TEST'.
            But instead, 'MYSQL' was being used. 
            This is the minor change that is being made here.

    modified:
      mysql-test/r/query_cache.result
      mysql-test/t/query_cache.test
 3599 Bjorn Munch	2011-11-09 [merge]
      merge 5.5-mtr => 5.5

    modified:
      client/mysqltest.cc
      mysql-test/extra/binlog_tests/ctype_ucs_binlog.test
      mysql-test/r/mysqltest.result
      mysql-test/t/mysqltest.test
=== modified file 'mysql-test/r/query_cache.result'
--- a/mysql-test/r/query_cache.result	2011-11-02 13:12:52 +0000
+++ b/mysql-test/r/query_cache.result	2011-11-10 06:34:23 +0000
@@ -1615,7 +1615,7 @@ use db3;
 create table t1(c1 int) engine=myisam;
 use db1;
 insert into t1(c1) values (1);
-use mysql;
+use test;
 select * from db1.t1;
 c1
 1
@@ -1661,7 +1661,7 @@ c1
 2
 SHOW STATUS LIKE 'Qcache_hits';
 Variable_name	Value
-Qcache_hits	0
+Qcache_hits	1
 DROP TABLE t1;
 SET GLOBAL concurrent_insert= @save_concurrent_insert;
 SET GLOBAL query_cache_size= default;
@@ -1691,7 +1691,7 @@ a
 COMMIT;
 SHOW STATUS LIKE 'Qcache_queries_in_cache';
 Variable_name	Value
-Qcache_queries_in_cache	0
+Qcache_queries_in_cache	2
 SHOW STATUS LIKE "Qcache_hits";
 Variable_name	Value
 Qcache_hits	0
@@ -1713,7 +1713,7 @@ a
 COMMIT;
 SHOW STATUS LIKE "Qcache_hits";
 Variable_name	Value
-Qcache_hits	0
+Qcache_hits	2
 DROP TABLE t1;
 SET GLOBAL query_cache_size= default;
 End of 5.0 tests

=== modified file 'mysql-test/t/query_cache.test'
--- a/mysql-test/t/query_cache.test	2011-11-02 13:12:52 +0000
+++ b/mysql-test/t/query_cache.test	2011-11-10 06:34:23 +0000
@@ -1224,7 +1224,7 @@ show status like 'Qcache_free_blocks';
  create table t1(c1 int) engine=myisam;
  use db1;
  insert into t1(c1) values (1);
- use mysql;
+ use test;
  select * from db1.t1;
  select c1+1 from db1.t1;
  select * from db3.t1;

No bundle (reason: useless for push emails).