database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

fix a nondeterminism in perfschema.statement_program_nesting_event_check test

Browse Source 
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.
This commit is contained in:
Sergei Golubchik
2020-03-16 10:33:16 +01:00
parent 17080cbcf0
commit b55d960e43
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/perfschema/r/statement_program_nesting_event_check.result
View File

@ -155,7 +155,7 @@ SET GLOBAL event_scheduler=OFF;
SELECT EVENT_NAME, SQL_TEXT, OBJECT_NAME, NESTING_EVENT_TYPE, NESTING_EVENT_LEVEL SELECT EVENT_NAME, SQL_TEXT, OBJECT_NAME, NESTING_EVENT_TYPE, NESTING_EVENT_LEVEL
FROM performance_schema.events_statements_history_long FROM performance_schema.events_statements_history_long
WHERE CURRENT_SCHEMA='stored_programs' AND 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; ORDER BY OBJECT_NAME,NESTING_EVENT_LEVEL,SQL_TEXT;
EVENT_NAME SQL_TEXT OBJECT_NAME NESTING_EVENT_TYPE NESTING_EVENT_LEVEL EVENT_NAME SQL_TEXT OBJECT_NAME NESTING_EVENT_TYPE NESTING_EVENT_LEVEL
statement/scheduler/event NULL NULL NULL 0 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 @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 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 fac(5) NULL NULL 0
statement/sql/select SELECT wt_avg(1, 12, 1990, 1121990) 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 statement/sql/set_option SET @a=1 NULL NULL 0

2
mysql-test/suite/perfschema/t/statement_program_nesting_event_check.test
View File

@ -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 SELECT EVENT_NAME, SQL_TEXT, OBJECT_NAME, NESTING_EVENT_TYPE, NESTING_EVENT_LEVEL
FROM performance_schema.events_statements_history_long FROM performance_schema.events_statements_history_long
WHERE CURRENT_SCHEMA='stored_programs' AND 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; ORDER BY OBJECT_NAME,NESTING_EVENT_LEVEL,SQL_TEXT;
TRUNCATE TABLE performance_schema.events_statements_history_long; TRUNCATE TABLE performance_schema.events_statements_history_long;