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

[Christopher Powers]

 3351 Christopher Powers	2011-08-05
      WL#4896 "Performance Schema Net IO"
      
      Disable instrumenting IDLE wait times for testing.

    modified:
      mysql-test/suite/perfschema/include/socket_summary_check.inc
      sql/sql_parse.cc
 3350 Christopher Powers	2011-08-05
      WL#4896 "Performance Schema Net IO"
      
      - Removed unnecessary DBUG_ASSERT()s wreaking havoc on SPARC pushbuild

    modified:
      storage/perfschema/pfs.cc
=== modified file 'mysql-test/suite/perfschema/include/socket_summary_check.inc'
--- a/mysql-test/suite/perfschema/include/socket_summary_check.inc	2011-08-05 00:20:04 +0000
+++ b/mysql-test/suite/perfschema/include/socket_summary_check.inc	2011-08-05 23:59:49 +0000
@@ -76,7 +76,7 @@ if(`SELECT COUNT(*) $part1`)
 #
 #    If we run this check sufficient frequent than AVG_TIMER_* can be removed from other checks.
 #-----------------------------------------------------------------------------------------------
-let $my_lo= 0.80;
+let $my_lo= 0.90;
 let $my_hi= 1.01;
 
 let $my_rules=

=== modified file 'sql/sql_parse.cc'
--- a/sql/sql_parse.cc	2011-08-03 18:29:12 +0000
+++ b/sql/sql_parse.cc	2011-08-05 23:59:49 +0000
@@ -805,7 +805,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 ; */
+  //MYSQL_IDLE_WAIT_VARIABLES(idle_locker, idle_state) /* no ; */
 
   DBUG_ENTER("do_command");
 
@@ -853,13 +853,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);
+  //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).