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

[Mayank Prasad]

 3425 Mayank Prasad	2012-02-02
      WL#5767: Performance Schema, Statements Digest
      
      Details
      - Modified result file for failing test cases.

    modified:
      mysql-test/suite/perfschema/r/statements_digest.result
      mysql-test/suite/perfschema/r/statements_digest_long_query.result
 3424 Mayank Prasad	2012-02-02
      WL#5767 : Performance Schema, statements digest
      
      Details:
      - Modified printed reduced token for digest text as per new
        specification. Modified code comments as well.
      - Removed TOK_PFS_ROW_POSSIBLE_SINGLE_VALUE,
        TOK_PFS_ROW_POSSIBLE_MULTIPLE_VALUE
      - Made READ/STORE(_TOKEN) & READ/STORE(_IDENTIFIER) etc to
        inline function.
      - Modified structure PFS_statements_digest_stat as per comments.

    modified:
      storage/perfschema/gen_pfs_lex_token.cc
      storage/perfschema/pfs_digest.cc
      storage/perfschema/pfs_digest.h
=== modified file 'mysql-test/suite/perfschema/r/statements_digest.result'
--- a/mysql-test/suite/perfschema/r/statements_digest.result	2012-01-17 10:15:06 +0000
+++ b/mysql-test/suite/perfschema/r/statements_digest.result	2012-02-02 17:31:41 +0000
@@ -69,20 +69,20 @@ select DIGEST, DIGEST_TEXT, COUNT_STAR f
 DIGEST	DIGEST_TEXT	COUNT_STAR
 NULL	NULL	0
 560c2f53c356e1db	TRUNCATE TABLE performance_schema . events_statements_summa  	1
-c4cdaf6f814e367d	SELECT # FROM t1  	1
-58681943ba1f6965	SELECT #,# FROM t1  	2
-dd87e085c2c5a2b6	SELECT # FROM t2  	1
-fc7ca6a130fec1a4	SELECT #,# FROM t2  	2
-97cd1e37ec961f4a	INSERT INTO t1 VALUES (#)  	1
-89711defcba2e7b6	INSERT INTO t2 VALUES (#)  	1
-6693dfbe086fb312	INSERT INTO t3 VALUES (#,#)  	1
-0da8164710665719	INSERT INTO t4 VALUES (#,#)  	1
-11b697ce91a49bb5	INSERT INTO t5 VALUES (#,#)  	1
-d8fc73eee346beec	INSERT INTO t1 VALUES (#),(#)  	2
-24f69e0e8646bb53	INSERT INTO t3 VALUES (#,#),(#,#)  	1
-130a95e23a8da403	INSERT INTO t5 VALUES (#,#),(#,#)  	1
-06ec53eb6a3e3d4c	SELECT # + #  	3
-a68272fa2b30c2e3	SELECT #  	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
+d45807bf8c1e5d68	INSERT INTO t3 VALUES (...)  	1
+f0ea2c0da2e91d0f	INSERT INTO t4 VALUES (...)  	1
+093d15f7db5ca81e	INSERT INTO t5 VALUES (...)  	1
+92e8773c5e94030a	INSERT INTO t1 VALUES (?) /* , ... */  	2
+6a0a84a8f519cb96	INSERT INTO t3 VALUES (...) /* , ... */  	1
+36609be6d3cf105b	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
 33c8d4d29d3c02f3	USE performance_schema  	1

=== modified file 'mysql-test/suite/perfschema/r/statements_digest_long_query.result'
--- a/mysql-test/suite/perfschema/r/statements_digest_long_query.result	2012-01-17 10:15:06 +0000
+++ b/mysql-test/suite/perfschema/r/statements_digest_long_query.result	2012-02-02 17:31:41 +0000
@@ -10,4 +10,4 @@ select DIGEST, DIGEST_TEXT, COUNT_STAR f
 DIGEST	DIGEST_TEXT	COUNT_STAR
 NULL	NULL	0
 553022034e2aab0f	TRUNCATE TABLE events_statements_summa  	1
-ba5a568f3d3dcc06	SELECT # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + !
 # + # + # + # + # + # + # + # + # + # + # + # + # ...	1
+ba5a568f3d3dcc06	SELECT ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + !
 ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? ...	1

No bundle (reason: useless for push emails).