bzr commit into mysql-trunk branch (chris.powers:3306)

[Christopher Powers]

#At file:///home/cpowers/work/dev/mysql-trunk-wl4896/ based on revid:chris.powers@stripped

 3306 Christopher Powers	2011-06-06
      merge with mysql-trunk

    modified:
      storage/perfschema/pfs.cc
      storage/perfschema/pfs_column_types.h
      storage/perfschema/table_events_waits.cc
=== modified file 'storage/perfschema/pfs.cc'
--- a/storage/perfschema/pfs.cc	2011-05-17 17:34:45 +0000
+++ b/storage/perfschema/pfs.cc	2011-06-06 20:42:17 +0000
@@ -1141,7 +1141,8 @@ static enum_operation_type socket_operat
   OPERATION_TYPE_SOCKETSEEK,
   OPERATION_TYPE_SOCKETOPT,
   OPERATION_TYPE_SOCKETSTAT,
-  OPERATION_TYPE_SOCKETSHUTDOWN
+  OPERATION_TYPE_SOCKETSHUTDOWN,
+  OPERATION_TYPE_SOCKETSELECT
 };
 
 /**
@@ -2843,6 +2844,7 @@ get_thread_socket_locker_v1(PSI_socket_l
       case PSI_SOCKET_STAT:
       case PSI_SOCKET_SHUTDOWN:
       case PSI_SOCKET_CLOSE:
+      case PSI_SOCKET_SELECT:
         {
         PFS_socket *pfs_socket= reinterpret_cast<PFS_socket *>(socket);
         pfs_socket->m_socket_stat.m_io_stat.m_misc.aggregate_counted();
@@ -4593,6 +4595,7 @@ static void end_socket_wait_v1(PSI_socke
   case PSI_SOCKET_OPT:
   case PSI_SOCKET_STAT:
   case PSI_SOCKET_SHUTDOWN:
+  case PSI_SOCKET_SELECT:
     byte_stat= &socket->m_socket_stat.m_io_stat.m_misc;
     break;
   case PSI_SOCKET_CLOSE:

=== modified file 'storage/perfschema/pfs_column_types.h'
--- a/storage/perfschema/pfs_column_types.h	2011-04-14 01:36:24 +0000
+++ b/storage/perfschema/pfs_column_types.h	2011-06-06 20:42:17 +0000
@@ -164,9 +164,10 @@ enum enum_operation_type
   OPERATION_TYPE_SOCKETOPT = 52,
   OPERATION_TYPE_SOCKETSTAT = 53,
   OPERATION_TYPE_SOCKETSHUTDOWN = 54,
+  OPERATION_TYPE_SOCKETSELECT = 55,
 
   /* Idle operation */
-  OPERATION_TYPE_IDLE= 55
+  OPERATION_TYPE_IDLE= 56
 };
 /** Integer, first value of @sa enum_operation_type. */
 #define FIRST_OPERATION_TYPE (static_cast<int> (OPERATION_TYPE_LOCK))

=== modified file 'storage/perfschema/table_events_waits.cc'
--- a/storage/perfschema/table_events_waits.cc	2011-03-28 23:37:10 +0000
+++ b/storage/perfschema/table_events_waits.cc	2011-06-06 20:42:17 +0000
@@ -555,6 +555,7 @@ static const LEX_STRING operation_names_
   { C_STRING_WITH_LEN("opt") },
   { C_STRING_WITH_LEN("stat") },
   { C_STRING_WITH_LEN("shutdown") },
+  { C_STRING_WITH_LEN("select") },
 
   /* Idle operations */
   { C_STRING_WITH_LEN("idle") }


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