From 02fe99750536aad7c9e75513be47c91c8c568419 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Mon, 23 Mar 2020 10:45:08 +0100
Subject: [PATCH] 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.
---
 .../suite/perfschema/r/statement_program_non_nested.result    | 4 +---
 .../suite/perfschema/t/statement_program_non_nested.test      | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/mysql-test/suite/perfschema/r/statement_program_non_nested.result b/mysql-test/suite/perfschema/r/statement_program_non_nested.result
index b7de4b84132..af9807cbc97 100644
--- a/mysql-test/suite/perfschema/r/statement_program_non_nested.result
+++ b/mysql-test/suite/perfschema/r/statement_program_non_nested.result
@@ -174,7 +174,7 @@ SELECT EVENT_NAME, SQL_TEXT, CURRENT_SCHEMA, OBJECT_TYPE, OBJECT_SCHEMA,
 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	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
@@ -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 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 OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME, COUNT_STAR, COUNT_STATEMENTS 
 FROM performance_schema.events_statements_summary_by_program
diff --git a/mysql-test/suite/perfschema/t/statement_program_non_nested.test b/mysql-test/suite/perfschema/t/statement_program_non_nested.test
index 2a6b26364ed..559bd03950e 100644
--- a/mysql-test/suite/perfschema/t/statement_program_non_nested.test
+++ b/mysql-test/suite/perfschema/t/statement_program_non_nested.test
@@ -23,7 +23,7 @@ SELECT EVENT_NAME, SQL_TEXT, CURRENT_SCHEMA, OBJECT_TYPE, OBJECT_SCHEMA,
        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;
 
 
-- 
2.30.9