MDEV-7073 main.information_schema and main.information_schema_all_engines fail...

MDEV-7073 main.information_schema and main.information_schema_all_engines fail in buildbot on a build without perfschema

main.information_schema: added a condition to the query to exclude perfschema tables
main.information_schema_all_engines: added a call to the include file to check for the presence of perfschema

mysql-test/r/information_schema.result

@@ -803,7 +803,7 @@ drop view a2, a1;
 drop table t_crashme;
 select table_schema,table_name, column_name from
 information_schema.columns
-where data_type = 'longtext';
+where data_type = 'longtext' and table_schema != 'performance_schema';
 table_schema	table_name	column_name
 information_schema	ALL_PLUGINS	PLUGIN_DESCRIPTION
 information_schema	COLUMNS	COLUMN_DEFAULT
@@ -821,14 +821,6 @@ information_schema	ROUTINES	ROUTINE_COMMENT
 information_schema	TRIGGERS	ACTION_CONDITION
 information_schema	TRIGGERS	ACTION_STATEMENT
 information_schema	VIEWS	VIEW_DEFINITION
-performance_schema	events_statements_current	SQL_TEXT
-performance_schema	events_statements_current	DIGEST_TEXT
-performance_schema	events_statements_history	SQL_TEXT
-performance_schema	events_statements_history	DIGEST_TEXT
-performance_schema	events_statements_history_long	SQL_TEXT
-performance_schema	events_statements_history_long	DIGEST_TEXT
-performance_schema	events_statements_summary_by_digest	DIGEST_TEXT
-performance_schema	threads	PROCESSLIST_INFO
 select table_name, column_name, data_type from information_schema.columns
 where data_type = 'datetime' and table_name not like 'innodb_%';
 table_name	column_name	data_type

mysql-test/t/information_schema.test

@@ -496,7 +496,7 @@ drop table t_crashme;
 #
 select table_schema,table_name, column_name from
 information_schema.columns
-where data_type = 'longtext';
+where data_type = 'longtext' and table_schema != 'performance_schema';
 select table_name, column_name, data_type from information_schema.columns
 where data_type = 'datetime' and table_name not like 'innodb_%';
 

mysql-test/t/information_schema_all_engines.test

@@ -4,6 +4,7 @@
 
 --source include/not_embedded.inc
 --source include/have_xtradb.inc
+--source include/have_perfschema.inc
 --source include/not_staging.inc
 
 use INFORMATION_SCHEMA;