Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
MDEV-11221 - main.events_restart failed in bb
This is an addition to original fix. Buildbot revealed another sporadic failure in perfschema.threads_mysql test. Tests relies on data stored in performance_schema.threads, while performing waits on information_schema.processlist. These tables are not updated synchronously. Fixed by performing waits on performance_schema.threads instead.
- Loading branch information
Sergey Vojtovich
committed
Mar 2, 2017
1 parent
c1c5b7a
commit 71f53bf
Showing
3 changed files
with
23 additions
and
15 deletions.
There are no files selected for viewing
10 changes: 10 additions & 0 deletions
10
mysql-test/suite/perfschema/include/pfs_no_running_event_scheduler.inc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
# 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_condition= | ||
SELECT COUNT(*) = 0 FROM performance_schema.threads | ||
WHERE name like 'thread/sql/event%'; | ||
--source include/wait_condition.inc |
10 changes: 10 additions & 0 deletions
10
mysql-test/suite/perfschema/include/pfs_running_event_scheduler.inc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
# 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_condition= | ||
SELECT COUNT(*) = 1 FROM performance_schema.threads | ||
WHERE name like 'thread/sql/event%'; | ||
--source include/wait_condition.inc |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters