bzr push into mysql-trunk-wl5767 branch (mayank.prasad:3439 to 3440) WL#5767

[Mayank Prasad]

 3440 Mayank Prasad	2012-02-10
      WL#5767 : Performance Schema, Statements Digest
      
      Details:
       - Added missing test case result file.

    added:
      mysql-test/suite/perfschema/r/statement_digest_consumers.result
 3439 Mayank Prasad	2012-02-10
      WL#5767 : Performance Schema, Statements Digest
      
      Details:
       - Made digest_storage part of digest_locker_state.
       - Remove dependency of consumer digest_storage from consumer
         statement_current.
       - Enabled new test case.

    modified:
      include/mysql/psi/psi.h
      include/mysql/psi/psi_abi_v1.h.pp
      mysql-test/suite/perfschema/t/disabled.def
      mysql-test/suite/perfschema/t/statement_digest_consumers.test
      storage/perfschema/pfs.cc
      storage/perfschema/pfs_digest.cc
      storage/perfschema/pfs_digest.h
      storage/perfschema/pfs_events_statements.h
      storage/perfschema/table_events_statements.cc
=== added file 'mysql-test/suite/perfschema/r/statement_digest_consumers.result'
--- a/mysql-test/suite/perfschema/r/statement_digest_consumers.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/perfschema/r/statement_digest_consumers.result	2012-02-10 12:58:30 +0000
@@ -0,0 +1,109 @@
+####################################
+# SETUP
+####################################
+create database statements_digest;
+use statements_digest;
+create table t1(a int);
+create table t2(a int);
+create table t3(a int, b int);
+create table t4(a int, b int);
+create table t5(a int, b int, c int);
+select * from performance_schema.setup_consumers;
+NAME	ENABLED
+events_stages_current	YES
+events_stages_history	YES
+events_stages_history_long	YES
+events_statements_current	NO
+events_statements_history	YES
+events_statements_history_long	YES
+events_waits_current	YES
+events_waits_history	YES
+events_waits_history_long	YES
+global_instrumentation	YES
+thread_instrumentation	YES
+statements_digest	YES
+truncate table performance_schema.events_statements_summary_by_digest;
+####################################
+# EXECUTION
+####################################
+select 1 from t1;
+1
+select 1,2 from t1;
+1	2
+select 1, 2, 3, 4 from t1;
+1	2	3	4
+select 1 from t2;
+1
+select 1,2 from t2;
+1	2
+select 1, 2, 3, 4 from t2;
+1	2	3	4
+insert into t1 values (1);
+insert into t2 values (1);
+insert into t3 values (1, 2);
+insert into t4 values (1, 2);
+insert into t5 values (1, 2, 3);
+insert into t1 values (1), (2), (3);
+insert into t1 values (1), (2), (3), (4);
+insert into t3 values (1, 2), (3, 4), (5, 6);
+insert into t5 values (1, 2, 3), (4, 5, 6), (7, 8, 9);
+SELECT                                          1           +        1;
+1           +        1
+2
+SELECT 1;
+1
+1
+SELECT 1 /* This is an inline comment */ + 1;
+1 /* This is an inline comment */ + 1
+2
+SELECT 1+
+/*
+this is a
+multiple-line comment
+*/
+1;
+1+
+/*
+this is a
+multiple-line comment
+*/
+1
+2
+create schema statements_digest_temp;
+drop schema statements_digest_temp;
+create database statements_digest_temp;
+drop database statements_digest_temp;
+####################################
+# QUERYING PS STATEMENT DIGEST
+####################################
+select DIGEST, DIGEST_TEXT, COUNT_STAR from performance_schema.events_statements_summary_by_digest;
+DIGEST	DIGEST_TEXT	COUNT_STAR
+NULL	NULL	0
+bb399912758e2135	TRUNCATE TABLE performance_schema . events_statements_summary_by_digest  	1
+c4cdaf6f814e367d	SELECT ? FROM t1  	1
[phone]ba1f6965	SELECT ?, ... FROM t1  	2
+dd87e085c2c5a2b6	SELECT ? FROM t2  	1
+fc7ca6a130fec1a4	SELECT ?, ... FROM t2  	2
+164f41cc7a0b2f31	INSERT INTO t1 VALUES (?)  	1
+06bd734b89c6f98f	INSERT INTO t2 VALUES (?)  	1
+3a4848d584923fd7	INSERT INTO t3 VALUES (...)  	1
+37c0599e49fd77fe	INSERT INTO t4 VALUES (...)  	1
+e63c7357e9f87f44	INSERT INTO t5 VALUES (...)  	1
+1cd783ad398f6755	INSERT INTO t1 VALUES (?) /* , ... */  	2
+f52370e9b5183696	INSERT INTO t3 VALUES (...) /* , ... */  	1
+edc61a0866ec47da	INSERT INTO t5 VALUES (...) /* , ... */  	1
+06ec53eb6a3e3d4c	SELECT ? + ?  	3
+a68272fa2b30c2e3	SELECT ?  	1
+49d23ec9aebe975b	CREATE SCHEMA statements_digest_temp  	2
+d42c9738d3d96889	DROP SCHEMA statements_digest_temp  	2
+select DIGEST, DIGEST_TEXT from performance_schema.events_statements_current;
+DIGEST	DIGEST_TEXT
+####################################
+# CLEANUP
+####################################
+drop table if exists t1;
+drop table if exists t2;
+drop table if exists t3;
+drop table if exists t4;
+drop table if exists t5;
+drop database if exists statements_digest;

No bundle (reason: useless for push emails).