From: Christopher Powers
Date: July 19 2011 1:21am
Subject: bzr push into mysql-trunk branch (chris.powers:3319 to 3320) WL#4896
List-Archive: http://lists.mysql.com/commits/140347
Message-Id: <201107190121.p6J1Ln4c025834@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3320 Christopher Powers	2011-07-18
      WL#4896 "Performance Schema Net IO"
      
      - Fix to recent performance improvements

    modified:
      storage/perfschema/pfs_instr.cc
 3319 Christopher Powers	2011-07-16
      WL#4896 "Performance Schema Net IO"
      
      Integrating peformance improvements in socket instrumentation. 

    modified:
      include/mysql/psi/mysql_idle.h
      include/mysql/psi/mysql_socket.h
      sql/sql_parse.cc
      storage/perfschema/pfs.cc
=== modified file 'storage/perfschema/pfs_instr.cc'
--- a/storage/perfschema/pfs_instr.cc	2011-07-16 19:25:42 +0000
+++ b/storage/perfschema/pfs_instr.cc	2011-07-19 01:20:59 +0000
@@ -1414,6 +1414,8 @@ PFS_socket* create_socket(PFS_socket_cla
           pfs->m_fd= fd;
           pfs->m_identity= pfs;
           pfs->m_class= klass;
+		  pfs->m_enabled= klass->m_enabled && flag_global_instrumentation;
+		  pfs->m_timed= klass->m_timed;
           pfs->m_idle= false;
           pfs->m_socket_stat.reset();
           pfs->m_lock.dirty_to_allocated();

No bundle (reason: useless for push emails).