fix perfschema.start_server_innodb test (related to MDEV-17571)

MariaDB · Jan 24, 2020 · 2833e90 · 2833e90
1 parent 8a931e4
commit 2833e90
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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