From: Mayank Prasad
Date: May 25 2012 1:48pm
Subject: bzr push into mysql-trunk branch (mayank.prasad:3900 to 3901) Bug#14117145
List-Archive: http://lists.mysql.com/commits/143957
X-Bug: 14117145
Message-Id: <201205251348.q4PDmvQA006073@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3901 Mayank Prasad	2012-05-25
      Bug #14117145     SPURIOUS TEST FAILURES, TEST PERFORMANCE_SCHEMA.CONNECTION
      
      Details:
       - There were continuous disconnect statements one after another,
         without synchronization. That was causing race conditions.
      
      Fix:
       - Wait for each disconnect to finish explicitly and then do
         further disconnect.

    modified:
      mysql-test/suite/perfschema/include/connection_load.inc
 3900 Alfranio Correia	2012-05-25
      The variable g_stage_name is defined and used in debugging builds
      but is not protected by any specific macro generating failures in
      regular builds where warning messages are transformed in errors.
      
      To fix the problem we protected the variable with DBUG_OFF.

    modified:
      sql/binlog.cc
=== modified file 'mysql-test/suite/perfschema/include/connection_load.inc'
--- a/mysql-test/suite/perfschema/include/connection_load.inc	2011-10-19 21:49:22 +0000
+++ b/mysql-test/suite/perfschema/include/connection_load.inc	2012-05-25 13:47:42 +0000
@@ -186,10 +186,45 @@ call dump_all();
 --connection default
 
 --disconnect con4a
+
+# Wait for the disconnect to complete
+let $wait_condition=
+  select count(*) = 5 from performance_schema.threads
+  where `TYPE`='FOREGROUND' and PROCESSLIST_USER like 'user%';
+--source include/wait_condition.inc
+
 --disconnect con4b
+
+# Wait for the disconnect to complete
+let $wait_condition=
+  select count(*) = 4 from performance_schema.threads
+  where `TYPE`='FOREGROUND' and PROCESSLIST_USER like 'user%';
+--source include/wait_condition.inc
+
 --disconnect con4c
+
+# Wait for the disconnect to complete
+let $wait_condition=
+  select count(*) = 3 from performance_schema.threads
+  where `TYPE`='FOREGROUND' and PROCESSLIST_USER like 'user%';
+--source include/wait_condition.inc
+
 --disconnect con5a
+
+# Wait for the disconnect to complete
+let $wait_condition=
+  select count(*) = 2 from performance_schema.threads
+  where `TYPE`='FOREGROUND' and PROCESSLIST_USER like 'user%';
+--source include/wait_condition.inc
+
 --disconnect con5b
+
+# Wait for the disconnect to complete
+let $wait_condition=
+  select count(*) = 1 from performance_schema.threads
+  where `TYPE`='FOREGROUND' and PROCESSLIST_USER like 'user%';
+--source include/wait_condition.inc
+
 --disconnect con5c
 
 # Wait for the disconnect to complete

No bundle (reason: useless for push emails).