bzr commit into mysql-trunk branch (chris.powers:3238) WL#4896

[Christopher Powers]

#At file:///home/cpowers/work/dev/mysql-trunk-wl4896/ based on revid:cpowers@tma-1-20110225235335-h4fo3ni5p3w4rfwj

 3238 Christopher Powers	2011-02-26
      WL#4896 "Performance Schema Net IO"
      
      - Update perfschema regression tests

    modified:
      mysql-test/suite/perfschema/include/start_server_common.inc
      mysql-test/suite/perfschema/r/schema_lc0.result
      mysql-test/suite/perfschema/r/start_server_nothing.result
      mysql-test/suite/perfschema/t/start_server_nothing.test
=== modified file 'mysql-test/suite/perfschema/include/start_server_common.inc'
--- a/mysql-test/suite/perfschema/include/start_server_common.inc	2010-12-09 16:17:13 +0000
+++ b/mysql-test/suite/perfschema/include/start_server_common.inc	2011-02-27 01:14:36 +0000
@@ -37,6 +37,9 @@ select * from performance_schema.events_
 select * from performance_schema.file_instances;
 select * from performance_schema.file_summary_by_event_name;
 select * from performance_schema.file_summary_by_instance;
+select * from performance_schema.socket_instances;
+select * from performance_schema.socket_summary_by_instance;
+select * from performance_schema.socket_summary_by_event_name;
 select * from performance_schema.mutex_instances;
 select * from performance_schema.objects_summary_global_by_type;
 select * from performance_schema.performance_timers;

=== modified file 'mysql-test/suite/perfschema/r/schema_lc0.result'
--- a/mysql-test/suite/perfschema/r/schema_lc0.result	2010-12-09 16:17:13 +0000
+++ b/mysql-test/suite/perfschema/r/schema_lc0.result	2011-02-27 01:14:36 +0000
@@ -26,6 +26,9 @@ setup_consumers
 setup_instruments
 setup_objects
 setup_timers
+socket_instances
+socket_summary_by_event_name
+socket_summary_by_instance
 table_io_waits_summary_by_index_usage
 table_io_waits_summary_by_table
 table_lock_waits_summary_by_table

=== modified file 'mysql-test/suite/perfschema/r/start_server_nothing.result'
--- a/mysql-test/suite/perfschema/r/start_server_nothing.result	2011-02-25 23:53:35 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_nothing.result	2011-02-27 01:14:36 +0000
@@ -27,6 +27,9 @@ select * from performance_schema.events_
 select * from performance_schema.file_instances;
 select * from performance_schema.file_summary_by_event_name;
 select * from performance_schema.file_summary_by_instance;
+select * from performance_schema.socket_instances;
+select * from performance_schema.socket_summary_by_instance;
+select * from performance_schema.socket_summary_by_event_name;
 select * from performance_schema.mutex_instances;
 select * from performance_schema.objects_summary_global_by_type;
 select * from performance_schema.performance_timers;
@@ -119,9 +122,10 @@ select * from performance_schema.events_
 THREAD_ID	EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	SPINS	OBJECT_SCHEMA	OBJECT_NAME	INDEX_NAME	OBJECT_TYPE	OBJECT_INSTANCE_BEGIN	NESTING_EVENT_ID	OPERATION	NUMBER_OF_BYTES	FLAGS
 select * from performance_schema.events_waits_summary_by_instance;
 EVENT_NAME	OBJECT_INSTANCE_BEGIN	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	MAX_TIMER_WAIT
-wait/io/socket/sql/network_init	26477328	0	0	0	0	0
-wait/io/socket/sql/handle_connection	26478048	0	0	0	0	0
-wait/io/socket/sql/handle_connection	26479488	0	0	0	0	0
+wait/io/socket/sql/network_init	140458331300560	0	0	0	0	0
+wait/io/socket/sql/network_init	140458331301264	0	0	0	0	0
+wait/io/socket/sql/handle_connection	140458331302672	0	0	0	0	0
+wait/io/socket/sql/handle_connection	140458331306192	0	0	0	0	0
 select * from performance_schema.events_waits_summary_by_thread_by_event_name;
 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;
@@ -136,6 +140,22 @@ select * from performance_schema.file_su
 EVENT_NAME	COUNT_READ	COUNT_WRITE	SUM_NUMBER_OF_BYTES_READ	SUM_NUMBER_OF_BYTES_WRITE
 select * from performance_schema.file_summary_by_instance;
 FILE_NAME	EVENT_NAME	COUNT_READ	COUNT_WRITE	SUM_NUMBER_OF_BYTES_READ	SUM_NUMBER_OF_BYTES_WRITE
+select * from performance_schema.socket_instances;
+EVENT_NAME	OBJECT_INSTANCE_BEGIN	THREAD_ID	SOCKET_ID	IP	PORT
+wait/io/socket/sql/network_init	140458331300560	0	13	0.0.0.0	13000
+wait/io/socket/sql/network_init	140458331301264	0	14		0
+wait/io/socket/sql/handle_connection	140458331302672	0	37		0
+wait/io/socket/sql/handle_connection	140458331306192	0	37		0
+select * from performance_schema.socket_summary_by_instance;
+EVENT_NAME	OBJECT_INSTANCE_BEGIN	OBJECT_NAME	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	MAX_TIMER_WAIT	COUNT_READ	SUM_TIMER_READ	MIN_TIMER_READ	AVG_TIMER_READ	MAX_TIMER_READ	SUM_NUMBER_OF_BYTES_READ	MIN_NUMBER_OF_BYTES_READ	AVG_NUMBER_OF_BYTES_READ	MAX_NUMBER_OF_BYTES_READ	COUNT_WRITE	SUM_TIMER_WRITE	MIN_TIMER_WRITE	AVG_TIMER_WRITE	MAX_TIMER_WRITE	SUM_NUMBER_OF_BYTES_WRITE	MIN_NUMBER_OF_BYTES_WRITE	AVG_NUMBER_OF_BYTES_WRITE	MAX_NUMBER_OF_BYTES_WRITE	COUNT_RECV	SUM_TIMER_RECV	MIN_TIMER_RECV	AVG_TIMER_RECV	MAX_TIMER_RECV	SUM_NUMBER_OF_BYTES_RECV	MIN_NUMBER_OF_BYTES_RECV	AVG_NUMBER_OF_BYTES_RECV	MAX_NUMBER_OF_BYTES_RECV	COUNT_SEND	SUM_TIMER_SEND	MIN_TIMER_SEND	AVG_TIMER_SEND	MAX_TIMER_SEND	SUM_NUMBER_OF_BYTES_SEND	MIN_NUMBER_OF_BYTES_SEND	AVG_NUMBER_OF_BYTES_SEND	MAX_NUMBER_OF_BYTES_SEND	COUNT_RECVFROM	SUM_TIMER_RECVFROM	MIN_TIMER_RECVFROM	AVG_TIMER_RECVFROM	MAX_TIMER_RECVFROM	SUM_NUMBER_OF_BYTES_RECVFROM	MIN_NUMBER_OF_BYTES_RECVFROM	AVG_NUMBER_OF_BYTES_RECVFROM	MA
 X_NUMBER_OF_BYTES_RECVFROM	COUNT_SENDTO	SUM_TIMER_SENDTO	MIN_TIMER_SENDTO	AVG_TIMER_SENDTO	MAX_TIMER_SENDTO	SUM_NUMBER_OF_BYTES_SENDTO	MIN_NUMBER_OF_BYTES_SENDTO	AVG_NUMBER_OF_BYTES_SENDTO	MAX_NUMBER_OF_BYTES_SENDTO	COUNT_RECVMSG	SUM_TIMER_RECVMSG	MIN_TIMER_RECVMSG	AVG_TIMER_RECVMSG	MAX_TIMER_RECVMSG	SUM_NUMBER_OF_BYTES_RECVMSG	MIN_NUMBER_OF_BYTES_RECVMSG	AVG_NUMBER_OF_BYTES_RECVMSG	MAX_NUMBER_OF_BYTES_RECVMSG	COUNT_SENDMSG	SUM_TIMER_SENDMSG	MIN_TIMER_SENDMSG	AVG_TIMER_SENDMSG	MAX_TIMER_SENDMSG	SUM_NUMBER_OF_BYTES_SENDMSG	MIN_NUMBER_OF_BYTES_SENDMSG	AVG_NUMBER_OF_BYTES_SENDMSG	MAX_NUMBER_OF_BYTES_SENDMSG	COUNT_MISC	SUM_TIMER_MISC	MIN_TIMER_MISC	AVG_TIMER_MISC	MAX_TIMER_MISC
+wait/io/socket/sql/network_init	140458331300560		0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+wait/io/socket/sql/network_init	140458331301264		0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+wait/io/socket/sql/handle_connection	140458331302672		0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+wait/io/socket/sql/handle_connection	140458331306192		0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+select * from performance_schema.socket_summary_by_event_name;
+EVENT_NAME	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	MAX_TIMER_WAIT	COUNT_READ	SUM_TIMER_READ	MIN_TIMER_READ	AVG_TIMER_READ	MAX_TIMER_READ	SUM_NUMBER_OF_BYTES_READ	MIN_NUMBER_OF_BYTES_READ	AVG_NUMBER_OF_BYTES_READ	MAX_NUMBER_OF_BYTES_READ	COUNT_WRITE	SUM_TIMER_WRITE	MIN_TIMER_WRITE	AVG_TIMER_WRITE	MAX_TIMER_WRITE	SUM_NUMBER_OF_BYTES_WRITE	MIN_NUMBER_OF_BYTES_WRITE	AVG_NUMBER_OF_BYTES_WRITE	MAX_NUMBER_OF_BYTES_WRITE	COUNT_RECV	SUM_TIMER_RECV	MIN_TIMER_RECV	AVG_TIMER_RECV	MAX_TIMER_RECV	SUM_NUMBER_OF_BYTES_RECV	MIN_NUMBER_OF_BYTES_RECV	AVG_NUMBER_OF_BYTES_RECV	MAX_NUMBER_OF_BYTES_RECV	COUNT_SEND	SUM_TIMER_SEND	MIN_TIMER_SEND	AVG_TIMER_SEND	MAX_TIMER_SEND	SUM_NUMBER_OF_BYTES_SEND	MIN_NUMBER_OF_BYTES_SEND	AVG_NUMBER_OF_BYTES_SEND	MAX_NUMBER_OF_BYTES_SEND	COUNT_RECVFROM	SUM_TIMER_RECVFROM	MIN_TIMER_RECVFROM	AVG_TIMER_RECVFROM	MAX_TIMER_RECVFROM	SUM_NUMBER_OF_BYTES_RECVFROM	MIN_NUMBER_OF_BYTES_RECVFROM	AVG_NUMBER_OF_BYTES_RECVFROM	MAX_NUMBER_OF_BYTES_RECVFROM	COUNT_S
 ENDTO	SUM_TIMER_SENDTO	MIN_TIMER_SENDTO	AVG_TIMER_SENDTO	MAX_TIMER_SENDTO	SUM_NUMBER_OF_BYTES_SENDTO	MIN_NUMBER_OF_BYTES_SENDTO	AVG_NUMBER_OF_BYTES_SENDTO	MAX_NUMBER_OF_BYTES_SENDTO	COUNT_RECVMSG	SUM_TIMER_RECVMSG	MIN_TIMER_RECVMSG	AVG_TIMER_RECVMSG	MAX_TIMER_RECVMSG	SUM_NUMBER_OF_BYTES_RECVMSG	MIN_NUMBER_OF_BYTES_RECVMSG	AVG_NUMBER_OF_BYTES_RECVMSG	MAX_NUMBER_OF_BYTES_RECVMSG	COUNT_SENDMSG	SUM_TIMER_SENDMSG	MIN_TIMER_SENDMSG	AVG_TIMER_SENDMSG	MAX_TIMER_SENDMSG	SUM_NUMBER_OF_BYTES_SENDMSG	MIN_NUMBER_OF_BYTES_SENDMSG	AVG_NUMBER_OF_BYTES_SENDMSG	MAX_NUMBER_OF_BYTES_SENDMSG	COUNT_MISC	SUM_TIMER_MISC	MIN_TIMER_MISC	AVG_TIMER_MISC	MAX_TIMER_MISC
+wait/io/socket/sql/network_init	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+wait/io/socket/sql/handle_connection	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 select * from performance_schema.mutex_instances;
 NAME	OBJECT_INSTANCE_BEGIN	LOCKED_BY_THREAD_ID
 select * from performance_schema.threads;

=== modified file 'mysql-test/suite/perfschema/t/start_server_nothing.test'
--- a/mysql-test/suite/perfschema/t/start_server_nothing.test	2010-11-09 08:16:50 +0000
+++ b/mysql-test/suite/perfschema/t/start_server_nothing.test	2011-02-27 01:14:36 +0000
@@ -39,6 +39,9 @@ select * from performance_schema.events_
 select * from performance_schema.file_instances;
 select * from performance_schema.file_summary_by_event_name;
 select * from performance_schema.file_summary_by_instance;
+select * from performance_schema.socket_instances;
+select * from performance_schema.socket_summary_by_instance;
+select * from performance_schema.socket_summary_by_event_name;
 select * from performance_schema.mutex_instances;
 select * from performance_schema.threads;
 select * from performance_schema.rwlock_instances;


Attachment: [text/bzr-bundle] bzr/[e-mail]