From: Christopher Powers Date: June 6 2011 8:42pm Subject: bzr push into mysql-trunk branch (chris.powers:3304 to 3306) List-Archive: http://lists.mysql.com/commits/138719 Message-Id: <20110606204233.7B2A91DB033E@xeno.mysql.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8475520919587394475==" --===============8475520919587394475== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 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 3305 Christopher Powers 2011-06-06 merge with mysql-trunk modified: include/mysql/psi/psi_abi_v1.h.pp include/mysql/psi/psi_abi_v2.h.pp vio/viosocket.c 3304 cpowers 2011-06-06 merge with mysql-trunk modified: vio/vio.c vio/viopipe.c vio/vioshm.c vio/viossl.c === modified file 'include/mysql/psi/psi_abi_v1.h.pp' --- a/include/mysql/psi/psi_abi_v1.h.pp 2011-03-29 00:46:15 +0000 +++ b/include/mysql/psi/psi_abi_v1.h.pp 2011-06-06 20:16:03 +0000 @@ -89,7 +89,8 @@ enum PSI_socket_operation PSI_SOCKET_SEEK= 10, PSI_SOCKET_OPT= 11, PSI_SOCKET_STAT= 12, - PSI_SOCKET_SHUTDOWN= 13 + PSI_SOCKET_SHUTDOWN= 13, + PSI_SOCKET_SELECT= 14 }; typedef unsigned int PSI_mutex_key; typedef unsigned int PSI_rwlock_key; === modified file 'include/mysql/psi/psi_abi_v2.h.pp' --- a/include/mysql/psi/psi_abi_v2.h.pp 2011-04-22 03:07:02 +0000 +++ b/include/mysql/psi/psi_abi_v2.h.pp 2011-06-06 20:16:03 +0000 @@ -89,7 +89,8 @@ enum PSI_socket_operation PSI_SOCKET_SEEK= 10, PSI_SOCKET_OPT= 11, PSI_SOCKET_STAT= 12, - PSI_SOCKET_SHUTDOWN= 13 + PSI_SOCKET_SHUTDOWN= 13, + PSI_SOCKET_SELECT= 14 }; typedef unsigned int PSI_mutex_key; typedef unsigned int PSI_rwlock_key; === 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(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 (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") } === modified file 'vio/viosocket.c' --- a/vio/viosocket.c 2011-06-06 19:24:25 +0000 +++ b/vio/viosocket.c 2011-06-06 20:16:03 +0000 @@ -101,7 +101,6 @@ size_t vio_read(Vio *vio, uchar *buf, si { ssize_t ret; int flags= 0; - size_t bytes_read= 0; DBUG_ENTER("vio_read"); /* Ensure nobody uses vio_read_buff and vio_read simultaneously. */ @@ -317,7 +316,6 @@ int vio_socket_timeout(Vio *vio, int vio_fastsend(Vio * vio __attribute__((unused))) { int r=0; - my_socket sd= mysql_socket_getfd(vio->mysql_socket); DBUG_ENTER("vio_fastsend"); #if defined(IPTOS_THROUGHPUT) --===============8475520919587394475== 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:32 -0500 # source_branch: file:///home/cpowers/work/dev/mysql-trunk/ # base_revision_id: cpowers@tma-1-20110606195705-g1moftxfqlde495m # # Begin bundle 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 --===============8475520919587394475==--