From: Mayank Prasad
Date: June 15 2011 10:32am
Subject: bzr push into mysql-trunk-wl5767 branch (mayank.prasad:3371 to 3372) WL#5767
List-Archive: http://lists.mysql.com/commits/139287
Message-Id: <201106151032.p5FAWr7r009196@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3372 Mayank Prasad	2011-06-15
      WL#5767:PERFORMANCE SCHEMA, statement digest
      
      Fix:
      fix for failing test case mysqld--help-win.test.
     @ mysql-test/r/mysqld--help-win.result
        modified result file accordingly.

    modified:
      mysql-test/r/mysqld--help-win.result
 3371 Mayank Prasad	2011-06-13
      WL#5767 : PERFORMANCE SCHEMA, statement digest
      
      Description:
      Fixed failing test case issues.

    added:
      mysql-test/suite/perfschema/r/dml_esms_by_digest.result
      mysql-test/suite/sys_vars/r/pfs_digests_size.result
      mysql-test/suite/sys_vars/t/pfs_digests_size-master_basic.opt
      mysql-test/suite/sys_vars/t/pfs_digests_size_basic.test
    modified:
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
      mysql-test/suite/perfschema/t/dml_esms_by_digest.test
      mysql-test/suite/sys_vars/r/all_vars.result
      sql/sys_vars.cc
      storage/perfschema/table_esms_by_digest.cc
=== modified file 'mysql-test/r/mysqld--help-win.result'
--- a/mysql-test/r/mysqld--help-win.result	2011-06-13 11:54:30 +0000
+++ b/mysql-test/r/mysqld--help-win.result	2011-06-15 10:28:15 +0000
@@ -426,7 +426,7 @@ The following options may be given as th
  mrr_cost_based} and val is one of {on, off, default}
  --performance-schema 
  Enable the performance schema.
- --performance-schema-digests-size=#
+ --performance-schema-digests-size=# 
  Size of the statement digest.
  --performance-schema-events-stages-history-long-size=# 
  Number of rows in EVENTS_STAGES_HISTORY_LONG.
@@ -902,6 +902,7 @@ optimizer-prune-level 1
 optimizer-search-depth 62
 optimizer-switch index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on
 performance-schema FALSE
+performance-schema-digests-size 200
 performance-schema-events-stages-history-long-size 10000
 performance-schema-events-stages-history-size 10
 performance-schema-events-statements-history-long-size 10000

No bundle (reason: useless for push emails).