From: Christopher Powers
Date: July 1 2010 9:25pm
Subject: bzr commit into mysql-next-mr-wl4896 branch (chris.powers:3151) WL#4896
List-Archive: http://lists.mysql.com/commits/112705
Message-Id: <20100701212601.E24971DB0305@xeno.mysql.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0354415108040839517=="

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

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

 3151 Christopher Powers	2010-07-01
      WL#4896 "PERFORMANCE_SCHEMA Instrumenting Net IO"
      
      Fix build break.
     @ include/mysql/psi/mysql_socket.h
        Disable 'accept4' instrumentation

    modified:
      include/mysql/psi/mysql_socket.h
=== modified file 'include/mysql/psi/mysql_socket.h'
--- a/include/mysql/psi/mysql_socket.h	2010-06-22 23:02:37 +0000
+++ b/include/mysql/psi/mysql_socket.h	2010-07-01 21:25:57 +0000
@@ -235,6 +235,8 @@ inline_mysql_end_socket_wait(struct PSI_
     inline_mysql_socket_accept(SD, A, LP)
 #endif
 
+#if 0
+
 #ifdef HAVE_PSI_INTERFACE
   #define mysql_socket_accept4(SD, A, LP, FL) \
     inline_mysql_socket_accept4(__FILE__, __LINE__, SD, A, LP, FL)
@@ -243,6 +245,8 @@ inline_mysql_end_socket_wait(struct PSI_
     inline_mysql_socket_accept4(SD, A, LP, FL)
 #endif
 
+#endif
+
 #ifdef HAVE_PSI_INTERFACE
   #define mysql_socket_close(SD) \
     inline_mysql_socket_close(__FILE__, __LINE__, SD)
@@ -743,6 +747,7 @@ inline_mysql_socket_accept
 }
 
 /** mysql_socket_accept4 */
+#if 0
 
 static inline MYSQL_SOCKET
 inline_mysql_socket_accept4
@@ -771,6 +776,10 @@ inline_mysql_socket_accept4
   return result;
 }
 
+#endif
+
+
+
 /** mysql_socket_close */
 
 static inline int


--===============0354415108040839517==
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/dev-wl4896/mysql/
# testament_sha1: ec2d71f3f5836619e180f7cfa40307af1ec3edf4
# timestamp: 2010-07-01 16:26:01 -0500
# base_revision_id: chris.powers@stripped\
#   eat0wr2v1do2r49s
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWZHNNkAAbDfgGAQWOP/939n
2IC////wUAO+k0KatqAA01AlNom9UP1TTTymamIGj1NAPUbUP1J+ppAZTUnkaYgaTJGIDQAZMjQZ
BoBzCYBMAJhMJpgAAEyaaBjmEwCYATCYTTAAAJk00DCSQCExNJskxGjEp+Qp6aTyE09RoGm1P0eH
pc09G2I0f30fcYlpHLp0a60jVWOfFtcYOL6XXnrOSUH18JJkz2BYwnKV1OW4tL2sle6dcrd0I/rN
HJMUFlMImFUe8K6lBLMwGhgnpH4co30kEHOEcmbJRVM6idFQkkbKI3JF9lUjTfnkV3uF2stTOe9C
wiyFeJ7QzjEFFKAwuKcb34qqpf3M7CUOjbULFeUbc4nm6pA54h9tb24Fyg6XAtkosvpiZgzdP14j
omtRWb8asO/Td1O/FiyNyytEty3ZhMiAWsHU1B7RYYThnSywsiGuBxF1jjJTTyncqlVmDFV4J8bH
Z2T9qc6Zu8VDDtzLd5DivRPC4i3rwjpuopvblQmZ4ld86mT6xPN4UtAmtajSCOePcMUTSJq46Mnh
5wmRo+kLWCmNQxYyaVikFSlgwiLBIUjEWKgxK2VLfUhbOLYTuoapQdPQM9FttjSzRzV0pCW4VLLu
Yq64k7rMdNVy6DlUq2sa2t+a9Gl7QszNVVKJAnKEFF1GcTCNGu8Dqxq2ZPIz+2ftRBEOE5BHzs29
gbslHbeVAXX262XXQW63c9b8ZoYMfR5yR4vDWu0f+fH3q+3h6JFsBwO+t98K5otmmczdWDScfHWN
NZrxWPmyDlToCS8B66t7Bb5qbAU82EDxGIFV19fkQhIl2EhjQc3Cgjxz1BW0xHM8rsc04Ji7GMOQ
V1TOB81VprzJLPo6bj6H2yN/vOhXKJ4c+mLc3XEw4d/survlS7ikltrVveq71N3JtFAiPgoWPvuw
0wAOXK47PciMAGqMg2xuLeB49ZM7+PJvLaMOIifn5C6wteLB2QXKqWPXJI9rhddRWai75cGTQyOw
Y1i8OlETV0YhfXGP/a5yzkmOeCR78Qd2fWXhhfvFs7GFb1C1h8O/13BaFrk/8Mju1UcZkhlbqw5q
yXxEOTVrJUmWFZlOMD0b1cznSijdJ6MCDl06Xe0Q+DJ7JlwO5doqa0aMQU0fB51+6QwVrxcs9Bf1
BI1bcdTMDyZHySNkdmzLww0peah1MXpvkrklvIozb9BPjuBUWp+nbJCjE+blhFI83JEX6Cc1buYs
sJg6i7XI+iVSjMMw2EHshyqZ/3LXOswOUjDCwpBqkMDEHLNIXxz1Y376ivUnWKIRReJrAVFy8Vdk
qKtRW9LCRH/xdyRThQkGZHNNkA==


--===============0354415108040839517==--