diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-11-10 16:12:45 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-11-10 16:12:45 +0200 |
| commit | a48aa0cd569eda88bef98ed4abe41b0b570fcd51 (patch) | |
| tree | 6008b19aabfe0554432c87614d1022594f08fc5f /storage/perfschema | |
| parent | 8409f721ffe2d91b11d3fc03c6872ff57051bbf8 (diff) | |
| parent | 386e5d476e9bf8f216c760c9076ae0ecdc99054d (diff) | |
| download | mariadb-git-a48aa0cd569eda88bef98ed4abe41b0b570fcd51.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'storage/perfschema')
| -rw-r--r-- | storage/perfschema/pfs_autosize.cc | 6 | ||||
| -rw-r--r-- | storage/perfschema/pfs_server.cc | 2 | ||||
| -rw-r--r-- | storage/perfschema/pfs_server.h | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/storage/perfschema/pfs_autosize.cc b/storage/perfschema/pfs_autosize.cc index 6f267cb4599..fd428cd6004 100644 --- a/storage/perfschema/pfs_autosize.cc +++ b/storage/perfschema/pfs_autosize.cc @@ -124,7 +124,7 @@ PFS_sizing_data small_data= /* Account / user / host */ 10, 5, 20, /* History sizes */ - 5, 100, 5, 100, 5, 100, + 10, 100, 10, 100, 10, 100, /* Digests */ 1000, /* Session connect attrs. */ @@ -140,7 +140,7 @@ PFS_sizing_data medium_data= /* Account / user / host */ 100, 100, 100, /* History sizes */ - 10, 1000, 10, 1000, 10, 1000, + 20, 1000, 20, 1000, 20, 1000, /* Digests */ 5000, /* Session connect attrs. */ @@ -156,7 +156,7 @@ PFS_sizing_data large_data= /* Account / user / host */ 100, 100, 100, /* History sizes */ - 10, 10000, 10, 10000, 10, 10000, + 20, 10000, 20, 10000, 20, 10000, /* Digests */ 10000, /* Session connect attrs. */ diff --git a/storage/perfschema/pfs_server.cc b/storage/perfschema/pfs_server.cc index 7577154515d..ee965c0e7da 100644 --- a/storage/perfschema/pfs_server.cc +++ b/storage/perfschema/pfs_server.cc @@ -67,8 +67,10 @@ initialize_performance_schema(PFS_global_param *param) The performance schema is disabled in the startup command line. All the instrumentation is turned off. */ + pfs_enabled= 0; return NULL; } + pfs_enabled= TRUE; init_timers(); diff --git a/storage/perfschema/pfs_server.h b/storage/perfschema/pfs_server.h index bc0c69e86b9..dd092713d8e 100644 --- a/storage/perfschema/pfs_server.h +++ b/storage/perfschema/pfs_server.h @@ -49,7 +49,7 @@ #define PFS_MAX_SETUP_OBJECT 100 #endif #ifndef PFS_MAX_STAGE_CLASS - #define PFS_MAX_STAGE_CLASS 150 + #define PFS_MAX_STAGE_CLASS 160 #endif #ifndef PFS_STATEMENTS_STACK_SIZE #define PFS_STATEMENTS_STACK_SIZE 10 |