bzr commit into mysql-next-mr-wl4896 branch (chris.powers:3151) WL#4896

[Christopher Powers]

#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


Attachment: [text/bzr-bundle] bzr/[e-mail]