diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-06-13 16:10:25 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-06-13 16:10:25 +0200 |
| commit | f61f36b386e8d0c6448297bb84c92e8d9b82be6a (patch) | |
| tree | 6248b04e9a41d2df2270ead15d62afde7f57aa69 /sql/sys_vars.cc | |
| parent | 2caeda442502b5ea2583a0ce15107d171e06dfcd (diff) | |
| parent | 55b010233a2d897ac8bc7aee0f136f2794814455 (diff) | |
| download | mariadb-git-f61f36b386e8d0c6448297bb84c92e8d9b82be6a.tar.gz | |
Merge branch '10.0' into 10.1
Conflicts:
CMakeLists.txt
VERSION
Modified:
.gitignore
Diffstat (limited to 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index d9005f044bb..5fcc33c0e79 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -77,7 +77,7 @@ static Sys_var_mybool Sys_pfs_enabled( "performance_schema", "Enable the performance schema.", PARSED_EARLY READ_ONLY GLOBAL_VAR(pfs_param.m_enabled), - CMD_LINE(OPT_ARG), DEFAULT(TRUE)); + CMD_LINE(OPT_ARG), DEFAULT(FALSE)); static Sys_var_long Sys_pfs_events_waits_history_long_size( "performance_schema_events_waits_history_long_size", |