From: Marc Alff
Date: November 16 2010 5:28am
Subject: bzr push into mysql-trunk branch (marc.alff:3346 to 3347)
List-Archive: http://lists.mysql.com/commits/123980
Message-Id: <201011160530.oAG0pUjY004206@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3347 Marc Alff	2010-11-16 [merge]
      local merge

    modified:
      mysql-test/suite/perfschema/t/threads_mysql.test
 3346 Anitha Gopi	2010-11-16
      Removed collections for next-mr

    removed:
      mysql-test/collections/mysql-next-mr-rpl-merge.push
      mysql-test/collections/mysql-next-mr-wl4445.push
      mysql-test/collections/mysql-next-mr.push
=== modified file 'mysql-test/suite/perfschema/t/threads_mysql.test'
--- a/mysql-test/suite/perfschema/t/threads_mysql.test	2010-11-09 14:34:29 +0000
+++ b/mysql-test/suite/perfschema/t/threads_mysql.test	2010-11-11 14:34:48 +0000
@@ -22,13 +22,25 @@
 --source include/not_embedded.inc
 --source include/have_perfschema.inc
 
-# Ensure that the event scheduler (started via threads_events-master.opt)
+# Ensure that the event scheduler (started via threads_mysql-master.opt)
 # is really running.
 --source include/running_event_scheduler.inc
 
 SET GLOBAL event_scheduler = OFF;
 --source include/no_running_event_scheduler.inc
 
+# threads are removed from:
+# - information_schema.processlist
+# - performance_schema.threads
+# at different times, so we may have to wait a little more
+# for the event_scheduler to shutdown
+#
+let $wait_timeout= 1;
+let $wait_condition=
+  SELECT COUNT(*) = 0 FROM performance_schema.threads
+  WHERE name like 'thread/sql/event%';
+--source include/wait_condition.inc
+
 --vertical_results
 
 # Show all "system" threads except the event scheduler

No bundle (reason: useless for push emails).