List:Commits« Previous MessageNext Message »
From:Marc Alff Date:May 31 2012 1:13pm
Subject:bzr push into mysql-trunk-wl6135 branch (marc.alff:3797 to 3798) WL#6135
View as plain text  
 3798 Marc Alff	2012-05-31
      WL#6135 PERFORMANCE_SCHEMA ENABLED BY DEFAULT
      
      Improved the test suite.
      
      Fixed the test sizing_high to be more robust,
      and less platform dependent.

    added:
      mysql-test/suite/perfschema/r/sizing_off.result
      mysql-test/suite/perfschema/t/sizing_off.cnf
      mysql-test/suite/perfschema/t/sizing_off.test
    modified:
      mysql-test/suite/perfschema/include/sizing_auto.inc
      mysql-test/suite/perfschema/r/sizing_default.result
      mysql-test/suite/perfschema/r/sizing_high.result
      mysql-test/suite/perfschema/r/sizing_low.result
      mysql-test/suite/perfschema/r/sizing_med.result
      mysql-test/suite/perfschema/t/sizing_high.cnf
 3797 Marc Alff	2012-05-31
      WL#6135 PERFORMANCE_SCHEMA ENABLED BY DEFAULT
      
      Removed --table-cache, improved tests.

    modified:
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
      sql/mysqld.cc
      sql/mysqld.h
      storage/perfschema/pfs_autosize.cc
=== modified file 'mysql-test/suite/perfschema/include/sizing_auto.inc'
--- a/mysql-test/suite/perfschema/include/sizing_auto.inc	2012-05-29 23:35:24 +0000
+++ b/mysql-test/suite/perfschema/include/sizing_auto.inc	2012-05-31 13:12:15 +0000
@@ -2,6 +2,7 @@
 show variables like "table_definition_cache";
 show variables like "table_open_cache";
 show variables like "max_connections";
+show variables like "open_files_limit";
 show variables like "%performance_schema%";
 show status like "%performance_schema%";
 

=== modified file 'mysql-test/suite/perfschema/r/sizing_default.result'
--- a/mysql-test/suite/perfschema/r/sizing_default.result	2012-05-30 11:44:42 +0000
+++ b/mysql-test/suite/perfschema/r/sizing_default.result	2012-05-31 13:12:15 +0000
@@ -7,6 +7,9 @@ table_open_cache	400
 show variables like "max_connections";
 Variable_name	Value
 max_connections	151
+show variables like "open_files_limit";
+Variable_name	Value
+open_files_limit	1024
 show variables like "%performance_schema%";
 Variable_name	Value
 performance_schema	ON

=== modified file 'mysql-test/suite/perfschema/r/sizing_high.result'
--- a/mysql-test/suite/perfschema/r/sizing_high.result	2012-05-30 11:44:42 +0000
+++ b/mysql-test/suite/perfschema/r/sizing_high.result	2012-05-31 13:12:15 +0000
@@ -1,12 +1,15 @@
 show variables like "table_definition_cache";
 Variable_name	Value
-table_definition_cache	801
+table_definition_cache	5000
 show variables like "table_open_cache";
 Variable_name	Value
-table_open_cache	2000
+table_open_cache	400
 show variables like "max_connections";
 Variable_name	Value
-max_connections	350
+max_connections	200
+show variables like "open_files_limit";
+Variable_name	Value
+open_files_limit	1024
 show variables like "%performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -20,22 +23,22 @@ performance_schema_events_waits_history_
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	3102
+performance_schema_max_cond_instances	10900
 performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	2773
+performance_schema_max_file_instances	15693
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	7906
+performance_schema_max_mutex_instances	32200
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	5906
+performance_schema_max_rwlock_instances	30800
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	720
+performance_schema_max_socket_instances	420
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	169
-performance_schema_max_table_handles	4000
+performance_schema_max_table_handles	800
 performance_schema_max_table_instances	12500
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	800
+performance_schema_max_thread_instances	500
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
@@ -66,10 +69,10 @@ Performance_schema_users_lost	0
 show engine performance_schema status;
 Type	Name	Status
 performance_schema	events_waits_current.row_size	184
-performance_schema	events_waits_current.row_count	4800
+performance_schema	events_waits_current.row_count	3000
 performance_schema	events_waits_history.row_size	184
-performance_schema	events_waits_history.row_count	8000
-performance_schema	events_waits_history.memory	1472000
+performance_schema	events_waits_history.row_count	5000
+performance_schema	events_waits_history.memory	920000
 performance_schema	events_waits_history_long.row_size	184
 performance_schema	events_waits_history_long.row_count	10000
 performance_schema	events_waits_history_long.memory	1840000
@@ -89,32 +92,32 @@ performance_schema	(pfs_file_class).row_
 performance_schema	(pfs_file_class).row_count	50
 performance_schema	(pfs_file_class).memory	16000
 performance_schema	mutex_instances.row_size	192
-performance_schema	mutex_instances.row_count	7906
-performance_schema	mutex_instances.memory	1517952
+performance_schema	mutex_instances.row_count	32200
+performance_schema	mutex_instances.memory	6182400
 performance_schema	rwlock_instances.row_size	192
-performance_schema	rwlock_instances.row_count	5906
-performance_schema	rwlock_instances.memory	1133952
+performance_schema	rwlock_instances.row_count	30800
+performance_schema	rwlock_instances.memory	5913600
 performance_schema	cond_instances.row_size	128
-performance_schema	cond_instances.row_count	3102
-performance_schema	cond_instances.memory	397056
+performance_schema	cond_instances.row_count	10900
+performance_schema	cond_instances.memory	1395200
 performance_schema	threads.row_size	10048
-performance_schema	threads.row_count	800
-performance_schema	threads.memory	8038400
+performance_schema	threads.row_count	500
+performance_schema	threads.memory	5024000
 performance_schema	file_instances.row_size	768
-performance_schema	file_instances.row_count	2773
-performance_schema	file_instances.memory	2129664
+performance_schema	file_instances.row_count	15693
+performance_schema	file_instances.memory	12052224
 performance_schema	(pfs_file_handle).row_size	8
 performance_schema	(pfs_file_handle).row_count	32768
 performance_schema	(pfs_file_handle).memory	262144
 performance_schema	events_waits_summary_by_thread_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_thread_by_event_name.row_count	298400
-performance_schema	events_waits_summary_by_thread_by_event_name.memory	9548800
+performance_schema	events_waits_summary_by_thread_by_event_name.row_count	186500
+performance_schema	events_waits_summary_by_thread_by_event_name.memory	5968000
 performance_schema	(pfs_table_share).row_size	22208
 performance_schema	(pfs_table_share).row_count	12500
 performance_schema	(pfs_table_share).memory	277600000
 performance_schema	(pfs_table).row_size	9280
-performance_schema	(pfs_table).row_count	4000
-performance_schema	(pfs_table).memory	37120000
+performance_schema	(pfs_table).row_count	800
+performance_schema	(pfs_table).memory	7424000
 performance_schema	setup_actors.row_size	256
 performance_schema	setup_actors.row_count	100
 performance_schema	setup_actors.memory	25600
@@ -146,14 +149,14 @@ performance_schema	(pfs_stage_class).row
 performance_schema	(pfs_stage_class).row_count	150
 performance_schema	(pfs_stage_class).memory	28800
 performance_schema	events_stages_history.row_size	88
-performance_schema	events_stages_history.row_count	8000
-performance_schema	events_stages_history.memory	704000
+performance_schema	events_stages_history.row_count	5000
+performance_schema	events_stages_history.memory	440000
 performance_schema	events_stages_history_long.row_size	88
 performance_schema	events_stages_history_long.row_count	10000
 performance_schema	events_stages_history_long.memory	880000
 performance_schema	events_stages_summary_by_thread_by_event_name.row_size	32
-performance_schema	events_stages_summary_by_thread_by_event_name.row_count	120000
-performance_schema	events_stages_summary_by_thread_by_event_name.memory	3840000
+performance_schema	events_stages_summary_by_thread_by_event_name.row_count	75000
+performance_schema	events_stages_summary_by_thread_by_event_name.memory	2400000
 performance_schema	events_stages_summary_global_by_event_name.row_size	32
 performance_schema	events_stages_summary_global_by_event_name.row_count	150
 performance_schema	events_stages_summary_global_by_event_name.memory	4800
@@ -170,14 +173,14 @@ performance_schema	(pfs_statement_class)
 performance_schema	(pfs_statement_class).row_count	169
 performance_schema	(pfs_statement_class).memory	32448
 performance_schema	events_statements_history.row_size	3024
-performance_schema	events_statements_history.row_count	8000
-performance_schema	events_statements_history.memory	24192000
+performance_schema	events_statements_history.row_count	5000
+performance_schema	events_statements_history.memory	15120000
 performance_schema	events_statements_history_long.row_size	3024
 performance_schema	events_statements_history_long.row_count	10000
 performance_schema	events_statements_history_long.memory	30240000
 performance_schema	events_statements_summary_by_thread_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_thread_by_event_name.row_count	135200
-performance_schema	events_statements_summary_by_thread_by_event_name.memory	24876800
+performance_schema	events_statements_summary_by_thread_by_event_name.row_count	84500
+performance_schema	events_statements_summary_by_thread_by_event_name.memory	15548000
 performance_schema	events_statements_summary_global_by_event_name.row_size	184
 performance_schema	events_statements_summary_global_by_event_name.row_count	169
 performance_schema	events_statements_summary_global_by_event_name.memory	31096
@@ -191,14 +194,14 @@ performance_schema	events_statements_sum
 performance_schema	events_statements_summary_by_host_by_event_name.row_count	16900
 performance_schema	events_statements_summary_by_host_by_event_name.memory	3109600
 performance_schema	events_statements_current.row_size	3024
-performance_schema	events_statements_current.row_count	800
-performance_schema	events_statements_current.memory	2419200
+performance_schema	events_statements_current.row_count	500
+performance_schema	events_statements_current.memory	1512000
 performance_schema	(pfs_socket_class).row_size	320
 performance_schema	(pfs_socket_class).row_count	10
 performance_schema	(pfs_socket_class).memory	3200
 performance_schema	socket_instances.row_size	384
-performance_schema	socket_instances.row_count	720
-performance_schema	socket_instances.memory	276480
+performance_schema	socket_instances.row_count	420
+performance_schema	socket_instances.memory	161280
 performance_schema	events_statements_summary_by_digest.row_size	1280
 performance_schema	events_statements_summary_by_digest.row_count	10000
 performance_schema	events_statements_summary_by_digest.memory	12800000
@@ -207,7 +210,7 @@ performance_schema	(account_hash).size	1
 performance_schema	(digest_hash).count	0
 performance_schema	(digest_hash).size	10000
 performance_schema	(filename_hash).count	0
-performance_schema	(filename_hash).size	2773
+performance_schema	(filename_hash).size	15693
 performance_schema	(host_hash).count	2
 performance_schema	(host_hash).size	100
 performance_schema	(setup_actor_hash).count	1
@@ -218,4 +221,4 @@ performance_schema	(table_share_hash).co
 performance_schema	(table_share_hash).size	12500
 performance_schema	(user_hash).count	2
 performance_schema	(user_hash).size	100
-performance_schema	performance_schema.memory	455978168
+performance_schema	performance_schema.memory	418372568

=== modified file 'mysql-test/suite/perfschema/r/sizing_low.result'
--- a/mysql-test/suite/perfschema/r/sizing_low.result	2012-05-30 11:44:42 +0000
+++ b/mysql-test/suite/perfschema/r/sizing_low.result	2012-05-31 13:12:15 +0000
@@ -7,6 +7,9 @@ table_open_cache	100
 show variables like "max_connections";
 Variable_name	Value
 max_connections	50
+show variables like "open_files_limit";
+Variable_name	Value
+open_files_limit	1024
 show variables like "%performance_schema%";
 Variable_name	Value
 performance_schema	ON

=== modified file 'mysql-test/suite/perfschema/r/sizing_med.result'
--- a/mysql-test/suite/perfschema/r/sizing_med.result	2012-05-30 11:44:42 +0000
+++ b/mysql-test/suite/perfschema/r/sizing_med.result	2012-05-31 13:12:15 +0000
@@ -7,6 +7,9 @@ table_open_cache	401
 show variables like "max_connections";
 Variable_name	Value
 max_connections	152
+show variables like "open_files_limit";
+Variable_name	Value
+open_files_limit	1024
 show variables like "%performance_schema%";
 Variable_name	Value
 performance_schema	ON

=== added file 'mysql-test/suite/perfschema/r/sizing_off.result'
--- a/mysql-test/suite/perfschema/r/sizing_off.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/perfschema/r/sizing_off.result	2012-05-31 13:12:15 +0000
@@ -0,0 +1,212 @@
+show variables like "performance_schema%";
+Variable_name	Value
+performance_schema	OFF
+performance_schema_accounts_size	-1
+performance_schema_digests_size	-1
+performance_schema_events_stages_history_long_size	-1
+performance_schema_events_stages_history_size	-1
+performance_schema_events_statements_history_long_size	-1
+performance_schema_events_statements_history_size	-1
+performance_schema_events_waits_history_long_size	-1
+performance_schema_events_waits_history_size	-1
+performance_schema_hosts_size	-1
+performance_schema_max_cond_classes	80
+performance_schema_max_cond_instances	-1
+performance_schema_max_file_classes	50
+performance_schema_max_file_handles	32768
+performance_schema_max_file_instances	-1
+performance_schema_max_mutex_classes	200
+performance_schema_max_mutex_instances	-1
+performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_instances	-1
+performance_schema_max_socket_classes	10
+performance_schema_max_socket_instances	-1
+performance_schema_max_stage_classes	150
+performance_schema_max_statement_classes	169
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_thread_classes	50
+performance_schema_max_thread_instances	-1
+performance_schema_setup_actors_size	100
+performance_schema_setup_objects_size	100
+performance_schema_users_size	-1
+show status like "performance_schema%";
+Variable_name	Value
+Performance_schema_accounts_lost	0
+Performance_schema_cond_classes_lost	0
+Performance_schema_cond_instances_lost	0
+Performance_schema_digest_lost	0
+Performance_schema_file_classes_lost	0
+Performance_schema_file_handles_lost	0
+Performance_schema_file_instances_lost	0
+Performance_schema_hosts_lost	0
+Performance_schema_locker_lost	0
+Performance_schema_mutex_classes_lost	0
+Performance_schema_mutex_instances_lost	0
+Performance_schema_rwlock_classes_lost	0
+Performance_schema_rwlock_instances_lost	0
+Performance_schema_socket_classes_lost	0
+Performance_schema_socket_instances_lost	0
+Performance_schema_stage_classes_lost	0
+Performance_schema_statement_classes_lost	0
+Performance_schema_table_handles_lost	0
+Performance_schema_table_instances_lost	0
+Performance_schema_thread_classes_lost	0
+Performance_schema_thread_instances_lost	0
+Performance_schema_users_lost	0
+show engine performance_schema status;
+Type	Name	Status
+performance_schema	events_waits_current.row_size	184
+performance_schema	events_waits_current.row_count	0
+performance_schema	events_waits_history.row_size	184
+performance_schema	events_waits_history.row_count	0
+performance_schema	events_waits_history.memory	0
+performance_schema	events_waits_history_long.row_size	184
+performance_schema	events_waits_history_long.row_count	0
+performance_schema	events_waits_history_long.memory	0
+performance_schema	(pfs_mutex_class).row_size	256
+performance_schema	(pfs_mutex_class).row_count	0
+performance_schema	(pfs_mutex_class).memory	0
+performance_schema	(pfs_rwlock_class).row_size	256
+performance_schema	(pfs_rwlock_class).row_count	0
+performance_schema	(pfs_rwlock_class).memory	0
+performance_schema	(pfs_cond_class).row_size	192
+performance_schema	(pfs_cond_class).row_count	0
+performance_schema	(pfs_cond_class).memory	0
+performance_schema	(pfs_thread_class).row_size	192
+performance_schema	(pfs_thread_class).row_count	0
+performance_schema	(pfs_thread_class).memory	0
+performance_schema	(pfs_file_class).row_size	320
+performance_schema	(pfs_file_class).row_count	0
+performance_schema	(pfs_file_class).memory	0
+performance_schema	mutex_instances.row_size	192
+performance_schema	mutex_instances.row_count	0
+performance_schema	mutex_instances.memory	0
+performance_schema	rwlock_instances.row_size	192
+performance_schema	rwlock_instances.row_count	0
+performance_schema	rwlock_instances.memory	0
+performance_schema	cond_instances.row_size	128
+performance_schema	cond_instances.row_count	0
+performance_schema	cond_instances.memory	0
+performance_schema	threads.row_size	10048
+performance_schema	threads.row_count	0
+performance_schema	threads.memory	0
+performance_schema	file_instances.row_size	768
+performance_schema	file_instances.row_count	0
+performance_schema	file_instances.memory	0
+performance_schema	(pfs_file_handle).row_size	8
+performance_schema	(pfs_file_handle).row_count	0
+performance_schema	(pfs_file_handle).memory	0
+performance_schema	events_waits_summary_by_thread_by_event_name.row_size	32
+performance_schema	events_waits_summary_by_thread_by_event_name.row_count	0
+performance_schema	events_waits_summary_by_thread_by_event_name.memory	0
+performance_schema	(pfs_table_share).row_size	22208
+performance_schema	(pfs_table_share).row_count	0
+performance_schema	(pfs_table_share).memory	0
+performance_schema	(pfs_table).row_size	9280
+performance_schema	(pfs_table).row_count	0
+performance_schema	(pfs_table).memory	0
+performance_schema	setup_actors.row_size	256
+performance_schema	setup_actors.row_count	0
+performance_schema	setup_actors.memory	0
+performance_schema	setup_objects.row_size	448
+performance_schema	setup_objects.row_count	0
+performance_schema	setup_objects.memory	0
+performance_schema	events_waits_summary_global_by_event_name.row_size	32
+performance_schema	events_waits_summary_global_by_event_name.row_count	0
+performance_schema	events_waits_summary_global_by_event_name.memory	0
+performance_schema	(pfs_account).row_size	256
+performance_schema	(pfs_account).row_count	0
+performance_schema	(pfs_account).memory	0
+performance_schema	events_waits_summary_by_account_by_event_name.row_size	32
+performance_schema	events_waits_summary_by_account_by_event_name.row_count	0
+performance_schema	events_waits_summary_by_account_by_event_name.memory	0
+performance_schema	events_waits_summary_by_user_by_event_name.row_size	32
+performance_schema	events_waits_summary_by_user_by_event_name.row_count	0
+performance_schema	events_waits_summary_by_user_by_event_name.memory	0
+performance_schema	events_waits_summary_by_host_by_event_name.row_size	32
+performance_schema	events_waits_summary_by_host_by_event_name.row_count	0
+performance_schema	events_waits_summary_by_host_by_event_name.memory	0
+performance_schema	(pfs_user).row_size	128
+performance_schema	(pfs_user).row_count	0
+performance_schema	(pfs_user).memory	0
+performance_schema	(pfs_host).row_size	192
+performance_schema	(pfs_host).row_count	0
+performance_schema	(pfs_host).memory	0
+performance_schema	(pfs_stage_class).row_size	192
+performance_schema	(pfs_stage_class).row_count	0
+performance_schema	(pfs_stage_class).memory	0
+performance_schema	events_stages_history.row_size	88
+performance_schema	events_stages_history.row_count	0
+performance_schema	events_stages_history.memory	0
+performance_schema	events_stages_history_long.row_size	88
+performance_schema	events_stages_history_long.row_count	0
+performance_schema	events_stages_history_long.memory	0
+performance_schema	events_stages_summary_by_thread_by_event_name.row_size	32
+performance_schema	events_stages_summary_by_thread_by_event_name.row_count	0
+performance_schema	events_stages_summary_by_thread_by_event_name.memory	0
+performance_schema	events_stages_summary_global_by_event_name.row_size	32
+performance_schema	events_stages_summary_global_by_event_name.row_count	0
+performance_schema	events_stages_summary_global_by_event_name.memory	0
+performance_schema	events_stages_summary_by_account_by_event_name.row_size	32
+performance_schema	events_stages_summary_by_account_by_event_name.row_count	0
+performance_schema	events_stages_summary_by_account_by_event_name.memory	0
+performance_schema	events_stages_summary_by_user_by_event_name.row_size	32
+performance_schema	events_stages_summary_by_user_by_event_name.row_count	0
+performance_schema	events_stages_summary_by_user_by_event_name.memory	0
+performance_schema	events_stages_summary_by_host_by_event_name.row_size	32
+performance_schema	events_stages_summary_by_host_by_event_name.row_count	0
+performance_schema	events_stages_summary_by_host_by_event_name.memory	0
+performance_schema	(pfs_statement_class).row_size	192
+performance_schema	(pfs_statement_class).row_count	0
+performance_schema	(pfs_statement_class).memory	0
+performance_schema	events_statements_history.row_size	3024
+performance_schema	events_statements_history.row_count	0
+performance_schema	events_statements_history.memory	0
+performance_schema	events_statements_history_long.row_size	3024
+performance_schema	events_statements_history_long.row_count	0
+performance_schema	events_statements_history_long.memory	0
+performance_schema	events_statements_summary_by_thread_by_event_name.row_size	184
+performance_schema	events_statements_summary_by_thread_by_event_name.row_count	0
+performance_schema	events_statements_summary_by_thread_by_event_name.memory	0
+performance_schema	events_statements_summary_global_by_event_name.row_size	184
+performance_schema	events_statements_summary_global_by_event_name.row_count	0
+performance_schema	events_statements_summary_global_by_event_name.memory	0
+performance_schema	events_statements_summary_by_account_by_event_name.row_size	184
+performance_schema	events_statements_summary_by_account_by_event_name.row_count	0
+performance_schema	events_statements_summary_by_account_by_event_name.memory	0
+performance_schema	events_statements_summary_by_user_by_event_name.row_size	184
+performance_schema	events_statements_summary_by_user_by_event_name.row_count	0
+performance_schema	events_statements_summary_by_user_by_event_name.memory	0
+performance_schema	events_statements_summary_by_host_by_event_name.row_size	184
+performance_schema	events_statements_summary_by_host_by_event_name.row_count	0
+performance_schema	events_statements_summary_by_host_by_event_name.memory	0
+performance_schema	events_statements_current.row_size	3024
+performance_schema	events_statements_current.row_count	0
+performance_schema	events_statements_current.memory	0
+performance_schema	(pfs_socket_class).row_size	320
+performance_schema	(pfs_socket_class).row_count	0
+performance_schema	(pfs_socket_class).memory	0
+performance_schema	socket_instances.row_size	384
+performance_schema	socket_instances.row_count	0
+performance_schema	socket_instances.memory	0
+performance_schema	events_statements_summary_by_digest.row_size	1280
+performance_schema	events_statements_summary_by_digest.row_count	0
+performance_schema	events_statements_summary_by_digest.memory	0
+performance_schema	(account_hash).count	0
+performance_schema	(account_hash).size	0
+performance_schema	(digest_hash).count	0
+performance_schema	(digest_hash).size	0
+performance_schema	(filename_hash).count	0
+performance_schema	(filename_hash).size	0
+performance_schema	(host_hash).count	0
+performance_schema	(host_hash).size	0
+performance_schema	(setup_actor_hash).count	0
+performance_schema	(setup_actor_hash).size	0
+performance_schema	(setup_object_hash).count	0
+performance_schema	(setup_object_hash).size	0
+performance_schema	(table_share_hash).count	0
+performance_schema	(table_share_hash).size	0
+performance_schema	(user_hash).count	0
+performance_schema	(user_hash).size	0
+performance_schema	performance_schema.memory	0

=== modified file 'mysql-test/suite/perfschema/t/sizing_high.cnf'
--- a/mysql-test/suite/perfschema/t/sizing_high.cnf	2012-05-30 11:44:42 +0000
+++ b/mysql-test/suite/perfschema/t/sizing_high.cnf	2012-05-31 13:12:15 +0000
@@ -3,11 +3,34 @@
 
 [mysqld.1]
 
-table_definition_cache=801
-table_open_cache=2000
-max_connections=350
+# WARNING about open_files_limit and ulimit -n
+#
+# mysqld checks how many files can be opened on the machine,
+# and this is by definition very:
+# - os dependent, see OS_FILE_LIMIT, HAVE_GETRLIMIT
+# - configuration dependent, for each machine (ulimit -n), see
+#   my_set_max_open_files() in mysys/my_file.c,
+#   see getrlimit(RLIMIT_NOFILE)
+#
+# Based on the this, the server tunes _down_ max_connections and
+# table_cache_size to match the open_files_limit found,
+# which significantly interfere with this test.
+#
+# Solution: use a big table definition cache,
+# but small values for max_connection and table_open_cache,
+# to stay within open_files_limit of 1024.
+#
+# This is the best test we can do that has a chance to pass on all
+# platforms, while still providing code coverage.
+
+table_definition_cache=5000
+table_open_cache=400
+max_connections=200
 open_files_limit=1024
 
+# 10+max_connections+table_cache_size*2 = 10 + 200 + 400*2 = 1010
+# max_connections*5 = 200*5 = 1000
+
 # Automated sizing for everything
 
 loose-performance-schema-accounts-size=-1

=== added file 'mysql-test/suite/perfschema/t/sizing_off.cnf'
--- a/mysql-test/suite/perfschema/t/sizing_off.cnf	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/perfschema/t/sizing_off.cnf	2012-05-31 13:12:15 +0000
@@ -0,0 +1,38 @@
+
+!include include/default_mysqld_autosize.cnf
+
+[mysqld.1]
+
+# Default values used in the server, out of the box
+table_definition_cache=400
+table_open_cache=400
+max_connections=151
+open_files_limit=1024
+
+# Disable the performacne schema.
+# Sizing does not occur then
+skip-performance-schema
+
+# Automated sizing for everything
+
+loose-performance-schema-accounts-size=-1
+loose-performance-schema-digests-size=-1
+loose-performance-schema-hosts-size=-1
+loose-performance-schema-users-size=-1
+
+loose-performance-schema-events-waits-history-size=-1
+loose-performance-schema-events-waits-history-long-size=-1
+loose-performance-schema-events-stages-history-size=-1
+loose-performance-schema-events-stages-history-long-size=-1
+loose-performance-schema-events-statements-history-size=-1
+loose-performance-schema-events-statements-history-long-size=-1
+
+loose-performance-schema-max-mutex-instances=-1
+loose-performance-schema-max-rwlock-instances=-1
+loose-performance-schema-max-cond-instances=-1
+loose-performance-schema-max-file-instances=-1
+loose-performance-schema-max-socket-instances=-1
+loose-performance-schema-max-thread-instances=-1
+loose-performance-schema-max-table-instances=-1
+loose-performance-schema-max-table-handles=-1
+

=== added file 'mysql-test/suite/perfschema/t/sizing_off.test'
--- a/mysql-test/suite/perfschema/t/sizing_off.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/perfschema/t/sizing_off.test	2012-05-31 13:12:15 +0000
@@ -0,0 +1,7 @@
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+show variables like "performance_schema%";
+show status like "performance_schema%";
+show engine performance_schema status;

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk-wl6135 branch (marc.alff:3797 to 3798) WL#6135Marc Alff31 May