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

[Christopher Powers]

 3385 Christopher Powers	2011-08-19
      WL#4896 "Performance Schema Net IO"
      
      New test: socket_summary_by_event_name_func

    modified:
      mysql-test/suite/perfschema/r/socket_summary_by_instance_func.result*
      mysql-test/suite/perfschema/t/socket_summary_by_event_name_func.test
 3384 Christopher Powers	2011-08-19
      WL#4896 "Performance Schema Net IO"
      
      New test: socket_summary_by_event_name_func.test

    added:
      mysql-test/suite/perfschema/r/socket_summary_by_event_name_func.result
      mysql-test/suite/perfschema/t/socket_summary_by_event_name_func.test
=== modified file 'mysql-test/suite/perfschema/r/socket_summary_by_instance_func.result' (properties changed: +x to -x)
=== modified file 'mysql-test/suite/perfschema/t/socket_summary_by_event_name_func.test'
--- a/mysql-test/suite/perfschema/t/socket_summary_by_event_name_func.test	2011-08-19 07:04:02 +0000
+++ b/mysql-test/suite/perfschema/t/socket_summary_by_event_name_func.test	2011-08-19 07:19:08 +0000
@@ -62,6 +62,7 @@ if ($my_socket_debug)
 {
   SELECT @MY_HOSTNAME AS 'Hostname';
   SELECT @MY_MASTER_PORT AS 'Master Port';
+  --echo MASTER_MYPORT=$MASTER_MYPORT
 }
 #==============================================================================
 # Utility queries
@@ -219,14 +220,14 @@ CREATE TABLE mysqltest.t2 (n INT AUTO_IN
 --echo # 2.1 Connection 1 (tcp/ip, 127.0.0.1 or ::1)
 --echo
 --disable_query_log
---connect (con1,$my_localhost,root,,test,,$MASTER_MYPORT)
+--connect (con1,$my_localhost,root,,,,$MASTER_MYPORT)
 --enable_query_log
 
 --echo
 --echo # 2.2 Connection 2 (localhost or unix domain socket)
 --echo
 --disable_query_log
---connect (con2,localhost,root,,test,,$MASTER_MYPORT)
+--connect (con2,localhost,root,,,,)
 --enable_query_log
 
 --echo #==============================================================================

No bundle (reason: useless for push emails).