Skip to content

Commit 02fe997

Browse files
committed
fix a nondeterminism in perfschema.statement_program_non_nested 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.
1 parent 121a5e8 commit 02fe997

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

mysql-test/suite/perfschema/r/statement_program_non_nested.result

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ SELECT EVENT_NAME, SQL_TEXT, CURRENT_SCHEMA, OBJECT_TYPE, OBJECT_SCHEMA,
174174
OBJECT_NAME, NESTING_EVENT_TYPE, NESTING_EVENT_LEVEL FROM
175175
performance_schema.events_statements_history_long WHERE
176176
CURRENT_SCHEMA='stored_programs' AND
177-
(SQL_TEXT not like '%count(*) = 1%' OR SQL_TEXT IS NULL)
177+
(SQL_TEXT not like '%count(*) = %' OR SQL_TEXT IS NULL)
178178
ORDER BY OBJECT_NAME, NESTING_EVENT_LEVEL, SQL_TEXT;
179179
EVENT_NAME SQL_TEXT CURRENT_SCHEMA OBJECT_TYPE OBJECT_SCHEMA OBJECT_NAME NESTING_EVENT_TYPE NESTING_EVENT_LEVEL
180180
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
289289
statement/sql/select SELECT @del stored_programs NULL NULL NULL NULL 0
290290
statement/sql/select SELECT @del stored_programs NULL NULL NULL NULL 0
291291
statement/sql/select SELECT append("Bolly", "wood") stored_programs NULL NULL NULL NULL 0
292-
statement/sql/select SELECT COUNT(*) = 0 FROM information_schema.processlist
293-
WHERE user = 'event_scheduler' stored_programs NULL NULL NULL NULL 0
294292
statement/sql/select SELECT fac(5) stored_programs NULL NULL NULL NULL 0
295293
statement/sql/select SELECT OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME, COUNT_STAR, COUNT_STATEMENTS
296294
FROM performance_schema.events_statements_summary_by_program

mysql-test/suite/perfschema/t/statement_program_non_nested.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ SELECT EVENT_NAME, SQL_TEXT, CURRENT_SCHEMA, OBJECT_TYPE, OBJECT_SCHEMA,
2323
OBJECT_NAME, NESTING_EVENT_TYPE, NESTING_EVENT_LEVEL FROM
2424
performance_schema.events_statements_history_long WHERE
2525
CURRENT_SCHEMA='stored_programs' AND
26-
(SQL_TEXT not like '%count(*) = 1%' OR SQL_TEXT IS NULL)
26+
(SQL_TEXT not like '%count(*) = %' OR SQL_TEXT IS NULL)
2727
ORDER BY OBJECT_NAME, NESTING_EVENT_LEVEL, SQL_TEXT;
2828

2929

0 commit comments

Comments
 (0)