Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
dc9b2a95
Commit
dc9b2a95
authored
Jun 09, 2014
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-6249 mark P_S STABLE and disable it by default
parent
2436d58e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
23 deletions
+22
-23
mysql-test/r/mysqld--help.result
mysql-test/r/mysqld--help.result
+20
-21
sql/sys_vars.cc
sql/sys_vars.cc
+1
-1
storage/perfschema/ha_perfschema.cc
storage/perfschema/ha_perfschema.cc
+1
-1
No files found.
mysql-test/r/mysqld--help.result
View file @
dc9b2a95
...
@@ -553,7 +553,6 @@ The following options may be given as the first argument:
...
@@ -553,7 +553,6 @@ The following options may be given as the first argument:
record samples
record samples
--performance-schema
--performance-schema
Enable the performance schema.
Enable the performance schema.
(Defaults to on; use --skip-performance-schema to disable.)
--performance-schema-accounts-size=#
--performance-schema-accounts-size=#
Maximum number of instrumented user@host accounts. Use 0
Maximum number of instrumented user@host accounts. Use 0
to disable, -1 for automated sizing.
to disable, -1 for automated sizing.
...
@@ -1209,8 +1208,8 @@ optimizer-search-depth 62
...
@@ -1209,8 +1208,8 @@ optimizer-search-depth 62
optimizer-selectivity-sampling-limit 100
optimizer-selectivity-sampling-limit 100
optimizer-switch index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=on,derived_merge=on,derived_with_keys=on,firstmatch=on,loosescan=on,materialization=on,in_to_exists=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=on,semijoin_with_cache=on,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on,extended_keys=on,exists_to_in=on
optimizer-switch index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=on,derived_merge=on,derived_with_keys=on,firstmatch=on,loosescan=on,materialization=on,in_to_exists=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=on,semijoin_with_cache=on,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on,extended_keys=on,exists_to_in=on
optimizer-use-condition-selectivity 1
optimizer-use-condition-selectivity 1
performance-schema
TRU
E
performance-schema
FALS
E
performance-schema-accounts-size
10
performance-schema-accounts-size
-1
performance-schema-consumer-events-stages-current FALSE
performance-schema-consumer-events-stages-current FALSE
performance-schema-consumer-events-stages-history FALSE
performance-schema-consumer-events-stages-history FALSE
performance-schema-consumer-events-stages-history-long FALSE
performance-schema-consumer-events-stages-history-long FALSE
...
@@ -1223,36 +1222,36 @@ performance-schema-consumer-events-waits-history-long FALSE
...
@@ -1223,36 +1222,36 @@ performance-schema-consumer-events-waits-history-long FALSE
performance-schema-consumer-global-instrumentation TRUE
performance-schema-consumer-global-instrumentation TRUE
performance-schema-consumer-statements-digest TRUE
performance-schema-consumer-statements-digest TRUE
performance-schema-consumer-thread-instrumentation TRUE
performance-schema-consumer-thread-instrumentation TRUE
performance-schema-digests-size
1000
performance-schema-digests-size
-1
performance-schema-events-stages-history-long-size
100
performance-schema-events-stages-history-long-size
-1
performance-schema-events-stages-history-size
5
performance-schema-events-stages-history-size
-1
performance-schema-events-statements-history-long-size
100
performance-schema-events-statements-history-long-size
-1
performance-schema-events-statements-history-size
5
performance-schema-events-statements-history-size
-1
performance-schema-events-waits-history-long-size
100
performance-schema-events-waits-history-long-size
-1
performance-schema-events-waits-history-size
5
performance-schema-events-waits-history-size
-1
performance-schema-hosts-size
20
performance-schema-hosts-size
-1
performance-schema-instrument
performance-schema-instrument
performance-schema-max-cond-classes 80
performance-schema-max-cond-classes 80
performance-schema-max-cond-instances
836
performance-schema-max-cond-instances
-1
performance-schema-max-file-classes 50
performance-schema-max-file-classes 50
performance-schema-max-file-handles 32768
performance-schema-max-file-handles 32768
performance-schema-max-file-instances
1556
performance-schema-max-file-instances
-1
performance-schema-max-mutex-classes 200
performance-schema-max-mutex-classes 200
performance-schema-max-mutex-instances
3282
performance-schema-max-mutex-instances
-1
performance-schema-max-rwlock-classes 40
performance-schema-max-rwlock-classes 40
performance-schema-max-rwlock-instances
1724
performance-schema-max-rwlock-instances
-1
performance-schema-max-socket-classes 10
performance-schema-max-socket-classes 10
performance-schema-max-socket-instances
179
performance-schema-max-socket-instances
-1
performance-schema-max-stage-classes 150
performance-schema-max-stage-classes 150
performance-schema-max-statement-classes 180
performance-schema-max-statement-classes 180
performance-schema-max-table-handles
445
performance-schema-max-table-handles
-1
performance-schema-max-table-instances
445
performance-schema-max-table-instances
-1
performance-schema-max-thread-classes 50
performance-schema-max-thread-classes 50
performance-schema-max-thread-instances
224
performance-schema-max-thread-instances
-1
performance-schema-session-connect-attrs-size
512
performance-schema-session-connect-attrs-size
-1
performance-schema-setup-actors-size 100
performance-schema-setup-actors-size 100
performance-schema-setup-objects-size 100
performance-schema-setup-objects-size 100
performance-schema-users-size
5
performance-schema-users-size
-1
plugin-maturity unknown
plugin-maturity unknown
port 3306
port 3306
port-open-timeout 0
port-open-timeout 0
...
...
sql/sys_vars.cc
View file @
dc9b2a95
...
@@ -77,7 +77,7 @@ static Sys_var_mybool Sys_pfs_enabled(
...
@@ -77,7 +77,7 @@ static Sys_var_mybool Sys_pfs_enabled(
"performance_schema"
,
"performance_schema"
,
"Enable the performance schema."
,
"Enable the performance schema."
,
PARSED_EARLY
READ_ONLY
GLOBAL_VAR
(
pfs_param
.
m_enabled
),
PARSED_EARLY
READ_ONLY
GLOBAL_VAR
(
pfs_param
.
m_enabled
),
CMD_LINE
(
OPT_ARG
),
DEFAULT
(
TRU
E
));
CMD_LINE
(
OPT_ARG
),
DEFAULT
(
FALS
E
));
static
Sys_var_long
Sys_pfs_events_waits_history_long_size
(
static
Sys_var_long
Sys_pfs_events_waits_history_long_size
(
"performance_schema_events_waits_history_long_size"
,
"performance_schema_events_waits_history_long_size"
,
...
...
storage/perfschema/ha_perfschema.cc
View file @
dc9b2a95
...
@@ -206,7 +206,7 @@ maria_declare_plugin(perfschema)
...
@@ -206,7 +206,7 @@ maria_declare_plugin(perfschema)
pfs_status_vars
,
pfs_status_vars
,
NULL
,
NULL
,
"0.1"
,
"0.1"
,
MariaDB_PLUGIN_MATURITY_
GAMMA
/* because MySQL-5.5 is RC */
MariaDB_PLUGIN_MATURITY_
STABLE
}
}
maria_declare_plugin_end
;
maria_declare_plugin_end
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment