bzr push into mysql-5.5 branch (mayank.prasad:3880 to 3881) Bug#13417440

[Mayank Prasad]

 3881 Mayank Prasad	2012-07-03
      Bug#13417440 : 63340: ARCHIVE FILE IO NOT INSTRUMENTED
      
      Details:
       - Modified test case to make sure its run for all and not only
         for archive Storage Engine.

    modified:
      mysql-test/suite/perfschema/r/query_cache.result
      mysql-test/suite/perfschema/t/query_cache.test
 3880 Gleb Shchepa	2012-06-29 [merge]
      auto-merge

    modified:
      sql/field.cc
      sql/sql_yacc.yy
=== modified file 'mysql-test/suite/perfschema/r/query_cache.result'
--- a/mysql-test/suite/perfschema/r/query_cache.result	2012-05-24 17:30:32 +0000
+++ b/mysql-test/suite/perfschema/r/query_cache.result	2012-07-03 04:25:51 +0000
@@ -36,9 +36,9 @@ Qcache_hits	1
 select spins from performance_schema.events_waits_current order by event_name limit 1;
 spins
 NULL
-select name from performance_schema.setup_instruments order by name limit 1;
-name
-wait/io/file/archive/data
+select * from performance_schema.setup_timers where name='wait';
+NAME	TIMER_NAME
+wait	CYCLE
 show status like "Qcache_queries_in_cache";
 Variable_name	Value
 Qcache_queries_in_cache	1
@@ -51,9 +51,9 @@ Qcache_hits	1
 select spins from performance_schema.events_waits_current order by event_name limit 1;
 spins
 NULL
-select name from performance_schema.setup_instruments order by name limit 1;
-name
-wait/io/file/archive/data
+select * from performance_schema.setup_timers where name='wait';
+NAME	TIMER_NAME
+wait	CYCLE
 show status like "Qcache_queries_in_cache";
 Variable_name	Value
 Qcache_queries_in_cache	1

=== modified file 'mysql-test/suite/perfschema/t/query_cache.test'
--- a/mysql-test/suite/perfschema/t/query_cache.test	2012-06-05 10:27:20 +0000
+++ b/mysql-test/suite/perfschema/t/query_cache.test	2012-07-03 04:25:51 +0000
@@ -6,7 +6,6 @@
 --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;
@@ -35,7 +34,7 @@ show status like "Qcache_hits";
 
 select spins from performance_schema.events_waits_current order by event_name limit 1;
 
-select name from performance_schema.setup_instruments order by name limit 1;
+select * from performance_schema.setup_timers where name='wait';
 
 show status like "Qcache_queries_in_cache";
 show status like "Qcache_inserts";
@@ -43,7 +42,7 @@ show status like "Qcache_hits";
 
 select spins from performance_schema.events_waits_current order by event_name limit 1;
 
-select name from performance_schema.setup_instruments order by name limit 1;
+select * from performance_schema.setup_timers where name='wait';
 
 show status like "Qcache_queries_in_cache";
 show status like "Qcache_inserts";

No bundle (reason: useless for push emails).