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

[Christopher Powers]

 3352 Christopher Powers	2011-08-06
      WL#4896 "Performance Schema Net IO"
      
      - PB debugging socket_summary_by_instance_func.test

    added:
      mysql-test/collections/mysql-trunk-wl4896.push
    modified:
      mysql-test/suite/perfschema/include/socket_summary_check.inc*
 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
=== added file 'mysql-test/collections/mysql-trunk-wl4896.push'
--- a/mysql-test/collections/mysql-trunk-wl4896.push	1970-01-01 00:00:00 +0000
+++ b/mysql-test/collections/mysql-trunk-wl4896.push	2011-08-06 17:22:25 +0000
@@ -0,0 +1,2 @@
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=n_mix --vardir=var-n_mix --mysqld=--binlog-format=mixed --skip-ndb --suite=perfschema socket_summary_by_instance_func.test
+

=== modified file 'mysql-test/suite/perfschema/include/socket_summary_check.inc' (properties changed: -x to +x)
--- a/mysql-test/suite/perfschema/include/socket_summary_check.inc	2011-08-05 23:59:49 +0000
+++ b/mysql-test/suite/perfschema/include/socket_summary_check.inc	2011-08-06 17:22:25 +0000
@@ -86,10 +86,10 @@ COUNT_WRITE * AVG_TIMER_WRITE BETWEEN SU
 COUNT_MISC  * AVG_TIMER_MISC  BETWEEN SUM_TIMER_MISC  * $my_lo AND SUM_TIMER_MISC  * $my_hi;
 
 let $part=
-SUM_TIMER_WAIT  * $my_lo, COUNT_STAR  * AVG_TIMER_WAIT,  SUM_TIMER_WAIT  * $my_hi, COUNT_STAR,
-SUM_TIMER_READ  * $my_lo, COUNT_READ  * AVG_TIMER_READ,  SUM_TIMER_READ  * $my_hi, COUNT_READ,
-SUM_TIMER_WRITE * $my_lo, COUNT_WRITE * AVG_TIMER_WRITE, SUM_TIMER_WRITE * $my_hi, COUNT_WRITE,
-SUM_TIMER_MISC  * $my_lo, COUNT_MISC  * AVG_TIMER_MISC,  SUM_TIMER_MISC  * $my_hi, COUNT_MISC;
+SUM_TIMER_WAIT  * $my_lo, COUNT_STAR  * AVG_TIMER_WAIT,  SUM_TIMER_WAIT  * $my_hi, COUNT_STAR,  SUM_TIMER_WAIT,  AVG_TIMER_WAIT,
+SUM_TIMER_READ  * $my_lo, COUNT_READ  * AVG_TIMER_READ,  SUM_TIMER_READ  * $my_hi, COUNT_READ,  SUM_TIMER_READ,  AVG_TIMER_READ,
+SUM_TIMER_WRITE * $my_lo, COUNT_WRITE * AVG_TIMER_WRITE, SUM_TIMER_WRITE * $my_hi, COUNT_WRITE, SUM_TIMER_WRITE, AVG_TIMER_WRITE,
+SUM_TIMER_MISC  * $my_lo, COUNT_MISC  * AVG_TIMER_MISC,  SUM_TIMER_MISC  * $my_hi, COUNT_MISC,  SUM_TIMER_MISC,  AVG_TIMER_MISC;
 
 if(`SELECT SUM($my_rules) <> COUNT(*) FROM mysqltest.my_socket_summary_by_instance
     WHERE pk = 'After'`)

No bundle (reason: useless for push emails).