From: Christopher Powers
Date: June 6 2011 8:42pm
Subject: bzr commit into mysql-trunk branch (chris.powers:3306)
List-Archive: http://lists.mysql.com/commits/138718
Message-Id: <20110606204224.1068F1DB033E@xeno.mysql.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4726589725998836297=="

--===============4726589725998836297==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#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") }


--===============4726589725998836297==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/chris.powers@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: chris.powers@stripped
# target_branch: file:///home/cpowers/work/dev/mysql-trunk-wl4896/
# testament_sha1: a7ca0de2f72a7db069b97e148dfcaa00b7dbca06
# timestamp: 2011-06-06 15:42:23 -0500
# source_branch: file:///home/cpowers/work/dev/mysql-trunk/
# base_revision_id: chris.powers@stripped\
#   3axc73sibzl3ws0u
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVtuswcAAubfgBAQUGf/937t
3qC////6UAU2brz2Winsckeo7tISSJkg1T8p5Mmj1FPETE8p6I2o9TQGgNM1BKJM1MI0EU/0k0h6
IAAAAAABiU1PCoaN6gmR6ahoaaaA9QGhiNAARSQApP0aao2psSN6pjKDTNQwg0AAEkhAaJhKfhKN
6kHqGQaeoBtQxqH6oB2JrsHenusO+N+sN5azy9bKIr21dmiBJGZrNtR0YvTNMsTK4azrFAJJAJZ8
xA1OeElJbCCQZWZ7MVt2HQi5zlGphBtV/9tgZh7sx0/nppvmCIL4U3qbU7dGOQ9QvU9z8+VKDJHO
xwqlZLlClfYY9LlWPCs/YsjFzSLdAkyGjy426/ucdNfIOxWBDhba5254KEBOxnrvZ7nIIEDVRa/A
gT0Doz4YAnoNA5k4cIY7jkOQoJLEcUEUE6HrngYCGtGg21OuQPZVj/QjS6VB0SEyTHBhKw3FukTE
pQKwlNMIyaiAtVWEXpjIbWiF0FUegZMv4psQSoYiGM1LuyuovNPV/MWSxMrjzQNpzVmXPsEU2WtR
KnIgT0EVJhExAtEUXsUDEz4iIj44nkSBLBAwvOtaWIEzoEFdK9RRbkk+JyxIZwFngc+sJUfwJ1TA
vUihzLERluLpb2eFohlsFc8YRlYQDZg7KdEqK9EJOhipDpbgLFdQsK4ylnOr4m+ztzGbNxNEyF0C
5zEpoaOIFB6Fw+JXPcct1CW05GWblfU3pFBOPPM/r0EtggRLEYsS5lFXXaKGkzTp6qA+2LONrsah
FzVjWvrkgUZLAew8zMGJi9kXvvqXm1+cIUsqyMCBq4elxqMHQyVuKXXnLIw5s0CJlV29yNPhTR/U
FKk5xONRjwGEKgt7oIb1JYq18qAHQoIUU8B4NiKw84C8cMsAQXCcADJIKrsOSpAdwSFTMMMzR7UM
Fe/7Z9s7ByBuQckMHCEuuxwfmB3I5WBM0ldoTIcFoTQDUHqYKVQNWOFENafwFU6lBjV1VIQg4cpi
i0NclgubnTkD/e8UyetCNvSRQzKc3hv29pyoXz70luw0FMwuK+VawzRwoO8sXlSuPcZLif4PY4ZT
gPhGNpxqXxEe65dyFQRR1jhwbK7uK16o8aQnOP90s8KnDrOIMnfvCVklwVSSkUM/qIbDNBnXoR8x
ROZhcinaUofKk8Rbh1HQEPGk1LzYQayoljtaMNZzxLd1fQPLDcutWlTbWdWKoXMeyUIWUnqNH4sm
yNDRdiZrtXk8lzLeHITIdpz5talg7RA8Nkx1LEKdJ962XOdQXmx441hjDreV9Dqg24DnZRzLeJhu
crBOOWkCyTbUhJXfJBSI0wNoirEmo7NmlJp5BLMgeZekVPjnufUKpXIY/GQmxypd3PITXpiOEd5q
DnaS6AsnTzBYrDyMM3gw89XQIcRS4tT4iwxqsaKE4qaDoEgKmdpoGeIE8lZas8AQ7Ls6hMOOAk5m
/yqBgeNjks6HEATncRRDAVl9RatBKiGUk2xdlTSNDHNlQhGD0E3gtCVGnSATrB9kiQQgMs3GUQTu
pXM05VIFLUGEmvMeHOmy96m8ZPj2ocCdDyJLQlHLewiHiQQgukWlpe+vcLfSIoyx2HkKUqwxJ1K8
B1WC73VixnYqCNKxQb7ttSvEG3VBo36whCBK3dcs17Nc9O0q0hzNnKhef8XckU4UJBbbrMHA


--===============4726589725998836297==--