merge

1 files changed, 48 insertions, 0 deletions

diff --git a/mysql-test/r/mysqld--help-notwin.result b/mysql-test/r/mysqld--help-notwin.result
index 0066a942ea3..e79dce0e534 100644
--- a/mysql-test/r/mysqld--help-notwin.result
+++ b/mysql-test/r/mysqld--help-notwin.result
@@ -411,6 +411,38 @@ The following options may be given as the first argument:
  index_merge_sort_union, index_merge_intersection,
  engine_condition_pushdown} and val is one of {on, off,
  default}
+ --performance-schema 
+ Enable the performance schema.
+ --performance-schema-events-waits-history-long-size=# 
+ Number of rows in EVENTS_WAITS_HISTORY_LONG.
+ --performance-schema-events-waits-history-size=# 
+ Number of rows per thread in EVENTS_WAITS_HISTORY.
+ --performance-schema-max-cond-classes=# 
+ Maximum number of condition instruments.
+ --performance-schema-max-cond-instances=# 
+ Maximum number of instrumented condition objects.
+ --performance-schema-max-file-classes=# 
+ Maximum number of file instruments.
+ --performance-schema-max-file-handles=# 
+ Maximum number of opened instrumented files.
+ --performance-schema-max-file-instances=# 
+ Maximum number of instrumented files.
+ --performance-schema-max-mutex-classes=# 
+ Maximum number of mutex instruments.
+ --performance-schema-max-mutex-instances=# 
+ Maximum number of instrumented MUTEX objects.
+ --performance-schema-max-rwlock-classes=# 
+ Maximum number of rwlock instruments.
+ --performance-schema-max-rwlock-instances=# 
+ Maximum number of instrumented RWLOCK objects.
+ --performance-schema-max-table-handles=# 
+ Maximum number of opened instrumented tables.
+ --performance-schema-max-table-instances=# 
+ Maximum number of instrumented tables.
+ --performance-schema-max-thread-classes=# 
+ Maximum number of thread instruments.
+ --performance-schema-max-thread-instances=# 
+ Maximum number of instrumented threads.
  --pid-file=name     Pid file used by safe_mysqld
  --plugin-dir=name   Directory for plugins
  --plugin-load=name  Optional semicolon-separated list of plugins to load,
@@ -842,6 +874,22 @@ old-style-user-limits FALSE
 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
+performance-schema FALSE
+performance-schema-events-waits-history-long-size 10000
+performance-schema-events-waits-history-size 10
+performance-schema-max-cond-classes 80
+performance-schema-max-cond-instances 1000
+performance-schema-max-file-classes 50
+performance-schema-max-file-handles 32768
+performance-schema-max-file-instances 10000
+performance-schema-max-mutex-classes 200
+performance-schema-max-mutex-instances 1000
+performance-schema-max-rwlock-classes 20
+performance-schema-max-rwlock-instances 1000
+performance-schema-max-table-handles 100000
+performance-schema-max-table-instances 50000
+performance-schema-max-thread-classes 50
+performance-schema-max-thread-instances 1000
 plugin-load (No default value)
 port 3306
 port-open-timeout 0