From: Christopher Powers
Date: March 10 2011 5:56pm
Subject: bzr push into mysql-trunk branch (chris.powers:3248 to 3249) WL#4896
List-Archive: http://lists.mysql.com/commits/132782
Message-Id: <20110310175618.00A1F1DB0335@xeno.mysql.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7107510162320577633=="

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

 3249 Christopher Powers	2011-03-10
      WL#4896 "Performance Schema Net IO"
      
      - Removed unused parameters from mysql_socket_accept()

    modified:
      include/mysql/psi/mysql_socket.h
 3248 cpowers	2011-03-10
      WL#4896 "Performance Schema Net IO"
      
      Socket summary tables
      - Added PFS_byte_stat constructor to initialize fields
      - This should also correct valgrind errors
      
      socket accept()
      - Removed wait -- used in listen() only
      - Moved PSI initialization to after accept() call to capture new fd
      
      Windows build
      - Pulled build break fixes from mysql-trunk

    modified:
      include/mysql/psi/mysql_socket.h
      storage/perfschema/pfs_stat.h
      storage/perfschema/pfs_visitor.cc
=== modified file 'include/mysql/psi/mysql_socket.h'
--- a/include/mysql/psi/mysql_socket.h	2011-03-10 17:34:04 +0000
+++ b/include/mysql/psi/mysql_socket.h	2011-03-10 17:56:04 +0000
@@ -303,7 +303,7 @@ inline_mysql_end_socket_wait(struct PSI_
 
 #ifdef HAVE_PSI_INTERFACE
   #define mysql_socket_accept(K, FD, A, LP) \
-    inline_mysql_socket_accept(K, __FILE__, __LINE__, FD, A, LP)
+    inline_mysql_socket_accept(K, /*__FILE__, __LINE__,*/ FD, A, LP)
 #else
   #define mysql_socket_accept(FD, A, LP) \
     inline_mysql_socket_accept(FD, A, LP)
@@ -785,7 +785,7 @@ static inline MYSQL_SOCKET
 inline_mysql_socket_accept
 (
 #ifdef HAVE_PSI_INTERFACE
-  PSI_socket_key key, const char *src_file, uint src_line,
+  PSI_socket_key key, //const char *src_file, uint src_line,
 #endif
   MYSQL_SOCKET socket_listen, struct sockaddr *addr, socklen_t *addr_len)
 {
@@ -797,6 +797,7 @@ inline_mysql_socket_accept
   #ifdef HAVE_PSI_INTERFACE
   socket_accept.m_psi = PSI_server ?
           PSI_server->init_socket(key, (const void *)&socket_accept.fd) : NULL;
+
   if (likely(PSI_server != NULL && socket_accept.m_psi != NULL
              && socket_accept.fd != -1))
     PSI_server->set_socket_info(socket_accept.m_psi, &socket_accept.fd,


--===============7107510162320577633==
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: 99c34ee120e3cbe03d393fbac273e350b58f5e66
# timestamp: 2011-03-10 11:56:17 -0600
# source_branch: file:///home/cpowers/work/dev/mysql-trunk/
# base_revision_id: cpowers@tma-1-20110310173404-8sjeb0e06v2pyil4
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbLMvJsAAZnfgEAQWHf/938t
2IC////wUAO5eOlXcdE0OhKIieom0wTJoTCZGymhgCHqMgASlMptMCQ2SnqBppoAANADQAGmkJtT
KmaahtGoepoAGg0eoaDTQA5piYCNMCMIwAAABMIwEkgSehMEno0IanqeUMnkho0BoGgXA+u2kzb1
0sTtkPIxtY8ILITOV8YKuFFCw1YBVoykkD20oNb2uVJBylyjC7XO5lvxVXecKF9/2Xovxjk9UYlp
vCSPmrMkmlGSsQ4QDeVFMND97jPu2VvrmpEwkt0OygoCInyDfj3UW07vQbZ3JTXmS56VnqlqriqW
Q17tnC/imBRQnelyR+B4rwjFOrB5mpgsy7Ow1xM0jxD1e6M/WK9nOBq3LWQFRIotEZhF2g7eqyuY
jGMroC4Ky0rsI9xWnw+g1whpwM/T9SkRaq9pTJ8y10EuabC8qoSpMthZs3G3pJ3GGLw6WJ/s8gkQ
mrhFF0C4HzhdL4DF7CMKg8qk806Y39PWHXhR84ZqbW0mYwJBaXDTNfJL1CRYxQRLLqKeVGKdgi1O
kZXtcWyTQ+H8KgKMHDFxaD2FQXlrV1rTSURnY8a2klSOlEue0hdbUi8wNGuhjakGYqhaosoY1soy
0m0rSFUVVWkIEB9TGiShz3IYmAYCDGecR6at/aUjNzZ+pEEqJFFOeLo9y+XbX3m/fn+fbn2Kthka
lawWAuHF6c1XpGig1bvJ4zIRXsahkZYDJjyWyoyvd8xw8kR2eVobp2TSsj09QjyeNsJkgFKNuJ8T
QJfL5CWbhHvtjJcXdUZxYvnqduE5LvSjJgwWGzr57sa71Qmcp5GJZtI3Y8JsgoCizBs1jC7IbLJw
p0Z3UmhkTgjiNHIGiXcXHe7pJMuW1chasfwwi/NJCipGPZb0+2b9aqIZs2E86xGXAcjRuPCpMLZN
O2rV1wMO9VgqQ1ieSYCcFsLNSVNRP2FB2WgiI65U0Oo8QyB5jiHEz0i/mn7a9UsA5YJcQbdCviOD
oytZLThocHMXskHn8HbQqD0cAtgEkPM6TFFTcMddOjiBRJ1gWANbsKckYvgl95yYqWCOiHBMwR62
/wSt6UGrNrJzKDlaLf4GwTzICJSMc3wMf8kwTDtcrNXdBId0GTMnESHJKoL5ZaDQEC3QLVFmVSQ7
fAcifVaUGzICYd4ujGOjLMJUSZWkEmSH2RusNjU0zB3MJrk8XIX1wr4NOpGL7Y5xnqDDm3EapLcb
9k5wH5wggoJ1qS3RPSJLCxTuUcwJKTIGA8Fn6RMQVLDGIbxZhaLyX/F3JFOFCQssy8mw


--===============7107510162320577633==--