diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-03-16 10:33:16 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-03-16 10:33:38 +0100 |
| commit | b55d960e433cb01621f8b1f749e9eae9d2b1c4d9 (patch) | |
| tree | 1a700074128e267642b68ddcdae26af7bcdd2e60 /mysql-test/suite/perfschema | |
| parent | 17080cbcf04ab295806db8aaaeead2696988fab4 (diff) | |
| download | mariadb-git-b55d960e433cb01621f8b1f749e9eae9d2b1c4d9.tar.gz | |
fix a nondeterminism in perfschema.statement_program_nesting_event_check test
when selecting from perfschema, filter out statements
used by the test istself in wait_condition.inc, because they,
by design, can be repeated unpredictable number of times.
Diffstat (limited to 'mysql-test/suite/perfschema')
| -rw-r--r-- | mysql-test/suite/perfschema/r/statement_program_nesting_event_check.result | 4 | ||||
| -rw-r--r-- | mysql-test/suite/perfschema/t/statement_program_nesting_event_check.test | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/mysql-test/suite/perfschema/r/statement_program_nesting_event_check.result b/mysql-test/suite/perfschema/r/statement_program_nesting_event_check.result index a17dc30632d..e045ff7db01 100644 --- a/mysql-test/suite/perfschema/r/statement_program_nesting_event_check.result +++ b/mysql-test/suite/perfschema/r/statement_program_nesting_event_check.result @@ -155,7 +155,7 @@ SET GLOBAL event_scheduler=OFF; SELECT EVENT_NAME, SQL_TEXT, OBJECT_NAME, NESTING_EVENT_TYPE, NESTING_EVENT_LEVEL FROM performance_schema.events_statements_history_long WHERE CURRENT_SCHEMA='stored_programs' AND -(SQL_TEXT not like '%count(*) = 1%' OR SQL_TEXT IS NULL) +(SQL_TEXT not like '%count(*) = %' OR SQL_TEXT IS NULL) ORDER BY OBJECT_NAME,NESTING_EVENT_LEVEL,SQL_TEXT; EVENT_NAME SQL_TEXT OBJECT_NAME NESTING_EVENT_TYPE NESTING_EVENT_LEVEL statement/scheduler/event NULL NULL NULL 0 @@ -270,8 +270,6 @@ statement/sql/select SELECT @change NULL NULL 0 statement/sql/select SELECT @del NULL NULL 0 statement/sql/select SELECT @del NULL NULL 0 statement/sql/select SELECT append("Bolly", "wood") NULL NULL 0 -statement/sql/select SELECT COUNT(*) = 0 FROM information_schema.processlist -WHERE user = 'event_scheduler' NULL NULL 0 statement/sql/select SELECT fac(5) NULL NULL 0 statement/sql/select SELECT wt_avg(1, 12, 1990, 1121990) NULL NULL 0 statement/sql/set_option SET @a=1 NULL NULL 0 diff --git a/mysql-test/suite/perfschema/t/statement_program_nesting_event_check.test b/mysql-test/suite/perfschema/t/statement_program_nesting_event_check.test index 28ad9c76401..20c59e9a3a8 100644 --- a/mysql-test/suite/perfschema/t/statement_program_nesting_event_check.test +++ b/mysql-test/suite/perfschema/t/statement_program_nesting_event_check.test @@ -19,7 +19,7 @@ TRUNCATE TABLE performance_schema.events_statements_history_long; SELECT EVENT_NAME, SQL_TEXT, OBJECT_NAME, NESTING_EVENT_TYPE, NESTING_EVENT_LEVEL FROM performance_schema.events_statements_history_long WHERE CURRENT_SCHEMA='stored_programs' AND - (SQL_TEXT not like '%count(*) = 1%' OR SQL_TEXT IS NULL) + (SQL_TEXT not like '%count(*) = %' OR SQL_TEXT IS NULL) ORDER BY OBJECT_NAME,NESTING_EVENT_LEVEL,SQL_TEXT; TRUNCATE TABLE performance_schema.events_statements_history_long; |