List:Commits« Previous MessageNext Message »
From:Christopher Powers Date:March 10 2011 5:56pm
Subject:bzr push into mysql-trunk branch (chris.powers:3248 to 3249) WL#4896
View as plain text  
 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,


Attachment: [text/bzr-bundle] bzr/chris.powers@oracle.com-20110310175604-0rnz6ugknebxninl.bundle
Thread
bzr push into mysql-trunk branch (chris.powers:3248 to 3249) WL#4896Christopher Powers10 Mar