From: Christopher Powers
Date: March 18 2011 11:41pm
Subject: bzr commit into mysql-trunk branch (chris.powers:3263) WL#4896
List-Archive: http://lists.mysql.com/commits/133364
Message-Id: <20110318234144.C80631DB0335@xeno.mysql.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1404538993226347757=="

--===============1404538993226347757==
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:cpowers@tma-1-20110318233718-3h937h6nsyumhgn3

 3263 Christopher Powers	2011-03-18
      WL#4896 "Performance Schema Net IO"
      
      - Updated psi_abi_v1.h.pp

    modified:
      include/mysql/psi/psi_abi_v1.h.pp
=== modified file 'include/mysql/psi/psi_abi_v1.h.pp'
--- a/include/mysql/psi/psi_abi_v1.h.pp	2011-03-16 15:36:35 +0000
+++ b/include/mysql/psi/psi_abi_v1.h.pp	2011-03-18 23:41:39 +0000
@@ -354,17 +354,11 @@ typedef void (*end_socket_wait_v1_t)
   (struct PSI_socket_locker *locker, size_t count);
 typedef void (*set_socket_state_v1_t)(struct PSI_socket *socket,
                                       enum PSI_socket_state state);
-typedef void (*set_socket_descriptor_v1_t)(struct PSI_socket *socket,
-                                             uint fd);
-typedef void (*set_socket_address_v1_t)(struct PSI_socket *socket,
-                                        const struct sockaddr * addr,
-                                        socklen_t addr_len);
 typedef void (*set_socket_info_v1_t)(struct PSI_socket *socket,
-                                     my_socket *fd,
+                                     const 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);
+                                     socklen_t addr_len);
+typedef void (*set_socket_thread_owner_v1_t)(struct PSI_socket *socket);
 struct PSI_v1
 {
   register_mutex_v1_t register_mutex;
@@ -437,8 +431,6 @@ struct PSI_v1
   start_socket_wait_v1_t start_socket_wait;
   end_socket_wait_v1_t end_socket_wait;
   set_socket_state_v1_t set_socket_state;
-  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;
 };


--===============1404538993226347757==
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: 343e0b7aef58d0402cc3ea692a6f58758152c229
# timestamp: 2011-03-18 18:41:44 -0500
# source_branch: file:///home/cpowers/work/dev/mysql-trunk/
# base_revision_id: cpowers@tma-1-20110318233718-3h937h6nsyumhgn3
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUKFeJgAAZ3fgAAQeHf//1ol
yoC////wUAO5dyt2YAXLqEokDRTMNT1GTTRNPQZCmNTTTRhGQJKamRhAJPJTT09UyeoPUB6gMgaN
AaaJMU8pqemU3qNQZAAGgaDQ9QAklEynlP1Nqj1NPNSep+lDygDagNAAA5piYAEwATAACYAAmNTd
levr9jPTPTNjUTte4QIeUGaEWWp7LjUWBG1PwFvdMkoNnmkdMHxrezMukhiSqnB/gcNfAy7P2510
CxB6POtOb4qdrZzGNYJ1YbLKTTDwWq730pcUnxSiiZEjLxZ6sVj8R2L4U48IDwwSpCx7p7spkFDV
31g9hE1SvYRk+ART1gVRrGfjNLaLNx8bl4Bx5yEbyvhaIbJOfN9fQQLpPXyzeJtltSl9Nb+fJbno
NOXgt+ZhDo3TTs/SoqinpzCHaFcooJ1pibk8lIbbD8BVCl1eWWvBwh7m4WqpwoYoZOps0lJSSZuw
mOzWXESQInNEl7ZmVj44dieKve/IZVXYPCiuAjJY3DW0pSQYcgRWEH1FF+hmdOVrOxBoKlZSIuW+
p1laTuErRYrDAtWTCrU5qy4tirLkauQeSoxhTcUsLapweuvBoifPRR3dmSr6YQ1dtUaUuMTGRfpH
AczYvvcpXOskrgIWwIrVjIwiauJPga3TbKyBd3ljsvEJpAU9NsGX2+Geq5F91JOQUumQxdRfEd+V
jc7JgleDQ27f9sP6Hg0Cq17O6vRt0NDB2d74sGUIKaV5QlBVoj0WQqcd7Q+kfeiUdhLIKW8TlFYT
mfo7GCzhgaxXe+eP9IMA8BO0CP2VJ/ptBoq0rfCWR7h6SIsCUXqSKw2wu7PEQ8bsiywHlBy45XGD
JpA3c+wmyteOwVkS0Zn+dDV3+zCeopPyipBNnpyddU6IOtsPM+VjXKEyRU2WdO0S7nzIu8/kRpqO
W/rY5hgPSpC5J+QXicUfwSK0JmXWpWmqFE+cwXSxChvB5nx6eSLJwNaMPvq1BP669EFIWJSiYgu4
SyLu6PEteltbGNUHpWDLE6JXaE6YrRAG9oCkuneV97cwEsFr0uUWoRWbRhA6nPlA96cNCsgD8m0m
/zqJ6UynZMuKxG1fakpgykzGj8AYKA5ZFV1yiLmULIMy/ZT0moG1JPTBbRrNbOrWVsIstTPBcmbf
ZGfBxYaVgRDfVu4KsFCA5YPSvEwh7Qpz62JzRIFiMhUQOu/rCT6TimBqLkcMp3pZC1UQj1/g4PV2
1QcpP00uKLiqIYHawqV/i9Sy31+bVNPBE10Bn1CySLC5IpxUMky3B/+LuSKcKEghQrxMAA==


--===============1404538993226347757==--