#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;
Attachment: [text/bzr-bundle] bzr/chris.powers@oracle.com-20100909205638-zpzu0ijqyf9blbgy.bundle
| Thread |
|---|
| • bzr commit into mysql-next-mr-wl4896 branch (chris.powers:3168) WL#4896 | Christopher Powers | 9 Sep |
