bzr push into mysql-trunk branch (chris.powers:3317 to 3318) WL#4896

[Christopher Powers]

 3318 Christopher Powers	2011-07-16
      WL#4896 "Performance Schema Net IO"
      
      Integrating performance improvements

    modified:
      sql/sql_parse.cc
      storage/perfschema/pfs.cc
 3317 Christopher Powers	2011-07-16
      Integrating performance improvements

    modified:
      storage/perfschema/pfs.cc
      storage/perfschema/pfs_instr.cc
      storage/perfschema/pfs_instr.h
      storage/perfschema/table_setup_instruments.cc
=== modified file 'sql/sql_parse.cc'
--- a/sql/sql_parse.cc	2011-07-15 00:55:03 +0000
+++ b/sql/sql_parse.cc	2011-07-16 21:16:17 +0000
@@ -790,7 +790,7 @@ bool do_command(THD *thd)
   ulong packet_length;
   NET *net= &thd->net;
   enum enum_server_command command;
-  // TODO: WL4896 Disabled:  MYSQL_IDLE_WAIT_VARIABLES(idle_locker, idle_state) /* no ; */
+  //CWP temp MYSQL_IDLE_WAIT_VARIABLES(idle_locker, idle_state) /* no ; */
 
   DBUG_ENTER("do_command");
 
@@ -838,8 +838,8 @@ bool do_command(THD *thd)
     - do not time the wait on the socket
     - time the wait as IDLE server time instead.
   */
-  // TODO: WL4896 Disabled: mysql_socket_set_state(net->vio->mysql_socket, PSI_SOCKET_STATE_IDLE);
-  //  MYSQL_START_IDLE_WAIT(idle_locker, & idle_state);
+  // CWP temp disable mysql_socket_set_state(net->vio->mysql_socket, PSI_SOCKET_STATE_IDLE);
+  // CWP temp disable MYSQL_START_IDLE_WAIT(idle_locker, & idle_state);
 
   packet_length= my_net_read(net);
 

=== modified file 'storage/perfschema/pfs.cc'
--- a/storage/perfschema/pfs.cc	2011-07-16 19:25:42 +0000
+++ b/storage/perfschema/pfs.cc	2011-07-16 21:16:17 +0000
@@ -2765,10 +2765,7 @@ get_thread_socket_locker_v1(PSI_socket_l
     return NULL;
   DBUG_ASSERT(pfs_socket->m_class != NULL);
 
-  if (pfs_socket->m_idle)
-    return NULL;
-
-  if (!pfs_socket->m_enabled)
+  if (pfs_socket->m_idle || !pfs_socket->m_enabled)
     return NULL;
 
   register uint flags;

No bundle (reason: useless for push emails).