From: Christopher Powers
Date: March 14 2011 4:29pm
Subject: bzr push into mysql-trunk branch (chris.powers:3255 to 3256) WL#4896
List-Archive: http://lists.mysql.com/commits/132931
Message-Id: <20110314162941.32E4D1DB0335@xeno.mysql.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2336558741756093338=="

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

 3256 Christopher Powers	2011-03-14
      WL#4896 "Performance Schema Net IO"
      
      - API change: Updated ps_abi_v1.h.pp

    modified:
      include/mysql/psi/psi_abi_v1.h.pp
 3255 cpowers	2011-03-14
      WL#4896 "Performance Schema Net IO"
      
      - Replaced get_thread_id() API with set_socket_owner()
      - Replaced PFS_socket.m_thread_id with m_thread_owner
      - SOCKET_INSTANCES.THREAD_ID displays owning thread id if availble, else NULL  

    modified:
      include/mysql/psi/mysql_socket.h
      include/mysql/psi/psi.h
      storage/perfschema/pfs.cc
      storage/perfschema/pfs_instr.h
      storage/perfschema/table_socket_instances.cc
=== modified file 'include/mysql/psi/psi_abi_v1.h.pp'
--- a/include/mysql/psi/psi_abi_v1.h.pp	2011-03-09 23:28:32 +0000
+++ b/include/mysql/psi/psi_abi_v1.h.pp	2011-03-14 16:29:27 +0000
@@ -225,7 +225,7 @@ typedef struct PSI_cond* (*init_cond_v1_
   (PSI_cond_key key, const void *identity);
 typedef void (*destroy_cond_v1_t)(struct PSI_cond *cond);
 typedef struct PSI_socket* (*init_socket_v1_t)
-  (PSI_socket_key key, const void *identity);
+  (PSI_socket_key key, const my_socket *fd);
 typedef void (*destroy_socket_v1_t)(struct PSI_socket *socket);
 typedef struct PSI_table_share* (*get_table_share_v1_t)
   (my_bool temporary, struct TABLE_SHARE *share);
@@ -343,6 +343,8 @@ typedef void (*set_socket_info_v1_t)(str
                                      my_socket *fd,
                                      const struct sockaddr *addr,
                                      socklen_t *addr_len);
+typedef void (*set_socket_thread_owner_v1_t)(struct PSI_socket *socket,
+                                             struct PSI_thread *thread);
 struct PSI_v1
 {
   register_mutex_v1_t register_mutex;
@@ -415,6 +417,7 @@ struct PSI_v1
   set_socket_descriptor_v1_t set_socket_descriptor;
   set_socket_address_v1_t set_socket_address;
   set_socket_info_v1_t set_socket_info;
+  set_socket_thread_owner_v1_t set_socket_thread_owner;
 };
 typedef struct PSI_v1 PSI;
 typedef struct PSI_mutex_info_v1 PSI_mutex_info;


--===============2336558741756093338==
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: 0f4177a68a5fed221ecf7a443ecbecef5ef7a213
# timestamp: 2011-03-14 11:29:40 -0500
# source_branch: file:///home/cpowers/work/dev/mysql-trunk/
# base_revision_id: cpowers@tma-1-20110314161125-mtq698j2ey3czfcb
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWezfLwQAAalfgAAQWHf//3ol
yoC////wUAPae954u3tWzD1zBppEJk0egJMm1G1NMNBHqZNGjamgDKmkzRiDJNDUYATCMATTCYBK
EApjKYjSeqZqB6jTCAGQMgCSST0p7UyajTxGpk9QPKA9IyaGIaAEkkNNKbAmamhT1PTxU9TQfqgG
jJoHqDbteCL3/I03LXM2KOrueIR4O0e6MHNBrKqu9zqL+h2PnkJIHOQB9t6pWlSKi55Y2G7LDaRd
x8NmRnP9pN6mEtIZiUe1tUt1NOOfYi31QWqleV0gaNRDJ83SNIw4XSIQpjKjRZr8aCqn5Pl3ecCk
NAKA21bH2yrsZEGj0lUrCGe6JOEZM1g0affYuBYG6JUrg+w6uuMRWT48IIlOgrghgSaEXYH5lwna
sJLiA/eXNIogSKQqh1uv3MrRGJ6QoU9jVdb8FbZyCxRcUmAGqI3kgIfBeEcQS0nGUg8UnMR0YsFw
hraPOQqKOSPRjU7fKkfHOdEwVAuMhIOa2L+KSe4+L5Zr5DkJGjQqmUHejIayY377GRQssUCzFEwe
43qUK667F5s5EFIJMaZVHhZSjuWwmQLieYDNEFIBlc10agkMYVVSC5TRMIROh14oW1FMCp5njsmV
C6ideFQoNvnHKO5PpLtrFOwxpjMXRoVJKl2Cy0YdJyLJYFAhNew6NvWdVrvZzDlx8ttaIIooACPm
plz30n2vK5eBwmBCId6YJZ8BIEyN4NNaxyiOcqA3EcmTQDPIz/39DvoAuFd2XShVtssa7dfQNER2
u2TaQjB2Ms0vKLCYwN6QaAkD4gvQlMon4NHn0p7jQZ36un8knAfYCahlsOanf2ljsY9s2pO4wM0i
ivSaT4ycw/bw94hWfOKrfWi+rzX5HJtkQ5IcsI4ViXMbWnVpxYnQmnoowuHFCiw0yX03d3EBJnYx
7j8IfQpgAiRRyR+ScUVVi1mdGdsNCdaxMLNGvJQo1ihJXiBnsBt4M9uN64IkA65FaGONDnjluC0r
9fj800IaGKcRiFffjGS0PJWgUg2cuuKtWODAX23JwRXtX03hSu5qpA57AGOeHwfyAnrWAT40EZ5Z
SrBa+6M1EAkgSBJBOkhXNUapk9ky53pWccEEwdHSl/UBgkC1ym0RJHKmWWmpmX7EXvkG7QJ0wVSQ
1mtp1co/XgLLh5trh4mC4FpyQ9FmdpOYvQQCySPJPQSEEVMXgWEe5EItWV9x2sY3zC4GodisSUNe
kS7pWdwdf5Z5vXiY3DqQVv8KJBn1yOqe1UhpvwL1apkOWdM4yxR4FRm0Kt5c0JxQgvIVQUahYwXD
Y5PUrDDKD8jqeMrUf+LuSKcKEh2b5eCA


--===============2336558741756093338==--