From: Marc Alff Date: December 7 2010 8:00pm Subject: bzr commit into mysql-5.5-bugteam branch (marc.alff:3177) Bug#58798 List-Archive: http://lists.mysql.com/commits/126262 X-Bug: 58798 Message-Id: <201012072000.oB7HiH5t016798@rcsinet13.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6439960939471284455==" --===============6439960939471284455== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///Users/malff/BZR_TREE/mysql-5.5-bugteam-58798/ based on revid:ramil@stripped 3177 Marc Alff 2010-12-07 Bug#58798 SHOW ENGINE PERFORMANCE_SCHEMA STATUS: incorrect table lettercase Before this fix, the output of SHOW ENGINE PERFORMANCE_SCHEMA STATUS used uppercase to name performance schema tables. This is inconsistent since performance schema tables have been renamed to lowercase. Also, an old table 'PROCESSLIST' was still visible, even after this table got renamed to 'threads'. This fix: - correctly uses lowercases in the output, to match the current naming. - replaced 'PROCESSLIST' with 'threads'. Tested the output of SHOW ENGINE PERFORMANCE_SCHEMA STATUS manually. No automated test cases can be written for this, since the output is too platform dependent (sizes). modified: storage/perfschema/pfs_engine_table.cc === modified file 'storage/perfschema/pfs_engine_table.cc' --- a/storage/perfschema/pfs_engine_table.cc 2010-12-01 12:06:41 +0000 +++ b/storage/perfschema/pfs_engine_table.cc 2010-12-07 20:00:33 +0000 @@ -519,9 +519,9 @@ bool pfs_show_status(handlerton *hton, T /* Note about naming conventions: - Internal buffers exposed as a table in the performance schema are named - after the table, as in 'EVENTS_WAITS_CURRENT' + after the table, as in 'events_waits_current' - Internal buffers not exposed by a table are named with parenthesis, - as in '(PFS_MUTEX_CLASS)'. + as in '(pfs_mutex_class)'. */ if (stat != HA_ENGINE_STATUS) DBUG_RETURN(false); @@ -532,219 +532,219 @@ bool pfs_show_status(handlerton *hton, T { switch (i){ case 0: - name= "EVENTS_WAITS_CURRENT.ROW_SIZE"; + name= "events_waits_current.row_size"; size= sizeof(PFS_wait_locker); break; case 1: - name= "EVENTS_WAITS_CURRENT.ROW_COUNT"; + name= "events_waits_current.row_count"; size= LOCKER_STACK_SIZE * thread_max; break; case 2: - name= "EVENTS_WAITS_HISTORY.ROW_SIZE"; + name= "events_waits_history.row_size"; size= sizeof(PFS_events_waits); break; case 3: - name= "EVENTS_WAITS_HISTORY.ROW_COUNT"; + name= "events_waits_history.row_count"; size= events_waits_history_per_thread * thread_max; break; case 4: - name= "EVENTS_WAITS_HISTORY.MEMORY"; + name= "events_waits_history.memory"; size= events_waits_history_per_thread * thread_max * sizeof(PFS_events_waits); total_memory+= size; break; case 5: - name= "EVENTS_WAITS_HISTORY_LONG.ROW_SIZE"; + name= "events_waits_history_long.row_size"; size= sizeof(PFS_events_waits); break; case 6: - name= "EVENTS_WAITS_HISTORY_LONG.ROW_COUNT"; + name= "events_waits_history_long.row_count"; size= events_waits_history_long_size; break; case 7: - name= "EVENTS_WAITS_HISTORY_LONG.MEMORY"; + name= "events_waits_history_long.memory"; size= events_waits_history_long_size * sizeof(PFS_events_waits); total_memory+= size; break; case 8: - name= "(PFS_MUTEX_CLASS).ROW_SIZE"; + name= "(pfs_mutex_class).row_size"; size= sizeof(PFS_mutex_class); break; case 9: - name= "(PFS_MUTEX_CLASS).ROW_COUNT"; + name= "(pfs_mutex_class).row_count"; size= mutex_class_max; break; case 10: - name= "(PFS_MUTEX_CLASS).MEMORY"; + name= "(pfs_mutex_class).memory"; size= mutex_class_max * sizeof(PFS_mutex_class); total_memory+= size; break; case 11: - name= "(PFS_RWLOCK_CLASS).ROW_SIZE"; + name= "(pfs_rwlock_class).row_size"; size= sizeof(PFS_rwlock_class); break; case 12: - name= "(PFS_RWLOCK_CLASS).ROW_COUNT"; + name= "(pfs_rwlock_class).row_count"; size= rwlock_class_max; break; case 13: - name= "(PFS_RWLOCK_CLASS).MEMORY"; + name= "(pfs_rwlock_class).memory"; size= rwlock_class_max * sizeof(PFS_rwlock_class); total_memory+= size; break; case 14: - name= "(PFS_COND_CLASS).ROW_SIZE"; + name= "(pfs_cond_class).row_size"; size= sizeof(PFS_cond_class); break; case 15: - name= "(PFS_COND_CLASS).ROW_COUNT"; + name= "(pfs_cond_class).row_count"; size= cond_class_max; break; case 16: - name= "(PFS_COND_CLASS).MEMORY"; + name= "(pfs_cond_class).memory"; size= cond_class_max * sizeof(PFS_cond_class); total_memory+= size; break; case 17: - name= "(PFS_THREAD_CLASS).ROW_SIZE"; + name= "(pfs_thread_class).row_size"; size= sizeof(PFS_thread_class); break; case 18: - name= "(PFS_THREAD_CLASS).ROW_COUNT"; + name= "(pfs_thread_class).row_count"; size= thread_class_max; break; case 19: - name= "(PFS_THREAD_CLASS).MEMORY"; + name= "(pfs_thread_class).memory"; size= thread_class_max * sizeof(PFS_thread_class); total_memory+= size; break; case 20: - name= "(PFS_FILE_CLASS).ROW_SIZE"; + name= "(pfs_file_class).row_size"; size= sizeof(PFS_file_class); break; case 21: - name= "(PFS_FILE_CLASS).ROW_COUNT"; + name= "(pfs_file_class).row_count"; size= file_class_max; break; case 22: - name= "(PFS_FILE_CLASS).MEMORY"; + name= "(pfs_file_class).memory"; size= file_class_max * sizeof(PFS_file_class); total_memory+= size; break; case 23: - name= "MUTEX_INSTANCES.ROW_SIZE"; + name= "mutex_instances.row_size"; size= sizeof(PFS_mutex); break; case 24: - name= "MUTEX_INSTANCES.ROW_COUNT"; + name= "mutex_instances.row_count"; size= mutex_max; break; case 25: - name= "MUTEX_INSTANCES.MEMORY"; + name= "mutex_instances.memory"; size= mutex_max * sizeof(PFS_mutex); total_memory+= size; break; case 26: - name= "RWLOCK_INSTANCES.ROW_SIZE"; + name= "rwlock_instances.row_size"; size= sizeof(PFS_rwlock); break; case 27: - name= "RWLOCK_INSTANCES.ROW_COUNT"; + name= "rwlock_instances.row_count"; size= rwlock_max; break; case 28: - name= "RWLOCK_INSTANCES.MEMORY"; + name= "rwlock_instances.memory"; size= rwlock_max * sizeof(PFS_rwlock); total_memory+= size; break; case 29: - name= "COND_INSTANCES.ROW_SIZE"; + name= "cond_instances.row_size"; size= sizeof(PFS_cond); break; case 30: - name= "COND_INSTANCES.ROW_COUNT"; + name= "cond_instances.row_count"; size= cond_max; break; case 31: - name= "COND_INSTANCES.MEMORY"; + name= "cond_instances.memory"; size= cond_max * sizeof(PFS_cond); total_memory+= size; break; case 32: - name= "PROCESSLIST.ROW_SIZE"; + name= "threads.row_size"; size= sizeof(PFS_thread); break; case 33: - name= "PROCESSLIST.ROW_COUNT"; + name= "threads.row_count"; size= thread_max; break; case 34: - name= "PROCESSLIST.MEMORY"; + name= "threads.memory"; size= thread_max * sizeof(PFS_thread); total_memory+= size; break; case 35: - name= "FILE_INSTANCES.ROW_SIZE"; + name= "file_instances.row_size"; size= sizeof(PFS_file); break; case 36: - name= "FILE_INSTANCES.ROW_COUNT"; + name= "file_instances.row_count"; size= file_max; break; case 37: - name= "FILE_INSTANCES.MEMORY"; + name= "file_instances.memory"; size= file_max * sizeof(PFS_file); total_memory+= size; break; case 38: - name= "(PFS_FILE_HANDLE).ROW_SIZE"; + name= "(pfs_file_handle).row_size"; size= sizeof(PFS_file*); break; case 39: - name= "(PFS_FILE_HANDLE).ROW_COUNT"; + name= "(pfs_file_handle).row_count"; size= file_handle_max; break; case 40: - name= "(PFS_FILE_HANDLE).MEMORY"; + name= "(pfs_file_handle).memory"; size= file_handle_max * sizeof(PFS_file*); total_memory+= size; break; case 41: - name= "EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME.ROW_SIZE"; + name= "events_waits_summary_by_thread_by_event_name.row_size"; size= sizeof(PFS_single_stat_chain); break; case 42: - name= "EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME.ROW_COUNT"; + name= "events_waits_summary_by_thread_by_event_name.row_count"; size= thread_max * instr_class_per_thread; break; case 43: - name= "EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME.MEMORY"; + name= "events_waits_summary_by_thread_by_event_name.memory"; size= thread_max * instr_class_per_thread * sizeof(PFS_single_stat_chain); total_memory+= size; break; case 44: - name= "(PFS_TABLE_SHARE).ROW_SIZE"; + name= "(pfs_table_share).row_size"; size= sizeof(PFS_table_share); break; case 45: - name= "(PFS_TABLE_SHARE).ROW_COUNT"; + name= "(pfs_table_share).row_count"; size= table_share_max; break; case 46: - name= "(PFS_TABLE_SHARE).MEMORY"; + name= "(pfs_table_share).memory"; size= table_share_max * sizeof(PFS_table_share); total_memory+= size; break; case 47: - name= "(PFS_TABLE).ROW_SIZE"; + name= "(pfs_table).row_size"; size= sizeof(PFS_table); break; case 48: - name= "(PFS_TABLE).ROW_COUNT"; + name= "(pfs_table).row_count"; size= table_max; break; case 49: - name= "(PFS_TABLE).MEMORY"; + name= "(pfs_table).memory"; size= table_max * sizeof(PFS_table); total_memory+= size; break; @@ -753,7 +753,7 @@ bool pfs_show_status(handlerton *hton, T for aggregation in total_memory. */ case 50: - name= "PERFORMANCE_SCHEMA.MEMORY"; + name= "performance_schema.memory"; size= total_memory; /* This will fail if something is not advertised here */ DBUG_ASSERT(size == pfs_allocated_memory); --===============6439960939471284455== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/marc.alff@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@stripped # target_branch: file:///Users/malff/BZR_TREE/mysql-5.5-bugteam-58798/ # testament_sha1: d9f7715b6029a78e4be33dbb98a11d0b9c987490 # timestamp: 2010-12-07 21:00:40 +0100 # base_revision_id: ramil@stripped # # Begin bundle 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 --===============6439960939471284455==--