From: Marc Alff Date: May 9 2011 10:58am Subject: bzr commit into mysql-trunk-wl5378 branch (marc.alff:3352) WL#5378 List-Archive: http://lists.mysql.com/commits/136936 Message-Id: <201105091058.p49Awtq4020457@acsmt356.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4305591643834041608==" --===============4305591643834041608== 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-trunk-wl5378/ based on revid:marc.alff@stripped 3352 Marc Alff 2011-05-09 WL#5378 PERFORMANCE SCHEMA SUMMARY BY USER / HOST Test cleanup modified: storage/perfschema/pfs_engine_table.cc storage/perfschema/unittest/pfs-t.cc storage/perfschema/unittest/pfs_instr-oom-t.cc storage/perfschema/unittest/pfs_instr-t.cc === modified file 'storage/perfschema/pfs_engine_table.cc' --- a/storage/perfschema/pfs_engine_table.cc 2011-05-07 00:40:25 +0000 +++ b/storage/perfschema/pfs_engine_table.cc 2011-05-09 10:58:29 +0000 @@ -142,7 +142,7 @@ void PFS_engine_table_share::check_all_t DBUG_EXECUTE_IF("tampered_perfschema_table1", { /* Hack SETUP_INSTRUMENT, incompatible change. */ - all_shares[24]->m_field_def->count++; + all_shares[19]->m_field_def->count++; }); for (current= &all_shares[0]; (*current) != NULL; current++) === modified file 'storage/perfschema/unittest/pfs-t.cc' --- a/storage/perfschema/unittest/pfs-t.cc 2011-03-17 17:39:31 +0000 +++ b/storage/perfschema/unittest/pfs-t.cc 2011-05-09 10:58:29 +0000 @@ -80,6 +80,7 @@ void test_bootstrap() diag("test_bootstrap"); + memset(& param, 0xFF, sizeof(param)); param.m_enabled= true; param.m_mutex_class_sizing= 0; param.m_rwlock_class_sizing= 0; @@ -98,6 +99,9 @@ void test_bootstrap() param.m_events_waits_history_long_sizing= 0; param.m_setup_actor_sizing= 0; param.m_setup_object_sizing= 0; + param.m_user_sizing= 0; + param.m_account_sizing= 0; + param.m_host_sizing= 0; param.m_stage_class_sizing= 0; param.m_events_stages_history_sizing= 0; param.m_events_stages_history_long_sizing= 0; @@ -130,6 +134,7 @@ PSI * load_perfschema() PSI_bootstrap *boot; PFS_global_param param; + memset(& param, 0xFF, sizeof(param)); param.m_enabled= true; param.m_mutex_class_sizing= 10; param.m_rwlock_class_sizing= 10; @@ -148,6 +153,9 @@ PSI * load_perfschema() param.m_events_waits_history_long_sizing= 10; param.m_setup_actor_sizing= 0; param.m_setup_object_sizing= 0; + param.m_user_sizing= 0; + param.m_account_sizing= 0; + param.m_host_sizing= 0; param.m_stage_class_sizing= 0; param.m_events_stages_history_sizing= 0; param.m_events_stages_history_long_sizing= 0; @@ -1276,6 +1284,7 @@ void test_event_name_index() diag("test_event_name_index"); + memset(& param, 0xFF, sizeof(param)); param.m_enabled= true; /* Per mutex info waits should be at [0..9] */ @@ -1290,6 +1299,9 @@ void test_event_name_index() param.m_table_share_sizing= 160; param.m_thread_class_sizing= 0; + param.m_user_sizing= 0; + param.m_account_sizing= 0; + param.m_host_sizing= 0; param.m_stage_class_sizing= 0; param.m_events_stages_history_sizing= 0; param.m_events_stages_history_long_sizing= 0; === modified file 'storage/perfschema/unittest/pfs_instr-oom-t.cc' --- a/storage/perfschema/unittest/pfs_instr-oom-t.cc 2011-03-17 17:39:31 +0000 +++ b/storage/perfschema/unittest/pfs_instr-oom-t.cc 2011-05-09 10:58:29 +0000 @@ -24,6 +24,8 @@ #include "stub_pfs_global.h" #include "stub_server_misc.h" +#include /* memset */ + void test_oom() { int rc; @@ -31,6 +33,7 @@ void test_oom() stub_alloc_always_fails= true; + memset(& param, 0xFF, sizeof(param)); param.m_enabled= true; param.m_mutex_class_sizing= 10; param.m_rwlock_class_sizing= 0; @@ -49,6 +52,9 @@ void test_oom() param.m_events_waits_history_long_sizing= 0; param.m_setup_actor_sizing= 0; param.m_setup_object_sizing= 0; + param.m_host_sizing= 0; + param.m_user_sizing= 0; + param.m_account_sizing= 0; param.m_stage_class_sizing= 0; param.m_events_stages_history_sizing= 0; param.m_events_stages_history_long_sizing= 0; @@ -78,6 +84,9 @@ void test_oom() param.m_events_waits_history_long_sizing= 0; param.m_setup_actor_sizing= 0; param.m_setup_object_sizing= 0; + param.m_host_sizing= 0; + param.m_user_sizing= 0; + param.m_account_sizing= 0; param.m_stage_class_sizing= 0; param.m_events_stages_history_sizing= 0; param.m_events_stages_history_long_sizing= 0; @@ -107,6 +116,9 @@ void test_oom() param.m_events_waits_history_long_sizing= 0; param.m_setup_actor_sizing= 0; param.m_setup_object_sizing= 0; + param.m_host_sizing= 0; + param.m_user_sizing= 0; + param.m_account_sizing= 0; param.m_stage_class_sizing= 0; param.m_events_stages_history_sizing= 0; param.m_events_stages_history_long_sizing= 0; @@ -136,6 +148,9 @@ void test_oom() param.m_events_waits_history_long_sizing= 0; param.m_setup_actor_sizing= 0; param.m_setup_object_sizing= 0; + param.m_host_sizing= 0; + param.m_user_sizing= 0; + param.m_account_sizing= 0; param.m_stage_class_sizing= 0; param.m_events_stages_history_sizing= 0; param.m_events_stages_history_long_sizing= 0; @@ -165,6 +180,9 @@ void test_oom() param.m_events_waits_history_long_sizing= 0; param.m_setup_actor_sizing= 0; param.m_setup_object_sizing= 0; + param.m_host_sizing= 0; + param.m_user_sizing= 0; + param.m_account_sizing= 0; param.m_stage_class_sizing= 0; param.m_events_stages_history_sizing= 0; param.m_events_stages_history_long_sizing= 0; @@ -194,6 +212,9 @@ void test_oom() param.m_events_waits_history_long_sizing= 0; param.m_setup_actor_sizing= 0; param.m_setup_object_sizing= 0; + param.m_host_sizing= 0; + param.m_user_sizing= 0; + param.m_account_sizing= 0; param.m_stage_class_sizing= 0; param.m_events_stages_history_sizing= 0; param.m_events_stages_history_long_sizing= 0; @@ -225,6 +246,9 @@ void test_oom() param.m_events_waits_history_long_sizing= 0; param.m_setup_actor_sizing= 0; param.m_setup_object_sizing= 0; + param.m_host_sizing= 0; + param.m_user_sizing= 0; + param.m_account_sizing= 0; param.m_stage_class_sizing= 0; param.m_events_stages_history_sizing= 0; param.m_events_stages_history_long_sizing= 0; @@ -255,6 +279,9 @@ void test_oom() param.m_events_waits_history_long_sizing= 0; param.m_setup_actor_sizing= 0; param.m_setup_object_sizing= 0; + param.m_host_sizing= 0; + param.m_user_sizing= 0; + param.m_account_sizing= 0; param.m_stage_class_sizing= 0; param.m_events_stages_history_sizing= 0; param.m_events_stages_history_long_sizing= 0; === modified file 'storage/perfschema/unittest/pfs_instr-t.cc' --- a/storage/perfschema/unittest/pfs_instr-t.cc 2011-03-17 17:39:31 +0000 +++ b/storage/perfschema/unittest/pfs_instr-t.cc 2011-05-09 10:58:29 +0000 @@ -30,6 +30,7 @@ void test_no_instruments() int rc; PFS_global_param param; + memset(& param, 0xFF, sizeof(param)); param.m_enabled= true; param.m_mutex_class_sizing= 0; param.m_rwlock_class_sizing= 0; @@ -48,6 +49,9 @@ void test_no_instruments() param.m_events_waits_history_long_sizing= 0; param.m_setup_actor_sizing= 0; param.m_setup_object_sizing= 0; + param.m_host_sizing= 0; + param.m_user_sizing= 0; + param.m_account_sizing= 0; param.m_stage_class_sizing= 0; param.m_events_stages_history_sizing= 0; param.m_events_stages_history_long_sizing= 0; @@ -79,6 +83,7 @@ void test_no_instances() PFS_table *table; PFS_global_param param; + memset(& param, 0xFF, sizeof(param)); param.m_enabled= true; param.m_mutex_class_sizing= 1; param.m_rwlock_class_sizing= 1; @@ -97,6 +102,9 @@ void test_no_instances() param.m_events_waits_history_long_sizing= 0; param.m_setup_actor_sizing= 0; param.m_setup_object_sizing= 0; + param.m_host_sizing= 0; + param.m_user_sizing= 0; + param.m_account_sizing= 0; param.m_stage_class_sizing= 0; param.m_events_stages_history_sizing= 0; param.m_events_stages_history_long_sizing= 0; @@ -201,6 +209,7 @@ void test_with_instances() PFS_table *table_2; PFS_global_param param; + memset(& param, 0xFF, sizeof(param)); param.m_enabled= true; param.m_mutex_class_sizing= 1; param.m_rwlock_class_sizing= 1; @@ -219,6 +228,9 @@ void test_with_instances() param.m_events_waits_history_long_sizing= 10000; param.m_setup_actor_sizing= 0; param.m_setup_object_sizing= 0; + param.m_host_sizing= 0; + param.m_user_sizing= 0; + param.m_account_sizing= 0; param.m_stage_class_sizing= 0; param.m_events_stages_history_sizing= 0; param.m_events_stages_history_long_sizing= 0; --===============4305591643834041608== 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-trunk-wl5378/ # testament_sha1: 9c7be8e1cc3476f994564bb8c8e05fb46505ddd7 # timestamp: 2011-05-09 12:58:45 +0200 # source_branch: file:///Users/malff/BZR_TREE/mysql-trunk/ # base_revision_id: marc.alff@stripped\ # s3xvmt91y61w6rdj # # Begin bundle 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 dCCA --===============4305591643834041608==--