List:Commits« Previous MessageNext Message »
From:Christopher Powers Date:March 19 2011 2:23am
Subject:bzr commit into mysql-trunk branch (chris.powers:3266) WL#4896
View as plain text  
#At file:///home/cpowers/work/dev/mysql-trunk-wl4896/ based on revid:chris.powers@stripped

 3266 Christopher Powers	2011-03-18
      WL#4896 "Performance Schema Net IO"
      
      - Regression test updates

    modified:
      mysql-test/suite/perfschema/r/start_server_nothing.result
      storage/perfschema/table_socket_instances.cc
=== modified file 'mysql-test/suite/perfschema/r/start_server_nothing.result'
--- a/mysql-test/suite/perfschema/r/start_server_nothing.result	2011-03-16 15:36:35 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_nothing.result	2011-03-19 02:22:58 +0000
@@ -136,11 +136,11 @@ EVENT_NAME	COUNT_READ	COUNT_WRITE	SUM_NU
 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
+EVENT_NAME	OBJECT_INSTANCE_BEGIN	THREAD_ID	SOCKET_ID	IP	PORT	STATE
 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	COUNT_WRITE	SUM_TIMER_WRITE	MIN_TIMER_WRITE	AVG_TIMER_WRITE	MAX_TIMER_WRITE	SUM_NUMBER_OF_BYTES_WRITE	COUNT_RECV	SUM_TIMER_RECV	MIN_TIMER_RECV	AVG_TIMER_RECV	MAX_TIMER_RECV	SUM_NUMBER_OF_BYTES_RECV	COUNT_SEND	SUM_TIMER_SEND	MIN_TIMER_SEND	AVG_TIMER_SEND	MAX_TIMER_SEND	SUM_NUMBER_OF_BYTES_SEND	COUNT_RECVFROM	SUM_TIMER_RECVFROM	MIN_TIMER_RECVFROM	AVG_TIMER_RECVFROM	MAX_TIMER_RECVFROM	SUM_NUMBER_OF_BYTES_RECVFROM	COUNT_SENDTO	SUM_TIMER_SENDTO	MIN_TIMER_SENDTO	AVG_TIMER_SENDTO	MAX_TIMER_SENDTO	SUM_NUMBER_OF_BYTES_SENDTO	COUNT_RECVMSG	SUM_TIMER_RECVMSG	MIN_TIMER_RECVMSG	AVG_TIMER_RECVMSG	MAX_TIMER_RECVMSG	SUM_NUMBER_OF_BYTES_RECVMSG	COUNT_SENDMSG	SUM_TIMER_SENDMSG	MIN_TIMER_SENDMSG	AVG_TIMER_SENDMSG	MAX_TIMER_SENDMSG	SUM_NUMBER_OF_BYTES_SENDMSG	COUNT_MISC	SUM_TIMER_MISC	M
 IN_TIMER_MISC	AVG_TIMER_MISC	MAX_TIMER_MISC
+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	COUNT_WRITE	SUM_TIMER_WRITE	MIN_TIMER_WRITE	AVG_TIMER_WRITE	MAX_TIMER_WRITE	SUM_NUMBER_OF_BYTES_WRITE	COUNT_MISC	SUM_TIMER_MISC	MIN_TIMER_MISC	AVG_TIMER_MISC	MAX_TIMER_MISC
 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	COUNT_WRITE	SUM_TIMER_WRITE	MIN_TIMER_WRITE	AVG_TIMER_WRITE	MAX_TIMER_WRITE	SUM_NUMBER_OF_BYTES_WRITE	COUNT_RECV	SUM_TIMER_RECV	MIN_TIMER_RECV	AVG_TIMER_RECV	MAX_TIMER_RECV	SUM_NUMBER_OF_BYTES_RECV	COUNT_SEND	SUM_TIMER_SEND	MIN_TIMER_SEND	AVG_TIMER_SEND	MAX_TIMER_SEND	SUM_NUMBER_OF_BYTES_SEND	COUNT_RECVFROM	SUM_TIMER_RECVFROM	MIN_TIMER_RECVFROM	AVG_TIMER_RECVFROM	MAX_TIMER_RECVFROM	SUM_NUMBER_OF_BYTES_RECVFROM	COUNT_SENDTO	SUM_TIMER_SENDTO	MIN_TIMER_SENDTO	AVG_TIMER_SENDTO	MAX_TIMER_SENDTO	SUM_NUMBER_OF_BYTES_SENDTO	COUNT_RECVMSG	SUM_TIMER_RECVMSG	MIN_TIMER_RECVMSG	AVG_TIMER_RECVMSG	MAX_TIMER_RECVMSG	SUM_NUMBER_OF_BYTES_RECVMSG	COUNT_SENDMSG	SUM_TIMER_SENDMSG	MIN_TIMER_SENDMSG	AVG_TIMER_SENDMSG	MAX_TIMER_SENDMSG	SUM_NUMBER_OF_BYTES_SENDMSG	COUNT_MISC	SUM_TIMER_MISC	MIN_TIMER_MISC	AVG_TIMER_MISC	MAX_T
 IMER_MISC
+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	COUNT_WRITE	SUM_TIMER_WRITE	MIN_TIMER_WRITE	AVG_TIMER_WRITE	MAX_TIMER_WRITE	SUM_NUMBER_OF_BYTES_WRITE	COUNT_MISC	SUM_TIMER_MISC	MIN_TIMER_MISC	AVG_TIMER_MISC	MAX_TIMER_MISC
 select * from performance_schema.mutex_instances;
 NAME	OBJECT_INSTANCE_BEGIN	LOCKED_BY_THREAD_ID
 select * from performance_schema.threads;

=== modified file 'storage/perfschema/table_socket_instances.cc'
--- a/storage/perfschema/table_socket_instances.cc	2011-03-19 01:36:46 +0000
+++ b/storage/perfschema/table_socket_instances.cc	2011-03-19 02:22:58 +0000
@@ -184,9 +184,6 @@ int table_socket_instances::read_row_val
   if (unlikely(!m_row_exists))
     return HA_ERR_RECORD_DELETED;
 
-  /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 0);
-
   for (; (f= *fields) ; fields++)
   {
     if (read_all || bitmap_is_set(table->read_set, f->field_index))


Attachment: [text/bzr-bundle] bzr/chris.powers@oracle.com-20110319022258-vbsvcko752nmqvu3.bundle
Thread
bzr commit into mysql-trunk branch (chris.powers:3266) WL#4896Christopher Powers19 Mar