bzr push into mysql-5.5 branch (tor.didriksen:3861 to 3862) Bug#13417440

[Tor Didriksen]

 3862 Tor Didriksen	2012-06-05
      Bug#13417440 : 63340: ARCHIVE FILE IO NOT INSTRUMENTED
      
      Followup patch: wrong result unless archive storage engine is available.

    modified:
      mysql-test/suite/perfschema/t/query_cache.test
 3861 Annamalai Gurusami	2012-06-01 [merge]
      Null merge from mysql-5.1 to mysql-5.5. 

=== modified file 'mysql-test/suite/perfschema/t/query_cache.test'
--- a/mysql-test/suite/perfschema/t/query_cache.test	2011-10-19 21:44:17 +0000
+++ b/mysql-test/suite/perfschema/t/query_cache.test	2012-06-05 10:27:20 +0000
@@ -6,6 +6,7 @@
 --source include/have_query_cache.inc
 --source include/not_embedded.inc
 --source include/have_perfschema.inc
+--source include/have_archive.inc
 
 --disable_warnings
 drop table if exists t1;

No bundle (reason: useless for push emails).