bzr push into mysql-trunk branch (marc.alff:3390 to 3391)

[Marc Alff]

 3391 Marc Alff	2011-08-19 [merge]
      Merge mysql-trunk --> mysql-trunk-wl4896

    modified:
      extra/yassl/src/yassl_int.cpp
 3390 Matthias Leich	2011-08-19
      Fixes for tests in WL#4896 PERFORMANCE_SCHEMA Instrumenting Net IO
      
      It is possible that socket_summary_by_instance_win fails.
      I backported improvements from the unix version of the test to this one
      but are unable to run this test.
     @ mysql-test/suite/perfschema/include/wait_till_sleep.inc
        Add missing header
     @ mysql-test/suite/perfschema/r/socket_instances_func.result
        Adjusted result
     @ mysql-test/suite/perfschema/r/socket_instances_func_win.result
        Adjusted result
     @ mysql-test/suite/perfschema/r/socket_summary_by_instance_func.result
        Adjusted result
     @ mysql-test/suite/perfschema/t/socket_instances_func.test
        - Minor beautification in formatting
        - The test failed once at end because of unexpected row
          Fix by adding a wait routine
        - Minor corrections in comments
     @ mysql-test/suite/perfschema/t/socket_instances_func_win.test
        - Minor beautification in formatting
        - The unix variant of this test failed once at end because of unexpected row
          Fix by adding a wait routine
        - Minor corrections in comments
     @ mysql-test/suite/perfschema/t/socket_summary_by_event_name_func.test
        Improve formatting
     @ mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test
        - Add a lot debug code
        - Fixed one instability
        - Some minor improvements
     @ mysql-test/suite/perfschema/t/socket_summary_by_instance_func_win.test
        Port of improvements from the unix version to WIN

    modified:
      mysql-test/suite/perfschema/include/wait_till_sleep.inc
      mysql-test/suite/perfschema/r/socket_instances_func.result
      mysql-test/suite/perfschema/r/socket_instances_func_win.result
      mysql-test/suite/perfschema/r/socket_summary_by_instance_func.result
      mysql-test/suite/perfschema/t/socket_instances_func.test
      mysql-test/suite/perfschema/t/socket_instances_func_win.test
      mysql-test/suite/perfschema/t/socket_summary_by_event_name_func.test
      mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test
      mysql-test/suite/perfschema/t/socket_summary_by_instance_func_win.test
=== modified file 'extra/yassl/src/yassl_int.cpp'
--- a/extra/yassl/src/yassl_int.cpp	2011-07-22 14:32:09 +0000
+++ b/extra/yassl/src/yassl_int.cpp	2011-08-19 15:48:04 +0000
@@ -1810,7 +1810,7 @@ extern "C" char *yassl_mysql_strdup(cons
 
 static int
 default_password_callback(char * buffer, int size_arg, int rwflag,
-                          void * callback_data __attribute__((unused)))
+                          void * /* unused: callback_data */)
 {
   char *passwd;
   size_t passwd_len, size= (size_t) size_arg;

No bundle (reason: useless for push emails).