bzr commit into mysql-trunk branch (marc.alff:3347)

[Marc Alff]

#At file:///Users/malff/BZR_TREE/mysql-trunk-bugfixing-57915/ based on revid:anitha.gopi@stripped

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

    modified:
      mysql-test/suite/perfschema/t/threads_mysql.test
=== 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: revision is a merge).