List:Commits« Previous MessageNext Message »
From:Marc Alff Date:March 23 2011 11:50am
Subject:bzr commit into mysql-trunk branch (marc.alff:3611)
View as plain text  
#At file:///Users/malff/BZR_TREE/mysql-trunk-stage/ based on revid:marc.alff@stripped

 3611 Marc Alff	2011-03-23
      Reduced the server memory footprint when executing performance schema tests

    modified:
      mysql-test/include/default_mysqld.cnf
      mysql-test/suite/perfschema/r/ortho_iter.result
      mysql-test/suite/perfschema/r/privilege_table_io.result
      mysql-test/suite/perfschema/r/start_server_innodb.result
      mysql-test/suite/perfschema/r/start_server_no_cond_class.result
      mysql-test/suite/perfschema/r/start_server_no_cond_inst.result
      mysql-test/suite/perfschema/r/start_server_no_file_class.result
      mysql-test/suite/perfschema/r/start_server_no_file_inst.result
      mysql-test/suite/perfschema/r/start_server_no_mutex_class.result
      mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result
      mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result
      mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result
      mysql-test/suite/perfschema/r/start_server_no_setup_actors.result
      mysql-test/suite/perfschema/r/start_server_no_setup_objects.result
      mysql-test/suite/perfschema/r/start_server_no_stage_class.result
      mysql-test/suite/perfschema/r/start_server_no_stages_history.result
      mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result
      mysql-test/suite/perfschema/r/start_server_no_statement_class.result
      mysql-test/suite/perfschema/r/start_server_no_statements_history.result
      mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result
      mysql-test/suite/perfschema/r/start_server_no_table_hdl.result
      mysql-test/suite/perfschema/r/start_server_no_table_inst.result
      mysql-test/suite/perfschema/r/start_server_no_thread_class.result
      mysql-test/suite/perfschema/r/start_server_no_thread_inst.result
      mysql-test/suite/perfschema/r/start_server_off.result
      mysql-test/suite/perfschema/r/start_server_on.result
      mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result
      mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result
      mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result
      mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result
      mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result
      mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result
      mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result
      mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result
      mysql-test/suite/perfschema/r/table_aggregate_off.result
      mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result
      mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result
      mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result
      mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result
=== modified file 'mysql-test/include/default_mysqld.cnf'
--- a/mysql-test/include/default_mysqld.cnf	2010-09-09 16:00:27 +0000
+++ b/mysql-test/include/default_mysqld.cnf	2011-03-23 11:49:30 +0000
@@ -45,9 +45,13 @@ log-bin=mysqld-bin
 loose-enable-performance-schema
 # Run tests with a small number of instrumented objects
 # to limit memory consumption with MTR
-loose-performance-schema-max-mutex-instances=10000
-loose-performance-schema-max-rwlock-instances=10000
+loose-performance-schema-max-mutex-instances=5000
+loose-performance-schema-max-rwlock-instances=5000
 loose-performance-schema-max-table-instances=500
 loose-performance-schema-max-table-handles=1000
 
+loose-performance-schema-events-stages-history-long-size=1000
+loose-performance-schema-events-statements-history-long-size=1000
+loose-performance-schema-max-thread-instances=200
+
 binlog-direct-non-transactional-updates

=== modified file 'mysql-test/suite/perfschema/r/ortho_iter.result'
--- a/mysql-test/suite/perfschema/r/ortho_iter.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/ortho_iter.result	2011-03-23 11:49:30 +0000
@@ -94,9 +94,9 @@ $
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -106,15 +106,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show status like "performance_schema%";

=== modified file 'mysql-test/suite/perfschema/r/privilege_table_io.result'
--- a/mysql-test/suite/perfschema/r/privilege_table_io.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/privilege_table_io.result	2011-03-23 11:49:30 +0000
@@ -16,9 +16,9 @@ insert into test.marker set a = 1;
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -28,15 +28,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show status like "performance_schema%";

=== modified file 'mysql-test/suite/perfschema/r/start_server_innodb.result'
--- a/mysql-test/suite/perfschema/r/start_server_innodb.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_innodb.result	2011-03-23 11:49:30 +0000
@@ -53,9 +53,9 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -65,15 +65,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show engine PERFORMANCE_SCHEMA status;

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_cond_class.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_cond_class.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_cond_class.result	2011-03-23 11:49:30 +0000
@@ -53,9 +53,9 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -65,15 +65,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show engine PERFORMANCE_SCHEMA status;

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_cond_inst.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result	2011-03-23 11:49:30 +0000
@@ -53,9 +53,9 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -65,15 +65,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show engine PERFORMANCE_SCHEMA status;

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_file_class.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_file_class.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_file_class.result	2011-03-23 11:49:30 +0000
@@ -53,9 +53,9 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -65,15 +65,15 @@ performance_schema_max_file_classes	0
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show engine PERFORMANCE_SCHEMA status;

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_file_inst.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_file_inst.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_file_inst.result	2011-03-23 11:49:30 +0000
@@ -53,9 +53,9 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -65,15 +65,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	0
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show engine PERFORMANCE_SCHEMA status;

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_mutex_class.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result	2011-03-23 11:49:30 +0000
@@ -53,9 +53,9 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -65,15 +65,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	0
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show engine PERFORMANCE_SCHEMA status;

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result	2011-03-23 11:49:30 +0000
@@ -53,9 +53,9 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -67,13 +67,13 @@ performance_schema_max_file_instances	10
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	0
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show engine PERFORMANCE_SCHEMA status;

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result	2011-03-23 11:49:30 +0000
@@ -53,9 +53,9 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -65,15 +65,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	0
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show engine PERFORMANCE_SCHEMA status;

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result	2011-03-23 11:49:30 +0000
@@ -53,9 +53,9 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -65,7 +65,7 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
 performance_schema_max_rwlock_instances	0
 performance_schema_max_stage_classes	100
@@ -73,7 +73,7 @@ performance_schema_max_statement_classes
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show engine PERFORMANCE_SCHEMA status;

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_setup_actors.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result	2011-03-23 11:49:30 +0000
@@ -53,9 +53,9 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -65,15 +65,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	0
 performance_schema_setup_objects_size	100
 show engine PERFORMANCE_SCHEMA status;

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_setup_objects.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result	2011-03-23 11:49:30 +0000
@@ -53,9 +53,9 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -65,15 +65,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	0
 show engine PERFORMANCE_SCHEMA status;

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_stage_class.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_stage_class.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_stage_class.result	2011-03-23 11:49:30 +0000
@@ -53,9 +53,9 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -65,15 +65,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	0
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show engine PERFORMANCE_SCHEMA status;

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_stages_history.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_stages_history.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_stages_history.result	2011-03-23 11:49:30 +0000
@@ -53,9 +53,9 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	0
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -65,15 +65,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show engine PERFORMANCE_SCHEMA status;

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result	2011-03-23 11:49:30 +0000
@@ -55,7 +55,7 @@ Variable_name	Value
 performance_schema	ON
 performance_schema_events_stages_history_long_size	0
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -65,15 +65,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show engine PERFORMANCE_SCHEMA status;

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_statement_class.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_statement_class.result	2011-02-17 18:10:56 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_statement_class.result	2011-03-23 11:49:30 +0000
@@ -53,9 +53,9 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -65,15 +65,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	0
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show engine PERFORMANCE_SCHEMA status;

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_statements_history.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_statements_history.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_statements_history.result	2011-03-23 11:49:30 +0000
@@ -53,9 +53,9 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	0
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -65,15 +65,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show engine PERFORMANCE_SCHEMA status;

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result	2011-03-23 11:49:30 +0000
@@ -53,7 +53,7 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	0
 performance_schema_events_statements_history_size	10
@@ -65,15 +65,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show engine PERFORMANCE_SCHEMA status;

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_table_hdl.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result	2011-03-23 11:49:30 +0000
@@ -53,9 +53,9 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -65,15 +65,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	0
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show engine PERFORMANCE_SCHEMA status;

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_table_inst.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_table_inst.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_table_inst.result	2011-03-23 11:49:30 +0000
@@ -53,9 +53,9 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -65,15 +65,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	0
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show engine PERFORMANCE_SCHEMA status;

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_thread_class.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_thread_class.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_thread_class.result	2011-03-23 11:49:30 +0000
@@ -53,9 +53,9 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -65,15 +65,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	0
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show engine PERFORMANCE_SCHEMA status;

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_thread_inst.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result	2011-03-23 11:49:30 +0000
@@ -53,9 +53,9 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -65,9 +65,9 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000

=== modified file 'mysql-test/suite/perfschema/r/start_server_off.result'
--- a/mysql-test/suite/perfschema/r/start_server_off.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_off.result	2011-03-23 11:49:30 +0000
@@ -53,9 +53,9 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	OFF
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -65,15 +65,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show engine PERFORMANCE_SCHEMA status;

=== modified file 'mysql-test/suite/perfschema/r/start_server_on.result'
--- a/mysql-test/suite/perfschema/r/start_server_on.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_on.result	2011-03-23 11:49:30 +0000
@@ -53,9 +53,9 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -65,15 +65,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show engine PERFORMANCE_SCHEMA status;

=== modified file 'mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result	2011-03-23 11:49:30 +0000
@@ -38,9 +38,9 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -50,15 +50,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show status like "performance_schema%";

=== modified file 'mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result	2011-03-23 11:49:30 +0000
@@ -37,9 +37,9 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -49,15 +49,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show status like "performance_schema%";

=== modified file 'mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result	2011-03-23 11:49:30 +0000
@@ -38,9 +38,9 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -50,15 +50,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show status like "performance_schema%";

=== modified file 'mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result	2011-03-23 11:49:30 +0000
@@ -37,9 +37,9 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -49,15 +49,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show status like "performance_schema%";

=== modified file 'mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result	2011-03-23 11:49:30 +0000
@@ -36,9 +36,9 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -48,15 +48,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show status like "performance_schema%";

=== modified file 'mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result	2011-03-23 11:49:30 +0000
@@ -35,9 +35,9 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -47,15 +47,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show status like "performance_schema%";

=== modified file 'mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result	2011-03-23 11:49:30 +0000
@@ -36,9 +36,9 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -48,15 +48,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show status like "performance_schema%";

=== modified file 'mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result	2011-03-23 11:49:30 +0000
@@ -35,9 +35,9 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -47,15 +47,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show status like "performance_schema%";

=== modified file 'mysql-test/suite/perfschema/r/table_aggregate_off.result'
--- a/mysql-test/suite/perfschema/r/table_aggregate_off.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_off.result	2011-03-23 11:49:30 +0000
@@ -37,9 +37,9 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -49,15 +49,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show status like "performance_schema%";

=== modified file 'mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result	2011-03-23 11:49:30 +0000
@@ -38,9 +38,9 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -50,15 +50,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show status like "performance_schema%";

=== modified file 'mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result	2011-03-23 11:49:30 +0000
@@ -37,9 +37,9 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -49,15 +49,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show status like "performance_schema%";

=== modified file 'mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result	2011-03-23 11:49:30 +0000
@@ -38,9 +38,9 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -50,15 +50,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show status like "performance_schema%";

=== modified file 'mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result	2011-03-23 11:49:30 +0000
@@ -37,9 +37,9 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -49,15 +49,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show status like "performance_schema%";

=== modified file 'mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result	2011-03-23 11:49:30 +0000
@@ -40,9 +40,9 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -52,15 +52,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show status like "performance_schema%";

=== modified file 'mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result	2011-03-23 11:49:30 +0000
@@ -39,9 +39,9 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -51,15 +51,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show status like "performance_schema%";

=== modified file 'mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result	2011-03-23 11:49:30 +0000
@@ -40,9 +40,9 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -52,15 +52,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show status like "performance_schema%";

=== modified file 'mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result	2011-03-23 11:49:30 +0000
@@ -39,9 +39,9 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -51,15 +51,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show status like "performance_schema%";

=== modified file 'mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result	2011-03-23 11:49:30 +0000
@@ -38,9 +38,9 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -50,15 +50,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show status like "performance_schema%";

=== modified file 'mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result	2011-03-23 11:49:30 +0000
@@ -37,9 +37,9 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -49,15 +49,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show status like "performance_schema%";

=== modified file 'mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result	2011-03-23 11:49:30 +0000
@@ -38,9 +38,9 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -50,15 +50,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show status like "performance_schema%";

=== modified file 'mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result	2011-03-23 11:49:30 +0000
@@ -37,9 +37,9 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -49,15 +49,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show status like "performance_schema%";

=== modified file 'mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result	2011-03-23 11:49:30 +0000
@@ -40,9 +40,9 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -52,15 +52,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show status like "performance_schema%";

=== modified file 'mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result	2011-03-23 11:49:30 +0000
@@ -39,9 +39,9 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -51,15 +51,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show status like "performance_schema%";

=== modified file 'mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result	2011-03-23 11:49:30 +0000
@@ -40,9 +40,9 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -52,15 +52,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show status like "performance_schema%";

=== modified file 'mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result	2011-03-23 11:49:30 +0000
@@ -39,9 +39,9 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -51,15 +51,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show status like "performance_schema%";

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result	2011-03-23 11:49:30 +0000
@@ -40,9 +40,9 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -52,15 +52,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show status like "performance_schema%";

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result	2011-03-23 11:49:30 +0000
@@ -39,9 +39,9 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -51,15 +51,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show status like "performance_schema%";

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result	2011-03-23 11:49:30 +0000
@@ -40,9 +40,9 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -52,15 +52,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show status like "performance_schema%";

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result	2011-03-23 11:49:30 +0000
@@ -39,9 +39,9 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -51,15 +51,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show status like "performance_schema%";

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result	2011-03-23 11:49:30 +0000
@@ -38,9 +38,9 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -50,15 +50,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show status like "performance_schema%";

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result	2011-03-23 11:49:30 +0000
@@ -37,9 +37,9 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -49,15 +49,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show status like "performance_schema%";

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result	2011-03-23 11:49:30 +0000
@@ -38,9 +38,9 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -50,15 +50,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show status like "performance_schema%";

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result	2011-03-23 11:49:30 +0000
@@ -37,9 +37,9 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -49,15 +49,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show status like "performance_schema%";

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result	2011-03-23 11:49:30 +0000
@@ -40,9 +40,9 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -52,15 +52,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show status like "performance_schema%";

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result	2011-03-23 11:49:30 +0000
@@ -39,9 +39,9 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -51,15 +51,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show status like "performance_schema%";

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result	2011-03-23 11:49:30 +0000
@@ -40,9 +40,9 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -52,15 +52,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show status like "performance_schema%";

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result	2011-02-18 16:14:04 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result	2011-03-23 11:49:30 +0000
@@ -39,9 +39,9 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
-performance_schema_events_stages_history_long_size	10000
+performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
+performance_schema_events_statements_history_long_size	1000
 performance_schema_events_statements_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
@@ -51,15 +51,15 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	10000
+performance_schema_max_mutex_instances	5000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	10000
+performance_schema_max_rwlock_instances	5000
 performance_schema_max_stage_classes	100
 performance_schema_max_statement_classes	165
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	1000
+performance_schema_max_thread_instances	200
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 show status like "performance_schema%";


Attachment: [text/bzr-bundle] bzr/marc.alff@oracle.com-20110323114930-b5penovu8ti4vb7b.bundle
Thread
bzr commit into mysql-trunk branch (marc.alff:3611) Marc Alff23 Mar