diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-01-24 14:34:07 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-01-24 14:34:07 +0100 |
| commit | 2833e906190e4fa3b0261a204822d419542aebe7 (patch) | |
| tree | aad8bad40f37a8c3ece759e45c38f051fa692069 | |
| parent | 8a931e4d16303b76e4744428faaab7b200f408ec (diff) | |
| download | mariadb-git-2833e906190e4fa3b0261a204822d419542aebe7.tar.gz | |
fix perfschema.start_server_innodb test (related to MDEV-17571)
5 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/suite/perfschema/r/ortho_iter.result b/mysql-test/suite/perfschema/r/ortho_iter.result index a1fb88e7059..dfd31a80b3f 100644 --- a/mysql-test/suite/perfschema/r/ortho_iter.result +++ b/mysql-test/suite/perfschema/r/ortho_iter.result @@ -111,7 +111,7 @@ performance_schema_events_statements_history_size 10 performance_schema_events_waits_history_long_size 10000 performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 +performance_schema_max_cond_classes 90 performance_schema_max_cond_instances 1000 performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 diff --git a/mysql-test/suite/perfschema/r/privilege_table_io.result b/mysql-test/suite/perfschema/r/privilege_table_io.result index 2cdcb494d6a..00f382de966 100644 --- a/mysql-test/suite/perfschema/r/privilege_table_io.result +++ b/mysql-test/suite/perfschema/r/privilege_table_io.result @@ -38,7 +38,7 @@ performance_schema_events_statements_history_size 10 performance_schema_events_waits_history_long_size 10000 performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 +performance_schema_max_cond_classes 90 performance_schema_max_cond_instances 1000 performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 diff --git a/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result b/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result index df5373ead87..bb3d0a24db9 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result @@ -21,7 +21,7 @@ show engine PERFORMANCE_SCHEMA status; show status like "performance_schema%"; show variables like "performance_schema_max_cond_classes"; Variable_name Value -performance_schema_max_cond_classes 80 +performance_schema_max_cond_classes 90 select count(*) > 0 from performance_schema.setup_instruments where name like "wait/synch/cond/%"; count(*) > 0 diff --git a/mysql-test/suite/perfschema/r/start_server_variables.result b/mysql-test/suite/perfschema/r/start_server_variables.result index 3f2df9603b3..6199fb94f92 100644 --- a/mysql-test/suite/perfschema/r/start_server_variables.result +++ b/mysql-test/suite/perfschema/r/start_server_variables.result @@ -33,7 +33,7 @@ performance_schema_events_statements_history_size 10 performance_schema_events_waits_history_long_size 10000 performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 +performance_schema_max_cond_classes 90 performance_schema_max_cond_instances 1000 performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 diff --git a/storage/perfschema/pfs_server.h b/storage/perfschema/pfs_server.h index 3457a91d376..9f904e6545b 100644 --- a/storage/perfschema/pfs_server.h +++ b/storage/perfschema/pfs_server.h @@ -35,7 +35,7 @@ #define PFS_MAX_RWLOCK_CLASS 40 #endif #ifndef PFS_MAX_COND_CLASS - #define PFS_MAX_COND_CLASS 80 + #define PFS_MAX_COND_CLASS 90 #endif #ifndef PFS_MAX_THREAD_CLASS #define PFS_MAX_THREAD_CLASS 50 |