From: Christopher Powers Date: September 9 2010 8:56pm Subject: bzr commit into mysql-next-mr-wl4896 branch (chris.powers:3168) WL#4896 List-Archive: http://lists.mysql.com/commits/117938 Message-Id: <20100909205645.50DC31DB0318@xeno.mysql.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6939481265740378117==" --===============6939481265740378117== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/cpowers/work/dev/mysql-next-mr-wl4896/ based on revid:chris.powers@stripped 3168 Christopher Powers 2010-09-09 WL#4896 "PEFORMANCE_SCHEMA Net IO" Getting PB green: Updated MTR tests to accommodate socket stats. @ mysql-test/suite/perfschema/t/aggregate.test Ignore socket instances for this test. modified: mysql-test/suite/perfschema/r/aggregate.result mysql-test/suite/perfschema/r/csv_table_io.result mysql-test/suite/perfschema/r/indexed_table_io.result mysql-test/suite/perfschema/r/information_schema.result mysql-test/suite/perfschema/r/start_server_no_cond_class.result mysql-test/suite/perfschema/r/start_server_no_cond_inst.result mysql-test/suite/perfschema/r/start_server_no_file_class.result mysql-test/suite/perfschema/r/start_server_no_file_inst.result mysql-test/suite/perfschema/r/start_server_no_mutex_class.result mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result mysql-test/suite/perfschema/r/start_server_no_table_hdl.result mysql-test/suite/perfschema/r/start_server_no_table_inst.result mysql-test/suite/perfschema/r/start_server_no_thread_class.result mysql-test/suite/perfschema/r/start_server_no_thread_inst.result mysql-test/suite/perfschema/r/start_server_nothing.result mysql-test/suite/perfschema/r/start_server_off.result mysql-test/suite/perfschema/r/start_server_on.result mysql-test/suite/perfschema/t/aggregate.test === modified file 'mysql-test/suite/perfschema/r/aggregate.result' --- a/mysql-test/suite/perfschema/r/aggregate.result 2010-08-12 14:08:52 +0000 +++ b/mysql-test/suite/perfschema/r/aggregate.result 2010-09-09 20:56:38 +0000 @@ -51,6 +51,7 @@ EVENT_NAME SUM_NUMBER_OF_BYTES_WRITE SUM SELECT EVENT_NAME, e.SUM_TIMER_WAIT, SUM(i.SUM_TIMER_WAIT) FROM performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME AS e JOIN performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE AS i USING (EVENT_NAME) +WHERE EVENT_NAME NOT LIKE '%io/socket%' GROUP BY EVENT_NAME HAVING (e.SUM_TIMER_WAIT < SUM(i.SUM_TIMER_WAIT)) OR @dump_all; @@ -63,9 +64,11 @@ HAVING (e.MIN_TIMER_WAIT > MIN(i.MIN_TIM AND (MIN(i.MIN_TIMER_WAIT) != 0) OR @dump_all; EVENT_NAME MIN_TIMER_WAIT MIN(i.MIN_TIMER_WAIT) +wait/io/socket/sql/handle_connection 1916096 1904064 SELECT EVENT_NAME, e.MAX_TIMER_WAIT, MAX(i.MAX_TIMER_WAIT) FROM performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME AS e JOIN performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE AS i USING (EVENT_NAME) +WHERE EVENT_NAME NOT LIKE '%io/socket%' GROUP BY EVENT_NAME HAVING (e.MAX_TIMER_WAIT < MAX(i.MAX_TIMER_WAIT)) OR @dump_all; @@ -75,6 +78,7 @@ SELECT EVENT_NAME, e.SUM_TIMER_WAIT, SUM FROM performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME AS e JOIN performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME AS t USING (EVENT_NAME) +WHERE EVENT_NAME NOT LIKE '%io/socket%' GROUP BY EVENT_NAME HAVING (e.SUM_TIMER_WAIT < SUM(t.SUM_TIMER_WAIT)) OR @dump_all; @@ -83,6 +87,7 @@ SELECT EVENT_NAME, e.MIN_TIMER_WAIT, MIN FROM performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME AS e JOIN performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME AS t USING (EVENT_NAME) +WHERE EVENT_NAME NOT LIKE '%io/socket%' GROUP BY EVENT_NAME HAVING (e.MIN_TIMER_WAIT > MIN(t.MIN_TIMER_WAIT)) AND (MIN(t.MIN_TIMER_WAIT) != 0) @@ -92,6 +97,7 @@ SELECT EVENT_NAME, e.MAX_TIMER_WAIT, MAX FROM performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME AS e JOIN performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME AS t USING (EVENT_NAME) +WHERE EVENT_NAME NOT LIKE '%io/socket%' GROUP BY EVENT_NAME HAVING (e.MAX_TIMER_WAIT < MAX(t.MAX_TIMER_WAIT)) OR @dump_all; === modified file 'mysql-test/suite/perfschema/r/csv_table_io.result' --- a/mysql-test/suite/perfschema/r/csv_table_io.result 2010-07-13 14:17:39 +0000 +++ b/mysql-test/suite/perfschema/r/csv_table_io.result 2010-09-09 20:56:38 +0000 @@ -122,6 +122,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_socket_instances_lost 0 Performance_schema_table_handles_lost 0 Performance_schema_table_instances_lost 0 Performance_schema_thread_classes_lost 0 === modified file 'mysql-test/suite/perfschema/r/indexed_table_io.result' --- a/mysql-test/suite/perfschema/r/indexed_table_io.result 2010-07-13 14:17:39 +0000 +++ b/mysql-test/suite/perfschema/r/indexed_table_io.result 2010-09-09 20:56:38 +0000 @@ -135,6 +135,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_socket_instances_lost 0 Performance_schema_table_handles_lost 0 Performance_schema_table_instances_lost 0 Performance_schema_thread_classes_lost 0 === modified file 'mysql-test/suite/perfschema/r/information_schema.result' --- a/mysql-test/suite/perfschema/r/information_schema.result 2010-08-12 14:08:52 +0000 +++ b/mysql-test/suite/perfschema/r/information_schema.result 2010-09-09 20:56:38 +0000 @@ -18,6 +18,7 @@ performance_schema RWLOCK_INSTANCES def performance_schema SETUP_CONSUMERS def performance_schema SETUP_INSTRUMENTS def performance_schema SETUP_TIMERS def +performance_schema SOCKET_INSTANCES def performance_schema THREADS def select upper(TABLE_NAME), TABLE_TYPE, ENGINE from information_schema.tables @@ -39,6 +40,7 @@ RWLOCK_INSTANCES BASE TABLE PERFORMANCE_ SETUP_CONSUMERS BASE TABLE PERFORMANCE_SCHEMA SETUP_INSTRUMENTS BASE TABLE PERFORMANCE_SCHEMA SETUP_TIMERS BASE TABLE PERFORMANCE_SCHEMA +SOCKET_INSTANCES BASE TABLE PERFORMANCE_SCHEMA THREADS BASE TABLE PERFORMANCE_SCHEMA select upper(TABLE_NAME), VERSION, ROW_FORMAT from information_schema.tables @@ -60,6 +62,7 @@ RWLOCK_INSTANCES 10 Dynamic SETUP_CONSUMERS 10 Dynamic SETUP_INSTRUMENTS 10 Dynamic SETUP_TIMERS 10 Dynamic +SOCKET_INSTANCES 10 Dynamic THREADS 10 Dynamic select upper(TABLE_NAME), TABLE_ROWS, AVG_ROW_LENGTH from information_schema.tables @@ -81,6 +84,7 @@ RWLOCK_INSTANCES 1000 0 SETUP_CONSUMERS 8 0 SETUP_INSTRUMENTS 1000 0 SETUP_TIMERS 1 0 +SOCKET_INSTANCES 1000 0 THREADS 1000 0 select upper(TABLE_NAME), DATA_LENGTH, MAX_DATA_LENGTH from information_schema.tables @@ -102,6 +106,7 @@ RWLOCK_INSTANCES 0 0 SETUP_CONSUMERS 0 0 SETUP_INSTRUMENTS 0 0 SETUP_TIMERS 0 0 +SOCKET_INSTANCES 0 0 THREADS 0 0 select upper(TABLE_NAME), INDEX_LENGTH, DATA_FREE, AUTO_INCREMENT from information_schema.tables @@ -123,6 +128,7 @@ RWLOCK_INSTANCES 0 0 NULL SETUP_CONSUMERS 0 0 NULL SETUP_INSTRUMENTS 0 0 NULL SETUP_TIMERS 0 0 NULL +SOCKET_INSTANCES 0 0 NULL THREADS 0 0 NULL select upper(TABLE_NAME), CREATE_TIME, UPDATE_TIME, CHECK_TIME from information_schema.tables @@ -144,6 +150,7 @@ RWLOCK_INSTANCES NULL NULL NULL SETUP_CONSUMERS NULL NULL NULL SETUP_INSTRUMENTS NULL NULL NULL SETUP_TIMERS NULL NULL NULL +SOCKET_INSTANCES NULL NULL NULL THREADS NULL NULL NULL select upper(TABLE_NAME), TABLE_COLLATION, CHECKSUM from information_schema.tables @@ -165,6 +172,7 @@ RWLOCK_INSTANCES utf8_general_ci NULL SETUP_CONSUMERS utf8_general_ci NULL SETUP_INSTRUMENTS utf8_general_ci NULL SETUP_TIMERS utf8_general_ci NULL +SOCKET_INSTANCES utf8_general_ci NULL THREADS utf8_general_ci NULL select upper(TABLE_NAME), TABLE_COMMENT from information_schema.tables @@ -186,4 +194,5 @@ RWLOCK_INSTANCES SETUP_CONSUMERS SETUP_INSTRUMENTS SETUP_TIMERS +SOCKET_INSTANCES THREADS === modified file 'mysql-test/suite/perfschema/r/start_server_no_cond_class.result' --- a/mysql-test/suite/perfschema/r/start_server_no_cond_class.result 2010-09-09 18:08:04 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_no_cond_class.result 2010-09-09 20:56:38 +0000 @@ -48,6 +48,8 @@ performance_schema_max_mutex_classes 200 performance_schema_max_mutex_instances 1000000 performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_instances 1000000 +performance_schema_max_socket_classes 50 +performance_schema_max_sockets 10000 performance_schema_max_table_handles 10000 performance_schema_max_table_instances 1000 performance_schema_max_thread_classes 50 === modified file 'mysql-test/suite/perfschema/r/start_server_no_cond_inst.result' --- a/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result 2010-09-09 18:08:04 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result 2010-09-09 20:56:38 +0000 @@ -48,6 +48,8 @@ performance_schema_max_mutex_classes 200 performance_schema_max_mutex_instances 1000000 performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_instances 1000000 +performance_schema_max_socket_classes 50 +performance_schema_max_sockets 10000 performance_schema_max_table_handles 10000 performance_schema_max_table_instances 1000 performance_schema_max_thread_classes 50 === modified file 'mysql-test/suite/perfschema/r/start_server_no_file_class.result' --- a/mysql-test/suite/perfschema/r/start_server_no_file_class.result 2010-09-09 18:08:04 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_no_file_class.result 2010-09-09 20:56:38 +0000 @@ -48,6 +48,8 @@ performance_schema_max_mutex_classes 200 performance_schema_max_mutex_instances 1000000 performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_instances 1000000 +performance_schema_max_socket_classes 50 +performance_schema_max_sockets 10000 performance_schema_max_table_handles 10000 performance_schema_max_table_instances 1000 performance_schema_max_thread_classes 50 === modified file 'mysql-test/suite/perfschema/r/start_server_no_file_inst.result' --- a/mysql-test/suite/perfschema/r/start_server_no_file_inst.result 2010-09-09 18:08:04 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_no_file_inst.result 2010-09-09 20:56:38 +0000 @@ -48,6 +48,8 @@ performance_schema_max_mutex_classes 200 performance_schema_max_mutex_instances 1000000 performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_instances 1000000 +performance_schema_max_socket_classes 50 +performance_schema_max_sockets 10000 performance_schema_max_table_handles 10000 performance_schema_max_table_instances 1000 performance_schema_max_thread_classes 50 === modified file 'mysql-test/suite/perfschema/r/start_server_no_mutex_class.result' --- a/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result 2010-09-09 18:08:04 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result 2010-09-09 20:56:38 +0000 @@ -48,6 +48,8 @@ performance_schema_max_mutex_classes 0 performance_schema_max_mutex_instances 1000000 performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_instances 1000000 +performance_schema_max_socket_classes 50 +performance_schema_max_sockets 10000 performance_schema_max_table_handles 10000 performance_schema_max_table_instances 1000 performance_schema_max_thread_classes 50 === modified file 'mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result' --- a/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result 2010-09-09 18:08:04 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result 2010-09-09 20:56:38 +0000 @@ -48,6 +48,8 @@ performance_schema_max_mutex_classes 200 performance_schema_max_mutex_instances 0 performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_instances 1000000 +performance_schema_max_socket_classes 50 +performance_schema_max_sockets 10000 performance_schema_max_table_handles 10000 performance_schema_max_table_instances 1000 performance_schema_max_thread_classes 50 === modified file 'mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result' --- a/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result 2010-09-09 18:08:04 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result 2010-09-09 20:56:38 +0000 @@ -48,6 +48,8 @@ performance_schema_max_mutex_classes 200 performance_schema_max_mutex_instances 1000000 performance_schema_max_rwlock_classes 0 performance_schema_max_rwlock_instances 1000000 +performance_schema_max_socket_classes 50 +performance_schema_max_sockets 10000 performance_schema_max_table_handles 10000 performance_schema_max_table_instances 1000 performance_schema_max_thread_classes 50 === modified file 'mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result' --- a/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result 2010-09-09 18:08:04 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result 2010-09-09 20:56:38 +0000 @@ -48,6 +48,8 @@ performance_schema_max_mutex_classes 200 performance_schema_max_mutex_instances 1000000 performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_instances 0 +performance_schema_max_socket_classes 50 +performance_schema_max_sockets 10000 performance_schema_max_table_handles 10000 performance_schema_max_table_instances 1000 performance_schema_max_thread_classes 50 === modified file 'mysql-test/suite/perfschema/r/start_server_no_table_hdl.result' --- a/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result 2010-09-09 18:08:04 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result 2010-09-09 20:56:38 +0000 @@ -48,6 +48,8 @@ performance_schema_max_mutex_classes 200 performance_schema_max_mutex_instances 1000000 performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_instances 1000000 +performance_schema_max_socket_classes 50 +performance_schema_max_sockets 10000 performance_schema_max_table_handles 0 performance_schema_max_table_instances 1000 performance_schema_max_thread_classes 50 === modified file 'mysql-test/suite/perfschema/r/start_server_no_table_inst.result' --- a/mysql-test/suite/perfschema/r/start_server_no_table_inst.result 2010-09-09 18:08:04 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_no_table_inst.result 2010-09-09 20:56:38 +0000 @@ -48,6 +48,8 @@ performance_schema_max_mutex_classes 200 performance_schema_max_mutex_instances 1000000 performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_instances 1000000 +performance_schema_max_socket_classes 50 +performance_schema_max_sockets 10000 performance_schema_max_table_handles 10000 performance_schema_max_table_instances 0 performance_schema_max_thread_classes 50 === modified file 'mysql-test/suite/perfschema/r/start_server_no_thread_class.result' --- a/mysql-test/suite/perfschema/r/start_server_no_thread_class.result 2010-09-09 18:08:04 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_no_thread_class.result 2010-09-09 20:56:38 +0000 @@ -48,6 +48,8 @@ performance_schema_max_mutex_classes 200 performance_schema_max_mutex_instances 1000000 performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_instances 1000000 +performance_schema_max_socket_classes 50 +performance_schema_max_sockets 10000 performance_schema_max_table_handles 10000 performance_schema_max_table_instances 1000 performance_schema_max_thread_classes 0 === modified file 'mysql-test/suite/perfschema/r/start_server_no_thread_inst.result' --- a/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result 2010-09-09 18:08:04 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result 2010-09-09 20:56:38 +0000 @@ -48,6 +48,8 @@ performance_schema_max_mutex_classes 200 performance_schema_max_mutex_instances 1000000 performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_instances 1000000 +performance_schema_max_socket_classes 50 +performance_schema_max_sockets 10000 performance_schema_max_table_handles 10000 performance_schema_max_table_instances 1000 performance_schema_max_thread_classes 50 === modified file 'mysql-test/suite/perfschema/r/start_server_nothing.result' --- a/mysql-test/suite/perfschema/r/start_server_nothing.result 2010-09-09 18:08:04 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_nothing.result 2010-09-09 20:56:38 +0000 @@ -13,7 +13,7 @@ count(*) 8 select count(*) > 1 from performance_schema.SETUP_INSTRUMENTS; count(*) > 1 -0 +1 select count(*) from performance_schema.SETUP_TIMERS; count(*) 1 @@ -48,6 +48,8 @@ performance_schema_max_mutex_classes 0 performance_schema_max_mutex_instances 0 performance_schema_max_rwlock_classes 0 performance_schema_max_rwlock_instances 0 +performance_schema_max_socket_classes 50 +performance_schema_max_sockets 10000 performance_schema_max_table_handles 0 performance_schema_max_table_instances 0 performance_schema_max_thread_classes 0 @@ -68,6 +70,8 @@ performance_schema_max_mutex_classes 0 performance_schema_max_mutex_instances 0 performance_schema_max_rwlock_classes 0 performance_schema_max_rwlock_instances 0 +performance_schema_max_socket_classes 50 +performance_schema_max_sockets 10000 performance_schema_max_table_handles 0 performance_schema_max_table_instances 0 performance_schema_max_thread_classes 0 @@ -75,6 +79,8 @@ performance_schema_max_thread_instances select * from performance_schema.SETUP_INSTRUMENTS; NAME ENABLED TIMED wait/io/table/sql/handler YES YES +wait/io/socket/sql/network_init YES YES +wait/io/socket/sql/handle_connection YES YES select TIMER_NAME from performance_schema.PERFORMANCE_TIMERS; TIMER_NAME CYCLE @@ -109,6 +115,8 @@ select * from performance_schema.EVENTS_ THREAD_ID EVENT_NAME COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT select * from performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME; EVENT_NAME COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT +wait/io/socket/sql/network_init 0 0 0 0 0 +wait/io/socket/sql/handle_connection 0 0 0 0 0 select * from performance_schema.FILE_INSTANCES; FILE_NAME EVENT_NAME OPEN_COUNT select * from performance_schema.FILE_SUMMARY_BY_EVENT_NAME; === modified file 'mysql-test/suite/perfschema/r/start_server_off.result' --- a/mysql-test/suite/perfschema/r/start_server_off.result 2010-09-09 18:08:04 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_off.result 2010-09-09 20:56:38 +0000 @@ -48,6 +48,8 @@ performance_schema_max_mutex_classes 200 performance_schema_max_mutex_instances 1000000 performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_instances 1000000 +performance_schema_max_socket_classes 50 +performance_schema_max_sockets 10000 performance_schema_max_table_handles 10000 performance_schema_max_table_instances 1000 performance_schema_max_thread_classes 50 @@ -66,6 +68,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_socket_instances_lost 0 Performance_schema_table_handles_lost 0 Performance_schema_table_instances_lost 0 Performance_schema_thread_classes_lost 0 === modified file 'mysql-test/suite/perfschema/r/start_server_on.result' --- a/mysql-test/suite/perfschema/r/start_server_on.result 2010-09-09 18:08:04 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_on.result 2010-09-09 20:56:38 +0000 @@ -48,6 +48,8 @@ performance_schema_max_mutex_classes 200 performance_schema_max_mutex_instances 1000000 performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_instances 1000000 +performance_schema_max_socket_classes 50 +performance_schema_max_sockets 10000 performance_schema_max_table_handles 10000 performance_schema_max_table_instances 1000 performance_schema_max_thread_classes 50 @@ -66,6 +68,7 @@ Performance_schema_mutex_classes_lost 0 Performance_schema_mutex_instances_lost 0 Performance_schema_rwlock_classes_lost 0 Performance_schema_rwlock_instances_lost 0 +Performance_schema_socket_instances_lost 0 Performance_schema_table_handles_lost 0 Performance_schema_table_instances_lost 0 Performance_schema_thread_classes_lost 0 === modified file 'mysql-test/suite/perfschema/t/aggregate.test' --- a/mysql-test/suite/perfschema/t/aggregate.test 2010-08-12 15:25:01 +0000 +++ b/mysql-test/suite/perfschema/t/aggregate.test 2010-09-09 20:56:38 +0000 @@ -133,6 +133,7 @@ OR @dump_all; SELECT EVENT_NAME, e.SUM_TIMER_WAIT, SUM(i.SUM_TIMER_WAIT) FROM performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME AS e JOIN performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE AS i USING (EVENT_NAME) +WHERE EVENT_NAME NOT LIKE '%io/socket%' GROUP BY EVENT_NAME HAVING (e.SUM_TIMER_WAIT < SUM(i.SUM_TIMER_WAIT)) OR @dump_all; @@ -148,6 +149,7 @@ OR @dump_all; SELECT EVENT_NAME, e.MAX_TIMER_WAIT, MAX(i.MAX_TIMER_WAIT) FROM performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME AS e JOIN performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE AS i USING (EVENT_NAME) +WHERE EVENT_NAME NOT LIKE '%io/socket%' GROUP BY EVENT_NAME HAVING (e.MAX_TIMER_WAIT < MAX(i.MAX_TIMER_WAIT)) OR @dump_all; @@ -158,6 +160,7 @@ SELECT EVENT_NAME, e.SUM_TIMER_WAIT, SUM FROM performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME AS e JOIN performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME AS t USING (EVENT_NAME) +WHERE EVENT_NAME NOT LIKE '%io/socket%' GROUP BY EVENT_NAME HAVING (e.SUM_TIMER_WAIT < SUM(t.SUM_TIMER_WAIT)) OR @dump_all; @@ -166,6 +169,7 @@ SELECT EVENT_NAME, e.MIN_TIMER_WAIT, MIN FROM performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME AS e JOIN performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME AS t USING (EVENT_NAME) +WHERE EVENT_NAME NOT LIKE '%io/socket%' GROUP BY EVENT_NAME HAVING (e.MIN_TIMER_WAIT > MIN(t.MIN_TIMER_WAIT)) AND (MIN(t.MIN_TIMER_WAIT) != 0) @@ -175,6 +179,7 @@ SELECT EVENT_NAME, e.MAX_TIMER_WAIT, MAX FROM performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME AS e JOIN performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME AS t USING (EVENT_NAME) +WHERE EVENT_NAME NOT LIKE '%io/socket%' GROUP BY EVENT_NAME HAVING (e.MAX_TIMER_WAIT < MAX(t.MAX_TIMER_WAIT)) OR @dump_all; --===============6939481265740378117== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/chris.powers@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: chris.powers@stripped # target_branch: file:///home/cpowers/work/dev/mysql-next-mr-wl4896/ # testament_sha1: fe3911932119c401534c56c2c15a507ffb5463d3 # timestamp: 2010-09-09 15:56:44 -0500 # base_revision_id: chris.powers@stripped\ # ov4aqqvveo52vtf7 # # Begin bundle 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 3MA= --===============6939481265740378117==--