3169 Christopher Powers 2010-09-10
WL#4896 PERFORMANCE_SCHEMA Network IO
Get PB green: Updated perfschema tests
modified:
mysql-test/r/mysqld--help-notwin.result
mysql-test/suite/perfschema/r/aggregate.result
mysql-test/suite/perfschema/r/innodb_table_io.result
mysql-test/suite/perfschema/r/memory_table_io.result
mysql-test/suite/perfschema/r/merge_table_io.result
mysql-test/suite/perfschema/r/multi_table_io.result
mysql-test/suite/perfschema/r/myisam_file_io.result
mysql-test/suite/perfschema/r/myisam_table_io.result
mysql-test/suite/perfschema/r/part_table_io.result
mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result
mysql-test/suite/perfschema/t/aggregate.test
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/r/mysqld--help-notwin.result'
--- a/mysql-test/r/mysqld--help-notwin.result 2010-09-01 13:06:14 +0000
+++ b/mysql-test/r/mysqld--help-notwin.result 2010-09-10 22:50:44 +0000
@@ -429,6 +429,10 @@ The following options may be given as th
Maximum number of rwlock instruments.
--performance-schema-max-rwlock-instances=#
Maximum number of instrumented RWLOCK objects.
+ --performance-schema-max-socket-classes=#
+ Maximum number of socket instruments.
+ --performance-schema-max-sockets=#
+ Maximum number of opened instrumented sockets.
--performance-schema-max-table-handles=#
Maximum number of opened instrumented tables.
--performance-schema-max-table-instances=#
@@ -860,6 +864,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/aggregate.result'
--- a/mysql-test/suite/perfschema/r/aggregate.result 2010-09-09 20:56:38 +0000
+++ b/mysql-test/suite/perfschema/r/aggregate.result 2010-09-10 22:50:44 +0000
@@ -59,12 +59,12 @@ EVENT_NAME SUM_TIMER_WAIT SUM(i.SUM_TIME
SELECT EVENT_NAME, e.MIN_TIMER_WAIT, MIN(i.MIN_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.MIN_TIMER_WAIT > MIN(i.MIN_TIMER_WAIT))
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)
=== modified file 'mysql-test/suite/perfschema/r/innodb_table_io.result'
--- a/mysql-test/suite/perfschema/r/innodb_table_io.result 2010-07-13 14:17:39 +0000
+++ b/mysql-test/suite/perfschema/r/innodb_table_io.result 2010-09-10 22:50:44 +0000
@@ -128,6 +128,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/memory_table_io.result'
--- a/mysql-test/suite/perfschema/r/memory_table_io.result 2010-07-13 14:17:39 +0000
+++ b/mysql-test/suite/perfschema/r/memory_table_io.result 2010-09-10 22:50:44 +0000
@@ -124,6 +124,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/merge_table_io.result'
--- a/mysql-test/suite/perfschema/r/merge_table_io.result 2010-07-13 14:17:39 +0000
+++ b/mysql-test/suite/perfschema/r/merge_table_io.result 2010-09-10 22:50:44 +0000
@@ -159,6 +159,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/multi_table_io.result'
--- a/mysql-test/suite/perfschema/r/multi_table_io.result 2010-07-13 14:17:39 +0000
+++ b/mysql-test/suite/perfschema/r/multi_table_io.result 2010-09-10 22:50:44 +0000
@@ -83,6 +83,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/myisam_file_io.result'
--- a/mysql-test/suite/perfschema/r/myisam_file_io.result 2010-07-23 17:08:41 +0000
+++ b/mysql-test/suite/perfschema/r/myisam_file_io.result 2010-09-10 22:50:44 +0000
@@ -53,6 +53,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/myisam_table_io.result'
--- a/mysql-test/suite/perfschema/r/myisam_table_io.result 2010-07-13 14:17:39 +0000
+++ b/mysql-test/suite/perfschema/r/myisam_table_io.result 2010-09-10 22:50:44 +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/part_table_io.result'
--- a/mysql-test/suite/perfschema/r/part_table_io.result 2010-07-13 14:17:39 +0000
+++ b/mysql-test/suite/perfschema/r/part_table_io.result 2010-09-10 22:50:44 +0000
@@ -154,6 +154,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/pfs_upgrade_lc0.result'
--- a/mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result 2010-08-12 15:25:01 +0000
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result 2010-09-10 22:50:44 +0000
@@ -18,14 +18,15 @@ ERROR 1050 (42S01) at line 171: Table 'E
ERROR 1050 (42S01) at line 180: Table 'FILE_INSTANCES' already exists
ERROR 1050 (42S01) at line 191: Table 'FILE_SUMMARY_BY_EVENT_NAME' already exists
ERROR 1050 (42S01) at line 203: Table 'FILE_SUMMARY_BY_INSTANCE' already exists
-ERROR 1050 (42S01) at line 212: Table 'MUTEX_INSTANCES' already exists
-ERROR 1050 (42S01) at line 222: Table 'PERFORMANCE_TIMERS' already exists
-ERROR 1050 (42S01) at line 232: Table 'RWLOCK_INSTANCES' already exists
-ERROR 1050 (42S01) at line 240: Table 'SETUP_CONSUMERS' already exists
-ERROR 1050 (42S01) at line 249: Table 'SETUP_INSTRUMENTS' already exists
-ERROR 1050 (42S01) at line 257: Table 'SETUP_TIMERS' already exists
-ERROR 1050 (42S01) at line 266: Table 'THREADS' already exists
-ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 217: Table 'SOCKET_INSTANCES' already exists
+ERROR 1050 (42S01) at line 226: Table 'MUTEX_INSTANCES' already exists
+ERROR 1050 (42S01) at line 236: Table 'PERFORMANCE_TIMERS' already exists
+ERROR 1050 (42S01) at line 246: Table 'RWLOCK_INSTANCES' already exists
+ERROR 1050 (42S01) at line 254: Table 'SETUP_CONSUMERS' already exists
+ERROR 1050 (42S01) at line 263: Table 'SETUP_INSTRUMENTS' already exists
+ERROR 1050 (42S01) at line 271: Table 'SETUP_TIMERS' already exists
+ERROR 1050 (42S01) at line 280: Table 'THREADS' already exists
+ERROR 1644 (HY000) at line 696: Unexpected content found in the performance_schema database.
FATAL ERROR: Upgrade failed
show tables like "user_table";
Tables_in_performance_schema (user_table)
@@ -48,14 +49,15 @@ ERROR 1050 (42S01) at line 171: Table 'E
ERROR 1050 (42S01) at line 180: Table 'FILE_INSTANCES' already exists
ERROR 1050 (42S01) at line 191: Table 'FILE_SUMMARY_BY_EVENT_NAME' already exists
ERROR 1050 (42S01) at line 203: Table 'FILE_SUMMARY_BY_INSTANCE' already exists
-ERROR 1050 (42S01) at line 212: Table 'MUTEX_INSTANCES' already exists
-ERROR 1050 (42S01) at line 222: Table 'PERFORMANCE_TIMERS' already exists
-ERROR 1050 (42S01) at line 232: Table 'RWLOCK_INSTANCES' already exists
-ERROR 1050 (42S01) at line 240: Table 'SETUP_CONSUMERS' already exists
-ERROR 1050 (42S01) at line 249: Table 'SETUP_INSTRUMENTS' already exists
-ERROR 1050 (42S01) at line 257: Table 'SETUP_TIMERS' already exists
-ERROR 1050 (42S01) at line 266: Table 'THREADS' already exists
-ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 217: Table 'SOCKET_INSTANCES' already exists
+ERROR 1050 (42S01) at line 226: Table 'MUTEX_INSTANCES' already exists
+ERROR 1050 (42S01) at line 236: Table 'PERFORMANCE_TIMERS' already exists
+ERROR 1050 (42S01) at line 246: Table 'RWLOCK_INSTANCES' already exists
+ERROR 1050 (42S01) at line 254: Table 'SETUP_CONSUMERS' already exists
+ERROR 1050 (42S01) at line 263: Table 'SETUP_INSTRUMENTS' already exists
+ERROR 1050 (42S01) at line 271: Table 'SETUP_TIMERS' already exists
+ERROR 1050 (42S01) at line 280: Table 'THREADS' already exists
+ERROR 1644 (HY000) at line 696: Unexpected content found in the performance_schema database.
FATAL ERROR: Upgrade failed
show tables like "user_view";
Tables_in_performance_schema (user_view)
@@ -76,14 +78,15 @@ ERROR 1050 (42S01) at line 171: Table 'E
ERROR 1050 (42S01) at line 180: Table 'FILE_INSTANCES' already exists
ERROR 1050 (42S01) at line 191: Table 'FILE_SUMMARY_BY_EVENT_NAME' already exists
ERROR 1050 (42S01) at line 203: Table 'FILE_SUMMARY_BY_INSTANCE' already exists
-ERROR 1050 (42S01) at line 212: Table 'MUTEX_INSTANCES' already exists
-ERROR 1050 (42S01) at line 222: Table 'PERFORMANCE_TIMERS' already exists
-ERROR 1050 (42S01) at line 232: Table 'RWLOCK_INSTANCES' already exists
-ERROR 1050 (42S01) at line 240: Table 'SETUP_CONSUMERS' already exists
-ERROR 1050 (42S01) at line 249: Table 'SETUP_INSTRUMENTS' already exists
-ERROR 1050 (42S01) at line 257: Table 'SETUP_TIMERS' already exists
-ERROR 1050 (42S01) at line 266: Table 'THREADS' already exists
-ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 217: Table 'SOCKET_INSTANCES' already exists
+ERROR 1050 (42S01) at line 226: Table 'MUTEX_INSTANCES' already exists
+ERROR 1050 (42S01) at line 236: Table 'PERFORMANCE_TIMERS' already exists
+ERROR 1050 (42S01) at line 246: Table 'RWLOCK_INSTANCES' already exists
+ERROR 1050 (42S01) at line 254: Table 'SETUP_CONSUMERS' already exists
+ERROR 1050 (42S01) at line 263: Table 'SETUP_INSTRUMENTS' already exists
+ERROR 1050 (42S01) at line 271: Table 'SETUP_TIMERS' already exists
+ERROR 1050 (42S01) at line 280: Table 'THREADS' already exists
+ERROR 1644 (HY000) at line 696: Unexpected content found in the performance_schema database.
FATAL ERROR: Upgrade failed
select name from mysql.proc where db='performance_schema';
name
@@ -104,14 +107,15 @@ ERROR 1050 (42S01) at line 171: Table 'E
ERROR 1050 (42S01) at line 180: Table 'FILE_INSTANCES' already exists
ERROR 1050 (42S01) at line 191: Table 'FILE_SUMMARY_BY_EVENT_NAME' already exists
ERROR 1050 (42S01) at line 203: Table 'FILE_SUMMARY_BY_INSTANCE' already exists
-ERROR 1050 (42S01) at line 212: Table 'MUTEX_INSTANCES' already exists
-ERROR 1050 (42S01) at line 222: Table 'PERFORMANCE_TIMERS' already exists
-ERROR 1050 (42S01) at line 232: Table 'RWLOCK_INSTANCES' already exists
-ERROR 1050 (42S01) at line 240: Table 'SETUP_CONSUMERS' already exists
-ERROR 1050 (42S01) at line 249: Table 'SETUP_INSTRUMENTS' already exists
-ERROR 1050 (42S01) at line 257: Table 'SETUP_TIMERS' already exists
-ERROR 1050 (42S01) at line 266: Table 'THREADS' already exists
-ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 217: Table 'SOCKET_INSTANCES' already exists
+ERROR 1050 (42S01) at line 226: Table 'MUTEX_INSTANCES' already exists
+ERROR 1050 (42S01) at line 236: Table 'PERFORMANCE_TIMERS' already exists
+ERROR 1050 (42S01) at line 246: Table 'RWLOCK_INSTANCES' already exists
+ERROR 1050 (42S01) at line 254: Table 'SETUP_CONSUMERS' already exists
+ERROR 1050 (42S01) at line 263: Table 'SETUP_INSTRUMENTS' already exists
+ERROR 1050 (42S01) at line 271: Table 'SETUP_TIMERS' already exists
+ERROR 1050 (42S01) at line 280: Table 'THREADS' already exists
+ERROR 1644 (HY000) at line 696: Unexpected content found in the performance_schema database.
FATAL ERROR: Upgrade failed
select name from mysql.proc where db='performance_schema';
name
@@ -132,14 +136,15 @@ ERROR 1050 (42S01) at line 171: Table 'E
ERROR 1050 (42S01) at line 180: Table 'FILE_INSTANCES' already exists
ERROR 1050 (42S01) at line 191: Table 'FILE_SUMMARY_BY_EVENT_NAME' already exists
ERROR 1050 (42S01) at line 203: Table 'FILE_SUMMARY_BY_INSTANCE' already exists
-ERROR 1050 (42S01) at line 212: Table 'MUTEX_INSTANCES' already exists
-ERROR 1050 (42S01) at line 222: Table 'PERFORMANCE_TIMERS' already exists
-ERROR 1050 (42S01) at line 232: Table 'RWLOCK_INSTANCES' already exists
-ERROR 1050 (42S01) at line 240: Table 'SETUP_CONSUMERS' already exists
-ERROR 1050 (42S01) at line 249: Table 'SETUP_INSTRUMENTS' already exists
-ERROR 1050 (42S01) at line 257: Table 'SETUP_TIMERS' already exists
-ERROR 1050 (42S01) at line 266: Table 'THREADS' already exists
-ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 217: Table 'SOCKET_INSTANCES' already exists
+ERROR 1050 (42S01) at line 226: Table 'MUTEX_INSTANCES' already exists
+ERROR 1050 (42S01) at line 236: Table 'PERFORMANCE_TIMERS' already exists
+ERROR 1050 (42S01) at line 246: Table 'RWLOCK_INSTANCES' already exists
+ERROR 1050 (42S01) at line 254: Table 'SETUP_CONSUMERS' already exists
+ERROR 1050 (42S01) at line 263: Table 'SETUP_INSTRUMENTS' already exists
+ERROR 1050 (42S01) at line 271: Table 'SETUP_TIMERS' already exists
+ERROR 1050 (42S01) at line 280: Table 'THREADS' already exists
+ERROR 1644 (HY000) at line 696: Unexpected content found in the performance_schema database.
FATAL ERROR: Upgrade failed
select name from mysql.event where db='performance_schema';
name
=== modified file 'mysql-test/suite/perfschema/t/aggregate.test'
--- a/mysql-test/suite/perfschema/t/aggregate.test 2010-09-09 20:56:38 +0000
+++ b/mysql-test/suite/perfschema/t/aggregate.test 2010-09-10 22:50:44 +0000
@@ -141,6 +141,7 @@ OR @dump_all;
SELECT EVENT_NAME, e.MIN_TIMER_WAIT, MIN(i.MIN_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.MIN_TIMER_WAIT > MIN(i.MIN_TIMER_WAIT))
AND (MIN(i.MIN_TIMER_WAIT) != 0)
Attachment: [text/bzr-bundle] bzr/chris.powers@oracle.com-20100910225044-bij3o2mwhvt8ws4o.bundle
| Thread |
|---|
| • bzr push into mysql-next-mr-wl4896 branch (chris.powers:3168 to 3169) WL#4896 | Christopher Powers | 11 Sep |
