diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-03-03 13:27:12 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-03-03 13:27:12 +0200 |
| commit | adc91387e3add6d9c850b7c2a44760deaceb3638 (patch) | |
| tree | c772c6339d2f715a1a50766e30790307e0658f3e /mysql-test/suite/perfschema/include | |
| parent | bc28b305e538774eae4152b300cd323e9a724393 (diff) | |
| parent | 29c776cfd1e560846e394f39d79ae43ff7d70c61 (diff) | |
| download | mariadb-git-adc91387e3add6d9c850b7c2a44760deaceb3638.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'mysql-test/suite/perfschema/include')
| -rw-r--r-- | mysql-test/suite/perfschema/include/pfs_no_running_event_scheduler.inc | 10 | ||||
| -rw-r--r-- | mysql-test/suite/perfschema/include/pfs_running_event_scheduler.inc | 10 |
2 files changed, 20 insertions, 0 deletions
diff --git a/mysql-test/suite/perfschema/include/pfs_no_running_event_scheduler.inc b/mysql-test/suite/perfschema/include/pfs_no_running_event_scheduler.inc new file mode 100644 index 00000000000..eff3d7df854 --- /dev/null +++ b/mysql-test/suite/perfschema/include/pfs_no_running_event_scheduler.inc @@ -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 diff --git a/mysql-test/suite/perfschema/include/pfs_running_event_scheduler.inc b/mysql-test/suite/perfschema/include/pfs_running_event_scheduler.inc new file mode 100644 index 00000000000..219a41051fb --- /dev/null +++ b/mysql-test/suite/perfschema/include/pfs_running_event_scheduler.inc @@ -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 |