From: Marc Alff
Date: November 11 2010 2:34pm
Subject: bzr commit into mysql-next-mr branch (marc.alff:3381) Bug#57915 WL#4674
List-Archive: http://lists.mysql.com/commits/123627
X-Bug: 57915
Message-Id: <201011111436.oABEaE8q009543@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0146222840311861386=="

--===============0146222840311861386==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///Users/malff/BZR_TREE/mysql-next-mr-bugfixing-57915/ based on revid:svoj@stripped

 3381 Marc Alff	2010-11-11
      Bug#57915 perfschema.threads_mysql fails sporadically after WL#4674
      
      Fixed the new performance_schema.threads_mysql test case to be more robust,
      to avoid spurious failures.

    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


--===============0146222840311861386==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/marc.alff@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@stripped
# target_branch: file:///Users/malff/BZR_TREE/mysql-next-mr-bugfixing-\
#   57915/
# testament_sha1: 5191fbef47e1f631f5cb54ccca9f39efa3a58fb4
# timestamp: 2010-11-11 15:34:57 +0100
# base_revision_id: svoj@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYDIwgIAAa3fgCAQXvf//3tH
noC////wUARmkwrPWq3bN6er2GSEyT1E8Q0wIxNUPaJNHqeptTagZG9TUaBKKGmBGmgU9TT0UA0D
QAAABoEkmmiRieoTJNpNNDYoNHqZAA0NAAZKmQ0yABkGgGg0GIaAyAAEpNKntT0FNkno1NHkaQ0B
oNA0MJkYmSQgcpZ7InK8aDQLfPytxiZ0svYLY75ARazTtYgz5KWX3KEgjixcNdUSIhmm/JfBkoY1
gkSAJGF/ebLzidaJIvWtuwMNR2xKO2v0Zp+Vuxl6eWWMvbT+cdIGtn58+OipWuEaLTiGh4yiDbKu
CsqQi0nw/VAydyqkC7OPFc0AfuLDiCLOo7JswODq0T4jHuft7c76twAsJHZFbEUA1KZmbs2KfZCA
OCMHJwQpCIaStPrXHCy1IpPImU2tyi1p0GCNbbmqhdU1Go08HQUZAwh51nWOKjY9XvLL8c136xcH
wf0c15OTvRIuFiU1fogi8xAi9TJm1V558OZhaHjWLsIKjq0RhhhgXEcSrscRSqrJ4c60nVxErEob
7s6mpunDMTCTTM1wvcbdZjYwdrYxGNu443TKP0xlQtJzmwtzxSjmbm2xhrbXo/TRNy7aJAuvGjyi
Onejy0kycHplr3y9ToKWarYKz66GiRbVjmwtbApPoVRXTZ5UNeTv3M8+0JN6wHZdKaW5zTKvLHGC
tYRrGOrRWq0NAdAWq8HbxT7kwDNjKApLumiX+FCX5YQEHOlivODlj+2iHqIfR/XLjB6ZF9YVicTJ
IRgTzWxhUYMJiLXAXjAc29SvEe/qiFkYxAw9IsvFAGA0BkAn8aCihH4/toDNIQ2FgZOoopXKU0PO
oagoO7b+/p66cCJSAs9ghs4zyydBHxpAsd0InUUrVELKzgiGPWbZich6nZhrKvW243TMDiy4NNWj
SKpohYKniyvSWkDNUsV/Vo+lN166YHHh/mAml/s+Smr6rDpuw4GdUYBRJxVAwnZ8H91GnLl7sVtr
SS5NvVQeRnkRECAIdUsiJTOqe4CtHQ21ArphAVGYMjHhcHI6TshjFv03WuAjLAqcKA9P6p01MrZk
YeR5Pae+HRQT7bG8Wc7ga8GysnvhJxD5gkc1CuOtF5cN5SFYaZpzKIAJOCbwI1bqPKqZup6IgTTw
OoCaULRW3znWJltMRynIlV5Gj66giEzAXwUJFCC29EFIS4b5wKomWWwOWxHCq2gBowkQ40u4TMMW
nwwFsDAoxsvgvpQu1qTLRkuSuJVBkOnq4MtpSFcgKoULTIFfVROEG7gCFkEZgZMgLkoFFA4x+KOn
EOQmk7rVa/PXc2vYzKRIK1yc+NYi70F6cC82UlgwSAOuaC95NLgIzUhE8OiCEc8XJTz6NNHg5tE7
1SVJDuMN0sEjjdILlbKacrJNzCtokCKxtcp9UttTIxlZdOOKNLK+CdXlDNJuKW9h/NlpUmTJQMr4
5WUw3RTVd1T62FSi35LPnltbmULbuDEmGQPVHCjkatPfZCWCZ+dHUr1wqs0K1mQ51AMeVLn/wVG/
M/iDqMgWrhukeIW1KsMQKv/F3JFOFCQgMjCAgA==


--===============0146222840311861386==--