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

[Christopher Powers]

 3311 Christopher Powers	2011-07-06
      WL#4896 "Performance Schema Net IO"
      
      - Temporarily disable IDLE timing event while developing QA test suite

    modified:
      sql/sql_parse.cc
 3310 Christopher Powers	2011-06-27
      WL#4896 "Performance Schema Net IO"
      
      - Added socket_instances_func.test to verify contents of SOCKET_INSTANCES

    added:
      mysql-test/suite/perfschema/r/socket_instances_func.result
      mysql-test/suite/perfschema/t/socket_instances_func.test
=== modified file 'sql/sql_parse.cc'
--- a/sql/sql_parse.cc	2011-06-24 19:30:01 +0000
+++ b/sql/sql_parse.cc	2011-07-06 23:36:06 +0000
@@ -774,7 +774,7 @@ bool do_command(THD *thd)
   ulong packet_length;
   NET *net= &thd->net;
   enum enum_server_command command;
-  MYSQL_IDLE_WAIT_VARIABLES(idle_locker, idle_state) /* no ; */
+  // TODO: WL4896 Disabled:  MYSQL_IDLE_WAIT_VARIABLES(idle_locker, idle_state) /* no ; */
 
   DBUG_ENTER("do_command");
 
@@ -822,13 +822,13 @@ bool do_command(THD *thd)
     - do not time the wait on the socket
     - time the wait as IDLE server time instead.
   */
-  mysql_socket_set_state(net->vio->mysql_socket, PSI_SOCKET_STATE_IDLE);
-  MYSQL_START_IDLE_WAIT(idle_locker, & idle_state);
+  // TODO: WL4896 Disabled: mysql_socket_set_state(net->vio->mysql_socket, PSI_SOCKET_STATE_IDLE);
+  //  MYSQL_START_IDLE_WAIT(idle_locker, & idle_state);
 
   packet_length= my_net_read(net);
 
-  MYSQL_END_IDLE_WAIT(idle_locker);
-  mysql_socket_set_state(net->vio->mysql_socket, PSI_SOCKET_STATE_ACTIVE);
+  //  MYSQL_END_IDLE_WAIT(idle_locker);
+  //  mysql_socket_set_state(net->vio->mysql_socket, PSI_SOCKET_STATE_ACTIVE);
 
   if (packet_length == packet_error)
   {

No bundle (reason: useless for push emails).