From: Marc Alff Date: January 15 2013 9:10am Subject: bzr push into mysql-5.6 branch (marc.alff:4619 to 4620) Bug#16165468 List-Archive: http://lists.mysql.com/commits/145607 X-Bug: 16165468 Message-Id: <20130115091049.31815.12237.4620@linux-8edv.site> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 4620 Marc Alff 2013-01-15 Bug#16165468 CONFUSING SHOW ENGINE PERFORMANCE_SCHEMA STATUS OUTPUT reverted the previous change: revno: 4618 committer: Marc Alff branch nick: mysql-5.6-bug16165468 timestamp: Mon 2013-01-14 20:05:35 +0100 modified: 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 storage/perfschema/pfs_engine_table.cc 4619 Neeraj Bisht 2013-01-15 [merge] (no message) === modified file 'mysql-test/suite/perfschema/r/sizing_default.result' --- a/mysql-test/suite/perfschema/r/sizing_default.result 2013-01-14 19:05:35 +0000 +++ b/mysql-test/suite/perfschema/r/sizing_default.result 2013-01-15 08:54:09 +0000 @@ -67,142 +67,142 @@ Performance_schema_thread_instances_lost Performance_schema_users_lost 0 show engine performance_schema status; Type Name Status -performance_schema events_waits_current.size 184 -performance_schema events_waits_current.count 1344 -performance_schema events_waits_history.size 184 -performance_schema events_waits_history.count 1120 +performance_schema events_waits_current.row_size 184 +performance_schema events_waits_current.row_count 1344 +performance_schema events_waits_history.row_size 184 +performance_schema events_waits_history.row_count 1120 performance_schema events_waits_history.memory 206080 -performance_schema events_waits_history_long.size 184 -performance_schema events_waits_history_long.count 100 +performance_schema events_waits_history_long.row_size 184 +performance_schema events_waits_history_long.row_count 100 performance_schema events_waits_history_long.memory 18400 -performance_schema (pfs_mutex_class).size 256 -performance_schema (pfs_mutex_class).count 200 +performance_schema (pfs_mutex_class).row_size 256 +performance_schema (pfs_mutex_class).row_count 200 performance_schema (pfs_mutex_class).memory 51200 -performance_schema (pfs_rwlock_class).size 320 -performance_schema (pfs_rwlock_class).count 30 +performance_schema (pfs_rwlock_class).row_size 320 +performance_schema (pfs_rwlock_class).row_count 30 performance_schema (pfs_rwlock_class).memory 9600 -performance_schema (pfs_cond_class).size 256 -performance_schema (pfs_cond_class).count 80 +performance_schema (pfs_cond_class).row_size 256 +performance_schema (pfs_cond_class).row_count 80 performance_schema (pfs_cond_class).memory 20480 -performance_schema (pfs_thread_class).size 192 -performance_schema (pfs_thread_class).count 50 +performance_schema (pfs_thread_class).row_size 192 +performance_schema (pfs_thread_class).row_count 50 performance_schema (pfs_thread_class).memory 9600 -performance_schema (pfs_file_class).size 320 -performance_schema (pfs_file_class).count 50 +performance_schema (pfs_file_class).row_size 320 +performance_schema (pfs_file_class).row_count 50 performance_schema (pfs_file_class).memory 16000 -performance_schema mutex_instances.size 128 -performance_schema mutex_instances.count 3282 +performance_schema mutex_instances.row_size 128 +performance_schema mutex_instances.row_count 3282 performance_schema mutex_instances.memory 420096 -performance_schema rwlock_instances.size 192 -performance_schema rwlock_instances.count 1724 +performance_schema rwlock_instances.row_size 192 +performance_schema rwlock_instances.row_count 1724 performance_schema rwlock_instances.memory 331008 -performance_schema cond_instances.size 128 -performance_schema cond_instances.count 836 +performance_schema cond_instances.row_size 128 +performance_schema cond_instances.row_count 836 performance_schema cond_instances.memory 107008 -performance_schema threads.size 1856 -performance_schema threads.count 224 +performance_schema threads.row_size 1856 +performance_schema threads.row_count 224 performance_schema threads.memory 415744 -performance_schema file_instances.size 704 -performance_schema file_instances.count 1556 +performance_schema file_instances.row_size 704 +performance_schema file_instances.row_count 1556 performance_schema file_instances.memory 1095424 -performance_schema (pfs_file_handle).size 8 -performance_schema (pfs_file_handle).count 32768 +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.size 32 -performance_schema events_waits_summary_by_thread_by_event_name.count 83552 +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 83552 performance_schema events_waits_summary_by_thread_by_event_name.memory 2673664 -performance_schema (pfs_table_share).size 22208 -performance_schema (pfs_table_share).count 445 +performance_schema (pfs_table_share).row_size 22208 +performance_schema (pfs_table_share).row_count 445 performance_schema (pfs_table_share).memory 9882560 -performance_schema (pfs_table).size 9280 -performance_schema (pfs_table).count 445 +performance_schema (pfs_table).row_size 9280 +performance_schema (pfs_table).row_count 445 performance_schema (pfs_table).memory 4129600 -performance_schema setup_actors.size 256 -performance_schema setup_actors.count 100 +performance_schema setup_actors.row_size 256 +performance_schema setup_actors.row_count 100 performance_schema setup_actors.memory 25600 -performance_schema setup_objects.size 448 -performance_schema setup_objects.count 100 +performance_schema setup_objects.row_size 448 +performance_schema setup_objects.row_count 100 performance_schema setup_objects.memory 44800 -performance_schema (pfs_account).size 256 -performance_schema (pfs_account).count 10 +performance_schema (pfs_account).row_size 256 +performance_schema (pfs_account).row_count 10 performance_schema (pfs_account).memory 2560 -performance_schema events_waits_summary_by_account_by_event_name.size 32 -performance_schema events_waits_summary_by_account_by_event_name.count 3730 +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 3730 performance_schema events_waits_summary_by_account_by_event_name.memory 119360 -performance_schema events_waits_summary_by_user_by_event_name.size 32 -performance_schema events_waits_summary_by_user_by_event_name.count 1865 +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 1865 performance_schema events_waits_summary_by_user_by_event_name.memory 59680 -performance_schema events_waits_summary_by_host_by_event_name.size 32 -performance_schema events_waits_summary_by_host_by_event_name.count 7460 +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 7460 performance_schema events_waits_summary_by_host_by_event_name.memory 238720 -performance_schema (pfs_user).size 128 -performance_schema (pfs_user).count 5 +performance_schema (pfs_user).row_size 128 +performance_schema (pfs_user).row_count 5 performance_schema (pfs_user).memory 640 -performance_schema (pfs_host).size 128 -performance_schema (pfs_host).count 20 +performance_schema (pfs_host).row_size 128 +performance_schema (pfs_host).row_count 20 performance_schema (pfs_host).memory 2560 -performance_schema (pfs_stage_class).size 192 -performance_schema (pfs_stage_class).count 150 +performance_schema (pfs_stage_class).row_size 192 +performance_schema (pfs_stage_class).row_count 150 performance_schema (pfs_stage_class).memory 28800 -performance_schema events_stages_history.size 88 -performance_schema events_stages_history.count 1120 +performance_schema events_stages_history.row_size 88 +performance_schema events_stages_history.row_count 1120 performance_schema events_stages_history.memory 98560 -performance_schema events_stages_history_long.size 88 -performance_schema events_stages_history_long.count 100 +performance_schema events_stages_history_long.row_size 88 +performance_schema events_stages_history_long.row_count 100 performance_schema events_stages_history_long.memory 8800 -performance_schema events_stages_summary_by_thread_by_event_name.size 32 -performance_schema events_stages_summary_by_thread_by_event_name.count 33600 +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 33600 performance_schema events_stages_summary_by_thread_by_event_name.memory 1075200 -performance_schema events_stages_summary_global_by_event_name.size 32 -performance_schema events_stages_summary_global_by_event_name.count 150 +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 -performance_schema events_stages_summary_by_account_by_event_name.size 32 -performance_schema events_stages_summary_by_account_by_event_name.count 1500 +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 1500 performance_schema events_stages_summary_by_account_by_event_name.memory 48000 -performance_schema events_stages_summary_by_user_by_event_name.size 32 -performance_schema events_stages_summary_by_user_by_event_name.count 750 +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 750 performance_schema events_stages_summary_by_user_by_event_name.memory 24000 -performance_schema events_stages_summary_by_host_by_event_name.size 32 -performance_schema events_stages_summary_by_host_by_event_name.count 3000 +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 3000 performance_schema events_stages_summary_by_host_by_event_name.memory 96000 -performance_schema (pfs_statement_class).size 192 -performance_schema (pfs_statement_class).count 167 +performance_schema (pfs_statement_class).row_size 192 +performance_schema (pfs_statement_class).row_count 167 performance_schema (pfs_statement_class).memory 32064 -performance_schema events_statements_history.size 3024 -performance_schema events_statements_history.count 1120 +performance_schema events_statements_history.row_size 3024 +performance_schema events_statements_history.row_count 1120 performance_schema events_statements_history.memory 3386880 -performance_schema events_statements_history_long.size 3024 -performance_schema events_statements_history_long.count 100 +performance_schema events_statements_history_long.row_size 3024 +performance_schema events_statements_history_long.row_count 100 performance_schema events_statements_history_long.memory 302400 -performance_schema events_statements_summary_by_thread_by_event_name.size 184 -performance_schema events_statements_summary_by_thread_by_event_name.count 37408 +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 37408 performance_schema events_statements_summary_by_thread_by_event_name.memory 6883072 -performance_schema events_statements_summary_global_by_event_name.size 184 -performance_schema events_statements_summary_global_by_event_name.count 167 +performance_schema events_statements_summary_global_by_event_name.row_size 184 +performance_schema events_statements_summary_global_by_event_name.row_count 167 performance_schema events_statements_summary_global_by_event_name.memory 30728 -performance_schema events_statements_summary_by_account_by_event_name.size 184 -performance_schema events_statements_summary_by_account_by_event_name.count 1670 +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 1670 performance_schema events_statements_summary_by_account_by_event_name.memory 307280 -performance_schema events_statements_summary_by_user_by_event_name.size 184 -performance_schema events_statements_summary_by_user_by_event_name.count 835 +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 835 performance_schema events_statements_summary_by_user_by_event_name.memory 153640 -performance_schema events_statements_summary_by_host_by_event_name.size 184 -performance_schema events_statements_summary_by_host_by_event_name.count 3340 +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 3340 performance_schema events_statements_summary_by_host_by_event_name.memory 614560 -performance_schema events_statements_current.size 3024 -performance_schema events_statements_current.count 224 +performance_schema events_statements_current.row_size 3024 +performance_schema events_statements_current.row_count 224 performance_schema events_statements_current.memory 677376 -performance_schema (pfs_socket_class).size 320 -performance_schema (pfs_socket_class).count 10 +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.size 320 -performance_schema socket_instances.count 179 +performance_schema socket_instances.row_size 320 +performance_schema socket_instances.row_count 179 performance_schema socket_instances.memory 57280 -performance_schema events_statements_summary_by_digest.size 1472 -performance_schema events_statements_summary_by_digest.count 1000 +performance_schema events_statements_summary_by_digest.row_size 1472 +performance_schema events_statements_summary_by_digest.row_count 1000 performance_schema events_statements_summary_by_digest.memory 1472000 -performance_schema session_connect_attrs.size 224 -performance_schema session_connect_attrs.count 512 +performance_schema session_connect_attrs.row_size 224 +performance_schema session_connect_attrs.row_count 512 performance_schema session_connect_attrs.memory 114688 performance_schema (account_hash).count 2 performance_schema (account_hash).size 10 === modified file 'mysql-test/suite/perfschema/r/sizing_high.result' --- a/mysql-test/suite/perfschema/r/sizing_high.result 2013-01-14 19:05:35 +0000 +++ b/mysql-test/suite/perfschema/r/sizing_high.result 2013-01-15 08:54:09 +0000 @@ -67,142 +67,142 @@ Performance_schema_thread_instances_lost Performance_schema_users_lost 0 show engine performance_schema status; Type Name Status -performance_schema events_waits_current.size 184 -performance_schema events_waits_current.count 3000 -performance_schema events_waits_history.size 184 -performance_schema events_waits_history.count 5000 +performance_schema events_waits_current.row_size 184 +performance_schema events_waits_current.row_count 3000 +performance_schema events_waits_history.row_size 184 +performance_schema events_waits_history.row_count 5000 performance_schema events_waits_history.memory 920000 -performance_schema events_waits_history_long.size 184 -performance_schema events_waits_history_long.count 10000 +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 -performance_schema (pfs_mutex_class).size 256 -performance_schema (pfs_mutex_class).count 200 +performance_schema (pfs_mutex_class).row_size 256 +performance_schema (pfs_mutex_class).row_count 200 performance_schema (pfs_mutex_class).memory 51200 -performance_schema (pfs_rwlock_class).size 320 -performance_schema (pfs_rwlock_class).count 30 +performance_schema (pfs_rwlock_class).row_size 320 +performance_schema (pfs_rwlock_class).row_count 30 performance_schema (pfs_rwlock_class).memory 9600 -performance_schema (pfs_cond_class).size 256 -performance_schema (pfs_cond_class).count 80 +performance_schema (pfs_cond_class).row_size 256 +performance_schema (pfs_cond_class).row_count 80 performance_schema (pfs_cond_class).memory 20480 -performance_schema (pfs_thread_class).size 192 -performance_schema (pfs_thread_class).count 50 +performance_schema (pfs_thread_class).row_size 192 +performance_schema (pfs_thread_class).row_count 50 performance_schema (pfs_thread_class).memory 9600 -performance_schema (pfs_file_class).size 320 -performance_schema (pfs_file_class).count 50 +performance_schema (pfs_file_class).row_size 320 +performance_schema (pfs_file_class).row_count 50 performance_schema (pfs_file_class).memory 16000 -performance_schema mutex_instances.size 128 -performance_schema mutex_instances.count 52200 +performance_schema mutex_instances.row_size 128 +performance_schema mutex_instances.row_count 52200 performance_schema mutex_instances.memory 6681600 -performance_schema rwlock_instances.size 192 -performance_schema rwlock_instances.count 30800 +performance_schema rwlock_instances.row_size 192 +performance_schema rwlock_instances.row_count 30800 performance_schema rwlock_instances.memory 5913600 -performance_schema cond_instances.size 128 -performance_schema cond_instances.count 10900 +performance_schema cond_instances.row_size 128 +performance_schema cond_instances.row_count 10900 performance_schema cond_instances.memory 1395200 -performance_schema threads.size 1856 -performance_schema threads.count 500 +performance_schema threads.row_size 1856 +performance_schema threads.row_count 500 performance_schema threads.memory 928000 -performance_schema file_instances.size 704 -performance_schema file_instances.count 23385 +performance_schema file_instances.row_size 704 +performance_schema file_instances.row_count 23385 performance_schema file_instances.memory 16463040 -performance_schema (pfs_file_handle).size 8 -performance_schema (pfs_file_handle).count 32768 +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.size 32 -performance_schema events_waits_summary_by_thread_by_event_name.count 186500 +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 186500 performance_schema events_waits_summary_by_thread_by_event_name.memory 5968000 -performance_schema (pfs_table_share).size 22208 -performance_schema (pfs_table_share).count 12500 +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).size 9280 -performance_schema (pfs_table).count 800 +performance_schema (pfs_table).row_size 9280 +performance_schema (pfs_table).row_count 800 performance_schema (pfs_table).memory 7424000 -performance_schema setup_actors.size 256 -performance_schema setup_actors.count 100 +performance_schema setup_actors.row_size 256 +performance_schema setup_actors.row_count 100 performance_schema setup_actors.memory 25600 -performance_schema setup_objects.size 448 -performance_schema setup_objects.count 100 +performance_schema setup_objects.row_size 448 +performance_schema setup_objects.row_count 100 performance_schema setup_objects.memory 44800 -performance_schema (pfs_account).size 256 -performance_schema (pfs_account).count 100 +performance_schema (pfs_account).row_size 256 +performance_schema (pfs_account).row_count 100 performance_schema (pfs_account).memory 25600 -performance_schema events_waits_summary_by_account_by_event_name.size 32 -performance_schema events_waits_summary_by_account_by_event_name.count 37300 +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 37300 performance_schema events_waits_summary_by_account_by_event_name.memory 1193600 -performance_schema events_waits_summary_by_user_by_event_name.size 32 -performance_schema events_waits_summary_by_user_by_event_name.count 37300 +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 37300 performance_schema events_waits_summary_by_user_by_event_name.memory 1193600 -performance_schema events_waits_summary_by_host_by_event_name.size 32 -performance_schema events_waits_summary_by_host_by_event_name.count 37300 +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 37300 performance_schema events_waits_summary_by_host_by_event_name.memory 1193600 -performance_schema (pfs_user).size 128 -performance_schema (pfs_user).count 100 +performance_schema (pfs_user).row_size 128 +performance_schema (pfs_user).row_count 100 performance_schema (pfs_user).memory 12800 -performance_schema (pfs_host).size 128 -performance_schema (pfs_host).count 100 +performance_schema (pfs_host).row_size 128 +performance_schema (pfs_host).row_count 100 performance_schema (pfs_host).memory 12800 -performance_schema (pfs_stage_class).size 192 -performance_schema (pfs_stage_class).count 150 +performance_schema (pfs_stage_class).row_size 192 +performance_schema (pfs_stage_class).row_count 150 performance_schema (pfs_stage_class).memory 28800 -performance_schema events_stages_history.size 88 -performance_schema events_stages_history.count 5000 +performance_schema events_stages_history.row_size 88 +performance_schema events_stages_history.row_count 5000 performance_schema events_stages_history.memory 440000 -performance_schema events_stages_history_long.size 88 -performance_schema events_stages_history_long.count 10000 +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.size 32 -performance_schema events_stages_summary_by_thread_by_event_name.count 75000 +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 75000 performance_schema events_stages_summary_by_thread_by_event_name.memory 2400000 -performance_schema events_stages_summary_global_by_event_name.size 32 -performance_schema events_stages_summary_global_by_event_name.count 150 +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 -performance_schema events_stages_summary_by_account_by_event_name.size 32 -performance_schema events_stages_summary_by_account_by_event_name.count 15000 +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 15000 performance_schema events_stages_summary_by_account_by_event_name.memory 480000 -performance_schema events_stages_summary_by_user_by_event_name.size 32 -performance_schema events_stages_summary_by_user_by_event_name.count 15000 +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 15000 performance_schema events_stages_summary_by_user_by_event_name.memory 480000 -performance_schema events_stages_summary_by_host_by_event_name.size 32 -performance_schema events_stages_summary_by_host_by_event_name.count 15000 +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 15000 performance_schema events_stages_summary_by_host_by_event_name.memory 480000 -performance_schema (pfs_statement_class).size 192 -performance_schema (pfs_statement_class).count 167 +performance_schema (pfs_statement_class).row_size 192 +performance_schema (pfs_statement_class).row_count 167 performance_schema (pfs_statement_class).memory 32064 -performance_schema events_statements_history.size 3024 -performance_schema events_statements_history.count 5000 +performance_schema events_statements_history.row_size 3024 +performance_schema events_statements_history.row_count 5000 performance_schema events_statements_history.memory 15120000 -performance_schema events_statements_history_long.size 3024 -performance_schema events_statements_history_long.count 10000 +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.size 184 -performance_schema events_statements_summary_by_thread_by_event_name.count 83500 +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 83500 performance_schema events_statements_summary_by_thread_by_event_name.memory 15364000 -performance_schema events_statements_summary_global_by_event_name.size 184 -performance_schema events_statements_summary_global_by_event_name.count 167 +performance_schema events_statements_summary_global_by_event_name.row_size 184 +performance_schema events_statements_summary_global_by_event_name.row_count 167 performance_schema events_statements_summary_global_by_event_name.memory 30728 -performance_schema events_statements_summary_by_account_by_event_name.size 184 -performance_schema events_statements_summary_by_account_by_event_name.count 16700 +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 16700 performance_schema events_statements_summary_by_account_by_event_name.memory 3072800 -performance_schema events_statements_summary_by_user_by_event_name.size 184 -performance_schema events_statements_summary_by_user_by_event_name.count 16700 +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 16700 performance_schema events_statements_summary_by_user_by_event_name.memory 3072800 -performance_schema events_statements_summary_by_host_by_event_name.size 184 -performance_schema events_statements_summary_by_host_by_event_name.count 16700 +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 16700 performance_schema events_statements_summary_by_host_by_event_name.memory 3072800 -performance_schema events_statements_current.size 3024 -performance_schema events_statements_current.count 500 +performance_schema events_statements_current.row_size 3024 +performance_schema events_statements_current.row_count 500 performance_schema events_statements_current.memory 1512000 -performance_schema (pfs_socket_class).size 320 -performance_schema (pfs_socket_class).count 10 +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.size 320 -performance_schema socket_instances.count 420 +performance_schema socket_instances.row_size 320 +performance_schema socket_instances.row_count 420 performance_schema socket_instances.memory 134400 -performance_schema events_statements_summary_by_digest.size 1472 -performance_schema events_statements_summary_by_digest.count 10000 +performance_schema events_statements_summary_by_digest.row_size 1472 +performance_schema events_statements_summary_by_digest.row_count 10000 performance_schema events_statements_summary_by_digest.memory 14720000 -performance_schema session_connect_attrs.size 500 -performance_schema session_connect_attrs.count 512 +performance_schema session_connect_attrs.row_size 500 +performance_schema session_connect_attrs.row_count 512 performance_schema session_connect_attrs.memory 256000 performance_schema (account_hash).count 2 performance_schema (account_hash).size 100 === modified file 'mysql-test/suite/perfschema/r/sizing_low.result' --- a/mysql-test/suite/perfschema/r/sizing_low.result 2013-01-14 19:05:35 +0000 +++ b/mysql-test/suite/perfschema/r/sizing_low.result 2013-01-15 08:54:09 +0000 @@ -67,142 +67,142 @@ Performance_schema_thread_instances_lost Performance_schema_users_lost 0 show engine performance_schema status; Type Name Status -performance_schema events_waits_current.size 184 -performance_schema events_waits_current.count 672 -performance_schema events_waits_history.size 184 -performance_schema events_waits_history.count 560 +performance_schema events_waits_current.row_size 184 +performance_schema events_waits_current.row_count 672 +performance_schema events_waits_history.row_size 184 +performance_schema events_waits_history.row_count 560 performance_schema events_waits_history.memory 103040 -performance_schema events_waits_history_long.size 184 -performance_schema events_waits_history_long.count 100 +performance_schema events_waits_history_long.row_size 184 +performance_schema events_waits_history_long.row_count 100 performance_schema events_waits_history_long.memory 18400 -performance_schema (pfs_mutex_class).size 256 -performance_schema (pfs_mutex_class).count 200 +performance_schema (pfs_mutex_class).row_size 256 +performance_schema (pfs_mutex_class).row_count 200 performance_schema (pfs_mutex_class).memory 51200 -performance_schema (pfs_rwlock_class).size 320 -performance_schema (pfs_rwlock_class).count 30 +performance_schema (pfs_rwlock_class).row_size 320 +performance_schema (pfs_rwlock_class).row_count 30 performance_schema (pfs_rwlock_class).memory 9600 -performance_schema (pfs_cond_class).size 256 -performance_schema (pfs_cond_class).count 80 +performance_schema (pfs_cond_class).row_size 256 +performance_schema (pfs_cond_class).row_count 80 performance_schema (pfs_cond_class).memory 20480 -performance_schema (pfs_thread_class).size 192 -performance_schema (pfs_thread_class).count 50 +performance_schema (pfs_thread_class).row_size 192 +performance_schema (pfs_thread_class).row_count 50 performance_schema (pfs_thread_class).memory 9600 -performance_schema (pfs_file_class).size 320 -performance_schema (pfs_file_class).count 50 +performance_schema (pfs_file_class).row_size 320 +performance_schema (pfs_file_class).row_count 50 performance_schema (pfs_file_class).memory 16000 -performance_schema mutex_instances.size 128 -performance_schema mutex_instances.count 2945 +performance_schema mutex_instances.row_size 128 +performance_schema mutex_instances.row_count 2945 performance_schema mutex_instances.memory 376960 -performance_schema rwlock_instances.size 192 -performance_schema rwlock_instances.count 1612 +performance_schema rwlock_instances.row_size 192 +performance_schema rwlock_instances.row_count 1612 performance_schema rwlock_instances.memory 309504 -performance_schema cond_instances.size 128 -performance_schema cond_instances.count 612 +performance_schema cond_instances.row_size 128 +performance_schema cond_instances.row_count 612 performance_schema cond_instances.memory 78336 -performance_schema threads.size 1856 -performance_schema threads.count 112 +performance_schema threads.row_size 1856 +performance_schema threads.row_count 112 performance_schema threads.memory 207872 -performance_schema file_instances.size 704 -performance_schema file_instances.count 1556 +performance_schema file_instances.row_size 704 +performance_schema file_instances.row_count 1556 performance_schema file_instances.memory 1095424 -performance_schema (pfs_file_handle).size 8 -performance_schema (pfs_file_handle).count 32768 +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.size 32 -performance_schema events_waits_summary_by_thread_by_event_name.count 41776 +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 41776 performance_schema events_waits_summary_by_thread_by_event_name.memory 1336832 -performance_schema (pfs_table_share).size 22208 -performance_schema (pfs_table_share).count 445 +performance_schema (pfs_table_share).row_size 22208 +performance_schema (pfs_table_share).row_count 445 performance_schema (pfs_table_share).memory 9882560 -performance_schema (pfs_table).size 9280 -performance_schema (pfs_table).count 112 +performance_schema (pfs_table).row_size 9280 +performance_schema (pfs_table).row_count 112 performance_schema (pfs_table).memory 1039360 -performance_schema setup_actors.size 256 -performance_schema setup_actors.count 100 +performance_schema setup_actors.row_size 256 +performance_schema setup_actors.row_count 100 performance_schema setup_actors.memory 25600 -performance_schema setup_objects.size 448 -performance_schema setup_objects.count 100 +performance_schema setup_objects.row_size 448 +performance_schema setup_objects.row_count 100 performance_schema setup_objects.memory 44800 -performance_schema (pfs_account).size 256 -performance_schema (pfs_account).count 10 +performance_schema (pfs_account).row_size 256 +performance_schema (pfs_account).row_count 10 performance_schema (pfs_account).memory 2560 -performance_schema events_waits_summary_by_account_by_event_name.size 32 -performance_schema events_waits_summary_by_account_by_event_name.count 3730 +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 3730 performance_schema events_waits_summary_by_account_by_event_name.memory 119360 -performance_schema events_waits_summary_by_user_by_event_name.size 32 -performance_schema events_waits_summary_by_user_by_event_name.count 1865 +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 1865 performance_schema events_waits_summary_by_user_by_event_name.memory 59680 -performance_schema events_waits_summary_by_host_by_event_name.size 32 -performance_schema events_waits_summary_by_host_by_event_name.count 7460 +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 7460 performance_schema events_waits_summary_by_host_by_event_name.memory 238720 -performance_schema (pfs_user).size 128 -performance_schema (pfs_user).count 5 +performance_schema (pfs_user).row_size 128 +performance_schema (pfs_user).row_count 5 performance_schema (pfs_user).memory 640 -performance_schema (pfs_host).size 128 -performance_schema (pfs_host).count 20 +performance_schema (pfs_host).row_size 128 +performance_schema (pfs_host).row_count 20 performance_schema (pfs_host).memory 2560 -performance_schema (pfs_stage_class).size 192 -performance_schema (pfs_stage_class).count 150 +performance_schema (pfs_stage_class).row_size 192 +performance_schema (pfs_stage_class).row_count 150 performance_schema (pfs_stage_class).memory 28800 -performance_schema events_stages_history.size 88 -performance_schema events_stages_history.count 560 +performance_schema events_stages_history.row_size 88 +performance_schema events_stages_history.row_count 560 performance_schema events_stages_history.memory 49280 -performance_schema events_stages_history_long.size 88 -performance_schema events_stages_history_long.count 100 +performance_schema events_stages_history_long.row_size 88 +performance_schema events_stages_history_long.row_count 100 performance_schema events_stages_history_long.memory 8800 -performance_schema events_stages_summary_by_thread_by_event_name.size 32 -performance_schema events_stages_summary_by_thread_by_event_name.count 16800 +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 16800 performance_schema events_stages_summary_by_thread_by_event_name.memory 537600 -performance_schema events_stages_summary_global_by_event_name.size 32 -performance_schema events_stages_summary_global_by_event_name.count 150 +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 -performance_schema events_stages_summary_by_account_by_event_name.size 32 -performance_schema events_stages_summary_by_account_by_event_name.count 1500 +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 1500 performance_schema events_stages_summary_by_account_by_event_name.memory 48000 -performance_schema events_stages_summary_by_user_by_event_name.size 32 -performance_schema events_stages_summary_by_user_by_event_name.count 750 +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 750 performance_schema events_stages_summary_by_user_by_event_name.memory 24000 -performance_schema events_stages_summary_by_host_by_event_name.size 32 -performance_schema events_stages_summary_by_host_by_event_name.count 3000 +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 3000 performance_schema events_stages_summary_by_host_by_event_name.memory 96000 -performance_schema (pfs_statement_class).size 192 -performance_schema (pfs_statement_class).count 167 +performance_schema (pfs_statement_class).row_size 192 +performance_schema (pfs_statement_class).row_count 167 performance_schema (pfs_statement_class).memory 32064 -performance_schema events_statements_history.size 3024 -performance_schema events_statements_history.count 560 +performance_schema events_statements_history.row_size 3024 +performance_schema events_statements_history.row_count 560 performance_schema events_statements_history.memory 1693440 -performance_schema events_statements_history_long.size 3024 -performance_schema events_statements_history_long.count 100 +performance_schema events_statements_history_long.row_size 3024 +performance_schema events_statements_history_long.row_count 100 performance_schema events_statements_history_long.memory 302400 -performance_schema events_statements_summary_by_thread_by_event_name.size 184 -performance_schema events_statements_summary_by_thread_by_event_name.count 18704 +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 18704 performance_schema events_statements_summary_by_thread_by_event_name.memory 3441536 -performance_schema events_statements_summary_global_by_event_name.size 184 -performance_schema events_statements_summary_global_by_event_name.count 167 +performance_schema events_statements_summary_global_by_event_name.row_size 184 +performance_schema events_statements_summary_global_by_event_name.row_count 167 performance_schema events_statements_summary_global_by_event_name.memory 30728 -performance_schema events_statements_summary_by_account_by_event_name.size 184 -performance_schema events_statements_summary_by_account_by_event_name.count 1670 +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 1670 performance_schema events_statements_summary_by_account_by_event_name.memory 307280 -performance_schema events_statements_summary_by_user_by_event_name.size 184 -performance_schema events_statements_summary_by_user_by_event_name.count 835 +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 835 performance_schema events_statements_summary_by_user_by_event_name.memory 153640 -performance_schema events_statements_summary_by_host_by_event_name.size 184 -performance_schema events_statements_summary_by_host_by_event_name.count 3340 +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 3340 performance_schema events_statements_summary_by_host_by_event_name.memory 614560 -performance_schema events_statements_current.size 3024 -performance_schema events_statements_current.count 112 +performance_schema events_statements_current.row_size 3024 +performance_schema events_statements_current.row_count 112 performance_schema events_statements_current.memory 338688 -performance_schema (pfs_socket_class).size 320 -performance_schema (pfs_socket_class).count 10 +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.size 320 -performance_schema socket_instances.count 67 +performance_schema socket_instances.row_size 320 +performance_schema socket_instances.row_count 67 performance_schema socket_instances.memory 21440 -performance_schema events_statements_summary_by_digest.size 1472 -performance_schema events_statements_summary_by_digest.count 1000 +performance_schema events_statements_summary_by_digest.row_size 1472 +performance_schema events_statements_summary_by_digest.row_count 1000 performance_schema events_statements_summary_by_digest.memory 1472000 -performance_schema session_connect_attrs.size 112 -performance_schema session_connect_attrs.count 512 +performance_schema session_connect_attrs.row_size 112 +performance_schema session_connect_attrs.row_count 512 performance_schema session_connect_attrs.memory 57344 performance_schema (account_hash).count 2 performance_schema (account_hash).size 10 === modified file 'mysql-test/suite/perfschema/r/sizing_med.result' --- a/mysql-test/suite/perfschema/r/sizing_med.result 2013-01-14 19:05:35 +0000 +++ b/mysql-test/suite/perfschema/r/sizing_med.result 2013-01-15 08:54:09 +0000 @@ -67,142 +67,142 @@ Performance_schema_thread_instances_lost Performance_schema_users_lost 0 show engine performance_schema status; Type Name Status -performance_schema events_waits_current.size 184 -performance_schema events_waits_current.count 1734 -performance_schema events_waits_history.size 184 -performance_schema events_waits_history.count 2890 +performance_schema events_waits_current.row_size 184 +performance_schema events_waits_current.row_count 1734 +performance_schema events_waits_history.row_size 184 +performance_schema events_waits_history.row_count 2890 performance_schema events_waits_history.memory 531760 -performance_schema events_waits_history_long.size 184 -performance_schema events_waits_history_long.count 1000 +performance_schema events_waits_history_long.row_size 184 +performance_schema events_waits_history_long.row_count 1000 performance_schema events_waits_history_long.memory 184000 -performance_schema (pfs_mutex_class).size 256 -performance_schema (pfs_mutex_class).count 200 +performance_schema (pfs_mutex_class).row_size 256 +performance_schema (pfs_mutex_class).row_count 200 performance_schema (pfs_mutex_class).memory 51200 -performance_schema (pfs_rwlock_class).size 320 -performance_schema (pfs_rwlock_class).count 30 +performance_schema (pfs_rwlock_class).row_size 320 +performance_schema (pfs_rwlock_class).row_count 30 performance_schema (pfs_rwlock_class).memory 9600 -performance_schema (pfs_cond_class).size 256 -performance_schema (pfs_cond_class).count 80 +performance_schema (pfs_cond_class).row_size 256 +performance_schema (pfs_cond_class).row_count 80 performance_schema (pfs_cond_class).memory 20480 -performance_schema (pfs_thread_class).size 192 -performance_schema (pfs_thread_class).count 50 +performance_schema (pfs_thread_class).row_size 192 +performance_schema (pfs_thread_class).row_count 50 performance_schema (pfs_thread_class).memory 9600 -performance_schema (pfs_file_class).size 320 -performance_schema (pfs_file_class).count 50 +performance_schema (pfs_file_class).row_size 320 +performance_schema (pfs_file_class).row_count 50 performance_schema (pfs_file_class).memory 16000 -performance_schema mutex_instances.size 128 -performance_schema mutex_instances.count 4230 +performance_schema mutex_instances.row_size 128 +performance_schema mutex_instances.row_count 4230 performance_schema mutex_instances.memory 541440 -performance_schema rwlock_instances.size 192 -performance_schema rwlock_instances.count 2222 +performance_schema rwlock_instances.row_size 192 +performance_schema rwlock_instances.row_count 2222 performance_schema rwlock_instances.memory 426624 -performance_schema cond_instances.size 128 -performance_schema cond_instances.count 1079 +performance_schema cond_instances.row_size 128 +performance_schema cond_instances.row_count 1079 performance_schema cond_instances.memory 138112 -performance_schema threads.size 1856 -performance_schema threads.count 289 +performance_schema threads.row_size 1856 +performance_schema threads.row_count 289 performance_schema threads.memory 536384 -performance_schema file_instances.size 704 -performance_schema file_instances.count 1754 +performance_schema file_instances.row_size 704 +performance_schema file_instances.row_count 1754 performance_schema file_instances.memory 1234816 -performance_schema (pfs_file_handle).size 8 -performance_schema (pfs_file_handle).count 32768 +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.size 32 -performance_schema events_waits_summary_by_thread_by_event_name.count 107797 +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 107797 performance_schema events_waits_summary_by_thread_by_event_name.memory 3449504 -performance_schema (pfs_table_share).size 22208 -performance_schema (pfs_table_share).count 556 +performance_schema (pfs_table_share).row_size 22208 +performance_schema (pfs_table_share).row_count 556 performance_schema (pfs_table_share).memory 12347648 -performance_schema (pfs_table).size 9280 -performance_schema (pfs_table).count 573 +performance_schema (pfs_table).row_size 9280 +performance_schema (pfs_table).row_count 573 performance_schema (pfs_table).memory 5317440 -performance_schema setup_actors.size 256 -performance_schema setup_actors.count 100 +performance_schema setup_actors.row_size 256 +performance_schema setup_actors.row_count 100 performance_schema setup_actors.memory 25600 -performance_schema setup_objects.size 448 -performance_schema setup_objects.count 100 +performance_schema setup_objects.row_size 448 +performance_schema setup_objects.row_count 100 performance_schema setup_objects.memory 44800 -performance_schema (pfs_account).size 256 -performance_schema (pfs_account).count 100 +performance_schema (pfs_account).row_size 256 +performance_schema (pfs_account).row_count 100 performance_schema (pfs_account).memory 25600 -performance_schema events_waits_summary_by_account_by_event_name.size 32 -performance_schema events_waits_summary_by_account_by_event_name.count 37300 +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 37300 performance_schema events_waits_summary_by_account_by_event_name.memory 1193600 -performance_schema events_waits_summary_by_user_by_event_name.size 32 -performance_schema events_waits_summary_by_user_by_event_name.count 37300 +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 37300 performance_schema events_waits_summary_by_user_by_event_name.memory 1193600 -performance_schema events_waits_summary_by_host_by_event_name.size 32 -performance_schema events_waits_summary_by_host_by_event_name.count 37300 +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 37300 performance_schema events_waits_summary_by_host_by_event_name.memory 1193600 -performance_schema (pfs_user).size 128 -performance_schema (pfs_user).count 100 +performance_schema (pfs_user).row_size 128 +performance_schema (pfs_user).row_count 100 performance_schema (pfs_user).memory 12800 -performance_schema (pfs_host).size 128 -performance_schema (pfs_host).count 100 +performance_schema (pfs_host).row_size 128 +performance_schema (pfs_host).row_count 100 performance_schema (pfs_host).memory 12800 -performance_schema (pfs_stage_class).size 192 -performance_schema (pfs_stage_class).count 150 +performance_schema (pfs_stage_class).row_size 192 +performance_schema (pfs_stage_class).row_count 150 performance_schema (pfs_stage_class).memory 28800 -performance_schema events_stages_history.size 88 -performance_schema events_stages_history.count 2890 +performance_schema events_stages_history.row_size 88 +performance_schema events_stages_history.row_count 2890 performance_schema events_stages_history.memory 254320 -performance_schema events_stages_history_long.size 88 -performance_schema events_stages_history_long.count 1000 +performance_schema events_stages_history_long.row_size 88 +performance_schema events_stages_history_long.row_count 1000 performance_schema events_stages_history_long.memory 88000 -performance_schema events_stages_summary_by_thread_by_event_name.size 32 -performance_schema events_stages_summary_by_thread_by_event_name.count 43350 +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 43350 performance_schema events_stages_summary_by_thread_by_event_name.memory 1387200 -performance_schema events_stages_summary_global_by_event_name.size 32 -performance_schema events_stages_summary_global_by_event_name.count 150 +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 -performance_schema events_stages_summary_by_account_by_event_name.size 32 -performance_schema events_stages_summary_by_account_by_event_name.count 15000 +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 15000 performance_schema events_stages_summary_by_account_by_event_name.memory 480000 -performance_schema events_stages_summary_by_user_by_event_name.size 32 -performance_schema events_stages_summary_by_user_by_event_name.count 15000 +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 15000 performance_schema events_stages_summary_by_user_by_event_name.memory 480000 -performance_schema events_stages_summary_by_host_by_event_name.size 32 -performance_schema events_stages_summary_by_host_by_event_name.count 15000 +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 15000 performance_schema events_stages_summary_by_host_by_event_name.memory 480000 -performance_schema (pfs_statement_class).size 192 -performance_schema (pfs_statement_class).count 167 +performance_schema (pfs_statement_class).row_size 192 +performance_schema (pfs_statement_class).row_count 167 performance_schema (pfs_statement_class).memory 32064 -performance_schema events_statements_history.size 3024 -performance_schema events_statements_history.count 2890 +performance_schema events_statements_history.row_size 3024 +performance_schema events_statements_history.row_count 2890 performance_schema events_statements_history.memory 8739360 -performance_schema events_statements_history_long.size 3024 -performance_schema events_statements_history_long.count 1000 +performance_schema events_statements_history_long.row_size 3024 +performance_schema events_statements_history_long.row_count 1000 performance_schema events_statements_history_long.memory 3024000 -performance_schema events_statements_summary_by_thread_by_event_name.size 184 -performance_schema events_statements_summary_by_thread_by_event_name.count 48263 +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 48263 performance_schema events_statements_summary_by_thread_by_event_name.memory 8880392 -performance_schema events_statements_summary_global_by_event_name.size 184 -performance_schema events_statements_summary_global_by_event_name.count 167 +performance_schema events_statements_summary_global_by_event_name.row_size 184 +performance_schema events_statements_summary_global_by_event_name.row_count 167 performance_schema events_statements_summary_global_by_event_name.memory 30728 -performance_schema events_statements_summary_by_account_by_event_name.size 184 -performance_schema events_statements_summary_by_account_by_event_name.count 16700 +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 16700 performance_schema events_statements_summary_by_account_by_event_name.memory 3072800 -performance_schema events_statements_summary_by_user_by_event_name.size 184 -performance_schema events_statements_summary_by_user_by_event_name.count 16700 +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 16700 performance_schema events_statements_summary_by_user_by_event_name.memory 3072800 -performance_schema events_statements_summary_by_host_by_event_name.size 184 -performance_schema events_statements_summary_by_host_by_event_name.count 16700 +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 16700 performance_schema events_statements_summary_by_host_by_event_name.memory 3072800 -performance_schema events_statements_current.size 3024 -performance_schema events_statements_current.count 289 +performance_schema events_statements_current.row_size 3024 +performance_schema events_statements_current.row_count 289 performance_schema events_statements_current.memory 873936 -performance_schema (pfs_socket_class).size 320 -performance_schema (pfs_socket_class).count 10 +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.size 320 -performance_schema socket_instances.count 232 +performance_schema socket_instances.row_size 320 +performance_schema socket_instances.row_count 232 performance_schema socket_instances.memory 74240 -performance_schema events_statements_summary_by_digest.size 1472 -performance_schema events_statements_summary_by_digest.count 5000 +performance_schema events_statements_summary_by_digest.row_size 1472 +performance_schema events_statements_summary_by_digest.row_count 5000 performance_schema events_statements_summary_by_digest.memory 7360000 -performance_schema session_connect_attrs.size 289 -performance_schema session_connect_attrs.count 512 +performance_schema session_connect_attrs.row_size 289 +performance_schema session_connect_attrs.row_count 512 performance_schema session_connect_attrs.memory 147968 performance_schema (account_hash).count 2 performance_schema (account_hash).size 100 === modified file 'storage/perfschema/pfs_engine_table.cc' --- a/storage/perfschema/pfs_engine_table.cc 2013-01-14 19:05:35 +0000 +++ b/storage/perfschema/pfs_engine_table.cc 2013-01-15 08:54:09 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -743,19 +743,19 @@ bool pfs_show_status(handlerton *hton, T { switch (i){ case 0: - name= "events_waits_current.size"; + name= "events_waits_current.row_size"; size= sizeof(PFS_events_waits); break; case 1: - name= "events_waits_current.count"; + name= "events_waits_current.row_count"; size= WAIT_STACK_SIZE * thread_max; break; case 2: - name= "events_waits_history.size"; + name= "events_waits_history.row_size"; size= sizeof(PFS_events_waits); break; case 3: - name= "events_waits_history.count"; + name= "events_waits_history.row_count"; size= events_waits_history_per_thread * thread_max; break; case 4: @@ -765,11 +765,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 5: - name= "events_waits_history_long.size"; + name= "events_waits_history_long.row_size"; size= sizeof(PFS_events_waits); break; case 6: - name= "events_waits_history_long.count"; + name= "events_waits_history_long.row_count"; size= events_waits_history_long_size; break; case 7: @@ -778,11 +778,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 8: - name= "(pfs_mutex_class).size"; + name= "(pfs_mutex_class).row_size"; size= sizeof(PFS_mutex_class); break; case 9: - name= "(pfs_mutex_class).count"; + name= "(pfs_mutex_class).row_count"; size= mutex_class_max; break; case 10: @@ -791,11 +791,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 11: - name= "(pfs_rwlock_class).size"; + name= "(pfs_rwlock_class).row_size"; size= sizeof(PFS_rwlock_class); break; case 12: - name= "(pfs_rwlock_class).count"; + name= "(pfs_rwlock_class).row_count"; size= rwlock_class_max; break; case 13: @@ -804,11 +804,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 14: - name= "(pfs_cond_class).size"; + name= "(pfs_cond_class).row_size"; size= sizeof(PFS_cond_class); break; case 15: - name= "(pfs_cond_class).count"; + name= "(pfs_cond_class).row_count"; size= cond_class_max; break; case 16: @@ -817,11 +817,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 17: - name= "(pfs_thread_class).size"; + name= "(pfs_thread_class).row_size"; size= sizeof(PFS_thread_class); break; case 18: - name= "(pfs_thread_class).count"; + name= "(pfs_thread_class).row_count"; size= thread_class_max; break; case 19: @@ -830,11 +830,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 20: - name= "(pfs_file_class).size"; + name= "(pfs_file_class).row_size"; size= sizeof(PFS_file_class); break; case 21: - name= "(pfs_file_class).count"; + name= "(pfs_file_class).row_count"; size= file_class_max; break; case 22: @@ -843,11 +843,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 23: - name= "mutex_instances.size"; + name= "mutex_instances.row_size"; size= sizeof(PFS_mutex); break; case 24: - name= "mutex_instances.count"; + name= "mutex_instances.row_count"; size= mutex_max; break; case 25: @@ -856,11 +856,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 26: - name= "rwlock_instances.size"; + name= "rwlock_instances.row_size"; size= sizeof(PFS_rwlock); break; case 27: - name= "rwlock_instances.count"; + name= "rwlock_instances.row_count"; size= rwlock_max; break; case 28: @@ -869,11 +869,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 29: - name= "cond_instances.size"; + name= "cond_instances.row_size"; size= sizeof(PFS_cond); break; case 30: - name= "cond_instances.count"; + name= "cond_instances.row_count"; size= cond_max; break; case 31: @@ -882,11 +882,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 32: - name= "threads.size"; + name= "threads.row_size"; size= sizeof(PFS_thread); break; case 33: - name= "threads.count"; + name= "threads.row_count"; size= thread_max; break; case 34: @@ -895,11 +895,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 35: - name= "file_instances.size"; + name= "file_instances.row_size"; size= sizeof(PFS_file); break; case 36: - name= "file_instances.count"; + name= "file_instances.row_count"; size= file_max; break; case 37: @@ -908,11 +908,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 38: - name= "(pfs_file_handle).size"; + name= "(pfs_file_handle).row_size"; size= sizeof(PFS_file*); break; case 39: - name= "(pfs_file_handle).count"; + name= "(pfs_file_handle).row_count"; size= file_handle_max; break; case 40: @@ -921,11 +921,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 41: - name= "events_waits_summary_by_thread_by_event_name.size"; + name= "events_waits_summary_by_thread_by_event_name.row_size"; size= sizeof(PFS_single_stat); break; case 42: - name= "events_waits_summary_by_thread_by_event_name.count"; + name= "events_waits_summary_by_thread_by_event_name.row_count"; size= thread_max * wait_class_max; break; case 43: @@ -934,11 +934,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 44: - name= "(pfs_table_share).size"; + name= "(pfs_table_share).row_size"; size= sizeof(PFS_table_share); break; case 45: - name= "(pfs_table_share).count"; + name= "(pfs_table_share).row_count"; size= table_share_max; break; case 46: @@ -947,11 +947,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 47: - name= "(pfs_table).size"; + name= "(pfs_table).row_size"; size= sizeof(PFS_table); break; case 48: - name= "(pfs_table).count"; + name= "(pfs_table).row_count"; size= table_max; break; case 49: @@ -960,11 +960,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 50: - name= "setup_actors.size"; + name= "setup_actors.row_size"; size= sizeof(PFS_setup_actor); break; case 51: - name= "setup_actors.count"; + name= "setup_actors.row_count"; size= setup_actor_max; break; case 52: @@ -973,11 +973,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 53: - name= "setup_objects.size"; + name= "setup_objects.row_size"; size= sizeof(PFS_setup_object); break; case 54: - name= "setup_objects.count"; + name= "setup_objects.row_count"; size= setup_object_max; break; case 55: @@ -986,11 +986,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 56: - name= "(pfs_account).size"; + name= "(pfs_account).row_size"; size= sizeof(PFS_account); break; case 57: - name= "(pfs_account).count"; + name= "(pfs_account).row_count"; size= account_max; break; case 58: @@ -999,11 +999,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 59: - name= "events_waits_summary_by_account_by_event_name.size"; + name= "events_waits_summary_by_account_by_event_name.row_size"; size= sizeof(PFS_single_stat); break; case 60: - name= "events_waits_summary_by_account_by_event_name.count"; + name= "events_waits_summary_by_account_by_event_name.row_count"; size= account_max * wait_class_max; break; case 61: @@ -1012,11 +1012,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 62: - name= "events_waits_summary_by_user_by_event_name.size"; + name= "events_waits_summary_by_user_by_event_name.row_size"; size= sizeof(PFS_single_stat); break; case 63: - name= "events_waits_summary_by_user_by_event_name.count"; + name= "events_waits_summary_by_user_by_event_name.row_count"; size= user_max * wait_class_max; break; case 64: @@ -1025,11 +1025,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 65: - name= "events_waits_summary_by_host_by_event_name.size"; + name= "events_waits_summary_by_host_by_event_name.row_size"; size= sizeof(PFS_single_stat); break; case 66: - name= "events_waits_summary_by_host_by_event_name.count"; + name= "events_waits_summary_by_host_by_event_name.row_count"; size= host_max * wait_class_max; break; case 67: @@ -1038,11 +1038,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 68: - name= "(pfs_user).size"; + name= "(pfs_user).row_size"; size= sizeof(PFS_user); break; case 69: - name= "(pfs_user).count"; + name= "(pfs_user).row_count"; size= user_max; break; case 70: @@ -1051,11 +1051,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 71: - name= "(pfs_host).size"; + name= "(pfs_host).row_size"; size= sizeof(PFS_host); break; case 72: - name= "(pfs_host).count"; + name= "(pfs_host).row_count"; size= host_max; break; case 73: @@ -1064,11 +1064,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 74: - name= "(pfs_stage_class).size"; + name= "(pfs_stage_class).row_size"; size= sizeof(PFS_stage_class); break; case 75: - name= "(pfs_stage_class).count"; + name= "(pfs_stage_class).row_count"; size= stage_class_max; break; case 76: @@ -1077,11 +1077,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 77: - name= "events_stages_history.size"; + name= "events_stages_history.row_size"; size= sizeof(PFS_events_stages); break; case 78: - name= "events_stages_history.count"; + name= "events_stages_history.row_count"; size= events_stages_history_per_thread * thread_max; break; case 79: @@ -1091,11 +1091,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 80: - name= "events_stages_history_long.size"; + name= "events_stages_history_long.row_size"; size= sizeof(PFS_events_stages); break; case 81: - name= "events_stages_history_long.count"; + name= "events_stages_history_long.row_count"; size= events_stages_history_long_size; break; case 82: @@ -1104,11 +1104,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 83: - name= "events_stages_summary_by_thread_by_event_name.size"; + name= "events_stages_summary_by_thread_by_event_name.row_size"; size= sizeof(PFS_stage_stat); break; case 84: - name= "events_stages_summary_by_thread_by_event_name.count"; + name= "events_stages_summary_by_thread_by_event_name.row_count"; size= thread_max * stage_class_max; break; case 85: @@ -1117,11 +1117,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 86: - name= "events_stages_summary_global_by_event_name.size"; + name= "events_stages_summary_global_by_event_name.row_size"; size= sizeof(PFS_stage_stat); break; case 87: - name= "events_stages_summary_global_by_event_name.count"; + name= "events_stages_summary_global_by_event_name.row_count"; size= stage_class_max; break; case 88: @@ -1130,11 +1130,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 89: - name= "events_stages_summary_by_account_by_event_name.size"; + name= "events_stages_summary_by_account_by_event_name.row_size"; size= sizeof(PFS_stage_stat); break; case 90: - name= "events_stages_summary_by_account_by_event_name.count"; + name= "events_stages_summary_by_account_by_event_name.row_count"; size= account_max * stage_class_max; break; case 91: @@ -1143,11 +1143,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 92: - name= "events_stages_summary_by_user_by_event_name.size"; + name= "events_stages_summary_by_user_by_event_name.row_size"; size= sizeof(PFS_stage_stat); break; case 93: - name= "events_stages_summary_by_user_by_event_name.count"; + name= "events_stages_summary_by_user_by_event_name.row_count"; size= user_max * stage_class_max; break; case 94: @@ -1156,11 +1156,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 95: - name= "events_stages_summary_by_host_by_event_name.size"; + name= "events_stages_summary_by_host_by_event_name.row_size"; size= sizeof(PFS_stage_stat); break; case 96: - name= "events_stages_summary_by_host_by_event_name.count"; + name= "events_stages_summary_by_host_by_event_name.row_count"; size= host_max * stage_class_max; break; case 97: @@ -1169,11 +1169,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 98: - name= "(pfs_statement_class).size"; + name= "(pfs_statement_class).row_size"; size= sizeof(PFS_statement_class); break; case 99: - name= "(pfs_statement_class).count"; + name= "(pfs_statement_class).row_count"; size= statement_class_max; break; case 100: @@ -1182,11 +1182,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 101: - name= "events_statements_history.size"; + name= "events_statements_history.row_size"; size= sizeof(PFS_events_statements); break; case 102: - name= "events_statements_history.count"; + name= "events_statements_history.row_count"; size= events_statements_history_per_thread * thread_max; break; case 103: @@ -1196,11 +1196,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 104: - name= "events_statements_history_long.size"; + name= "events_statements_history_long.row_size"; size= sizeof(PFS_events_statements); break; case 105: - name= "events_statements_history_long.count"; + name= "events_statements_history_long.row_count"; size= events_statements_history_long_size; break; case 106: @@ -1209,11 +1209,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 107: - name= "events_statements_summary_by_thread_by_event_name.size"; + name= "events_statements_summary_by_thread_by_event_name.row_size"; size= sizeof(PFS_statement_stat); break; case 108: - name= "events_statements_summary_by_thread_by_event_name.count"; + name= "events_statements_summary_by_thread_by_event_name.row_count"; size= thread_max * statement_class_max; break; case 109: @@ -1222,11 +1222,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 110: - name= "events_statements_summary_global_by_event_name.size"; + name= "events_statements_summary_global_by_event_name.row_size"; size= sizeof(PFS_statement_stat); break; case 111: - name= "events_statements_summary_global_by_event_name.count"; + name= "events_statements_summary_global_by_event_name.row_count"; size= statement_class_max; break; case 112: @@ -1235,11 +1235,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 113: - name= "events_statements_summary_by_account_by_event_name.size"; + name= "events_statements_summary_by_account_by_event_name.row_size"; size= sizeof(PFS_statement_stat); break; case 114: - name= "events_statements_summary_by_account_by_event_name.count"; + name= "events_statements_summary_by_account_by_event_name.row_count"; size= account_max * statement_class_max; break; case 115: @@ -1248,11 +1248,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 116: - name= "events_statements_summary_by_user_by_event_name.size"; + name= "events_statements_summary_by_user_by_event_name.row_size"; size= sizeof(PFS_statement_stat); break; case 117: - name= "events_statements_summary_by_user_by_event_name.count"; + name= "events_statements_summary_by_user_by_event_name.row_count"; size= user_max * statement_class_max; break; case 118: @@ -1261,11 +1261,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 119: - name= "events_statements_summary_by_host_by_event_name.size"; + name= "events_statements_summary_by_host_by_event_name.row_size"; size= sizeof(PFS_statement_stat); break; case 120: - name= "events_statements_summary_by_host_by_event_name.count"; + name= "events_statements_summary_by_host_by_event_name.row_count"; size= host_max * statement_class_max; break; case 121: @@ -1274,11 +1274,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 122: - name= "events_statements_current.size"; + name= "events_statements_current.row_size"; size= sizeof(PFS_events_statements); break; case 123: - name= "events_statements_current.count"; + name= "events_statements_current.row_count"; size= thread_max * statement_stack_max; break; case 124: @@ -1287,11 +1287,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 125: - name= "(pfs_socket_class).size"; + name= "(pfs_socket_class).row_size"; size= sizeof(PFS_socket_class); break; case 126: - name= "(pfs_socket_class).count"; + name= "(pfs_socket_class).row_count"; size= socket_class_max; break; case 127: @@ -1300,11 +1300,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 128: - name= "socket_instances.size"; + name= "socket_instances.row_size"; size= sizeof(PFS_socket); break; case 129: - name= "socket_instances.count"; + name= "socket_instances.row_count"; size= socket_max; break; case 130: @@ -1313,11 +1313,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 131: - name= "events_statements_summary_by_digest.size"; + name= "events_statements_summary_by_digest.row_size"; size= sizeof(PFS_statements_digest_stat); break; case 132: - name= "events_statements_summary_by_digest.count"; + name= "events_statements_summary_by_digest.row_count"; size= digest_max; break; case 133: @@ -1326,11 +1326,11 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 134: - name= "session_connect_attrs.size"; + name= "session_connect_attrs.row_size"; size= thread_max; break; case 135: - name= "session_connect_attrs.count"; + name= "session_connect_attrs.row_count"; size= session_connect_attrs_size_per_thread; break; case 136: No bundle (reason: useless for push emails).