bzr push into mysql-trunk branch (marc.alff:3380 to 3381)

[Marc Alff]

 3381 Marc Alff	2011-08-18
      Commented too optimistic assert

    modified:
      storage/perfschema/pfs.cc
 3380 Marc Alff	2011-08-18
      WL#4896 PERFORMANCE_SCHEMA NET IO
      
      Code cleanup for destroy_socket

    modified:
      include/mysql/psi/mysql_socket.h
      storage/perfschema/pfs.cc
      storage/perfschema/pfs_instr.cc
      storage/perfschema/pfs_instr.h
      storage/perfschema/table_socket_summary_by_instance.cc
=== modified file 'storage/perfschema/pfs.cc'
--- a/storage/perfschema/pfs.cc	2011-08-18 12:27:21 +0000
+++ b/storage/perfschema/pfs.cc	2011-08-18 16:15:02 +0000
@@ -2848,8 +2848,13 @@ get_thread_socket_locker_v1(PSI_socket_l
     if (unlikely(pfs_thread == NULL))
       return NULL;
 
+#ifdef LATER
+    /*
+      Needs refinement, because of KILL.
+    */
     DBUG_ASSERT(pfs_thread ==
                 my_pthread_getspecific_ptr(PFS_thread*, THR_PFS));
+#endif
 
     if (!pfs_thread->m_enabled)
       return NULL;

No bundle (reason: useless for push emails).