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_non_nested 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-23 10:45:08 +01:00
parent 121a5e8d07
commit 02fe997505
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_non_nested.result
View File

@ -174,7 +174,7 @@ SELECT EVENT_NAME, SQL_TEXT, CURRENT_SCHEMA, OBJECT_TYPE, OBJECT_SCHEMA,
OBJECT_NAME, NESTING_EVENT_TYPE, NESTING_EVENT_LEVEL FROM OBJECT_NAME, NESTING_EVENT_TYPE, NESTING_EVENT_LEVEL FROM
performance_schema.events_statements_history_long WHERE performance_schema.events_statements_history_long WHERE
CURRENT_SCHEMA='stored_programs' AND 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 CURRENT_SCHEMA OBJECT_TYPE OBJECT_SCHEMA OBJECT_NAME NESTING_EVENT_TYPE NESTING_EVENT_LEVEL EVENT_NAME SQL_TEXT CURRENT_SCHEMA OBJECT_TYPE OBJECT_SCHEMA OBJECT_NAME NESTING_EVENT_TYPE NESTING_EVENT_LEVEL
statement/scheduler/event NULL stored_programs NULL NULL NULL NULL 0 statement/scheduler/event NULL stored_programs NULL NULL NULL NULL 0
@ -289,8 +289,6 @@ statement/sql/select SELECT @change stored_programs NULL NULL NULL NULL 0
statement/sql/select SELECT @del stored_programs NULL NULL NULL NULL 0 statement/sql/select SELECT @del stored_programs NULL NULL NULL NULL 0
statement/sql/select SELECT @del stored_programs NULL NULL NULL NULL 0 statement/sql/select SELECT @del stored_programs NULL NULL NULL NULL 0
statement/sql/select SELECT append("Bolly", "wood") stored_programs NULL NULL NULL NULL 0 statement/sql/select SELECT append("Bolly", "wood") stored_programs NULL NULL NULL NULL 0
statement/sql/select SELECT COUNT(*) = 0 FROM information_schema.processlist
WHERE user = 'event_scheduler' stored_programs NULL NULL NULL NULL 0
statement/sql/select SELECT fac(5) stored_programs NULL NULL NULL NULL 0 statement/sql/select SELECT fac(5) stored_programs NULL NULL NULL NULL 0
statement/sql/select SELECT OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME, COUNT_STAR, COUNT_STATEMENTS statement/sql/select SELECT OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME, COUNT_STAR, COUNT_STATEMENTS
FROM performance_schema.events_statements_summary_by_program FROM performance_schema.events_statements_summary_by_program

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

@ -23,7 +23,7 @@ SELECT EVENT_NAME, SQL_TEXT, CURRENT_SCHEMA, OBJECT_TYPE, OBJECT_SCHEMA,
OBJECT_NAME, NESTING_EVENT_TYPE, NESTING_EVENT_LEVEL FROM OBJECT_NAME, NESTING_EVENT_TYPE, NESTING_EVENT_LEVEL FROM
performance_schema.events_statements_history_long WHERE performance_schema.events_statements_history_long WHERE
CURRENT_SCHEMA='stored_programs' AND 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;