WL#6616 : WL#6616 PERFORMANCE_SCHEMA, INDEXES

	Fixed tests failures.

Author: mayprasa

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

@@ -9,106 +9,106 @@ into @ename;
 Testing index for columns OBJECT_INSTANCE_BEGIN
 ====================================================================
 ############ Explain for Query ####################################
-explain select COUNT_STAR 
+explain select COUNT(*) 
 from performance_schema.file_summary_by_instance 
 where OBJECT_INSTANCE_BEGIN = "impossible";
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	#	NULL	no matching row in const table
 ############ Explain for Query ####################################
-explain select COUNT_STAR
+explain select COUNT(*)
 from performance_schema.file_summary_by_instance
 where OBJECT_INSTANCE_BEGIN > "impossible";
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	file_summary_by_instance	NULL	ALL	PRIMARY	NULL	NULL	NULL	#	33.33	Using where
 ############ Explain for Query ####################################
-explain select COUNT_STAR
+explain select COUNT(*)
 from performance_schema.file_summary_by_instance
 where OBJECT_INSTANCE_BEGIN < "impossible";
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	file_summary_by_instance	NULL	ALL	PRIMARY	NULL	NULL	NULL	#	33.33	Using where
 ############ Explain for Query ####################################
-explain select COUNT_STAR
+explain select COUNT(*)
 from performance_schema.file_summary_by_instance
 where OBJECT_INSTANCE_BEGIN = @oib;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	file_summary_by_instance	NULL	const	PRIMARY	PRIMARY	8	const	#	100.00	NULL
 ############# Explain End #########################################
 flush status;
-select COUNT_STAR
+select COUNT(*)
 from performance_schema.file_summary_by_instance
 where OBJECT_INSTANCE_BEGIN = @oib;
-COUNT_STAR
+COUNT(*)
 #
 OK: handler_read_key incremented
 
 ====================================================================
 Testing index for columns FILE_NAME
 ====================================================================
 ############ Explain for Query ####################################
-explain select COUNT_STAR 
+explain select COUNT(*) 
 from performance_schema.file_summary_by_instance 
 where FILE_NAME = "impossible";
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	file_summary_by_instance	NULL	ref	FILE_NAME	FILE_NAME	1538	const	#	100.00	NULL
 ############ Explain for Query ####################################
-explain select COUNT_STAR
+explain select COUNT(*)
 from performance_schema.file_summary_by_instance
 where FILE_NAME > "impossible";
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	file_summary_by_instance	NULL	ALL	FILE_NAME	NULL	NULL	NULL	#	33.33	Using where
 ############ Explain for Query ####################################
-explain select COUNT_STAR
+explain select COUNT(*)
 from performance_schema.file_summary_by_instance
 where FILE_NAME < "impossible";
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	file_summary_by_instance	NULL	ALL	FILE_NAME	NULL	NULL	NULL	#	33.33	Using where
 ############ Explain for Query ####################################
-explain select COUNT_STAR
+explain select COUNT(*)
 from performance_schema.file_summary_by_instance
 where FILE_NAME = @fname;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	file_summary_by_instance	NULL	ref	FILE_NAME	FILE_NAME	1538	const	#	100.00	NULL
 ############# Explain End #########################################
 flush status;
-select COUNT_STAR
+select COUNT(*)
 from performance_schema.file_summary_by_instance
 where FILE_NAME = @fname;
-COUNT_STAR
+COUNT(*)
 #
 OK: handler_read_key incremented
 
 ====================================================================
 Testing index for columns EVENT_NAME
 ====================================================================
 ############ Explain for Query ####################################
-explain select COUNT_STAR 
+explain select COUNT(*) 
 from performance_schema.file_summary_by_instance 
 where EVENT_NAME = "impossible";
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	file_summary_by_instance	NULL	ref	EVENT_NAME	EVENT_NAME	386	const	#	100.00	NULL
 ############ Explain for Query ####################################
-explain select COUNT_STAR
+explain select COUNT(*)
 from performance_schema.file_summary_by_instance
 where EVENT_NAME > "impossible";
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	file_summary_by_instance	NULL	ALL	EVENT_NAME	NULL	NULL	NULL	#	33.33	Using where
 ############ Explain for Query ####################################
-explain select COUNT_STAR
+explain select COUNT(*)
 from performance_schema.file_summary_by_instance
 where EVENT_NAME < "impossible";
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	file_summary_by_instance	NULL	ALL	EVENT_NAME	NULL	NULL	NULL	#	33.33	Using where
 ############ Explain for Query ####################################
-explain select COUNT_STAR
+explain select COUNT(*)
 from performance_schema.file_summary_by_instance
 where EVENT_NAME = @ename;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	file_summary_by_instance	NULL	ref	EVENT_NAME	EVENT_NAME	386	const	#	100.00	NULL
 ############# Explain End #########################################
 flush status;
-select COUNT_STAR
+select COUNT(*)
 from performance_schema.file_summary_by_instance
 where EVENT_NAME = @ename;
-COUNT_STAR
+COUNT(*)
 #
 OK: handler_read_key incremented

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

@@ -2,6 +2,7 @@
 
 --source include/not_embedded.inc
 --source include/have_perfschema.inc
+--source include/no_protocol.inc
 
 #setup
 let $select_column = COUNT_STAR;

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

@@ -30,7 +30,7 @@ rollback;
 --connection default
 
 --disable_query_log
---eval select EVENT_ID from performance_schema.events_transactions_history where THREAD_ID = $tid and EVENT_NAME= 'transaction' into @eid;
+--eval select EVENT_ID from performance_schema.events_transactions_history where THREAD_ID = $tid and EVENT_NAME= 'transaction' limit 1 into @eid;
 --eval select $tid into @tid;
 --enable_query_log
 

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

@@ -4,7 +4,7 @@
 --source include/have_perfschema.inc
 
 #setup
-let $select_column = COUNT_STAR;
+let $select_column = COUNT(*);
 let $table = performance_schema.file_summary_by_instance;
 
 select OBJECT_INSTANCE_BEGIN from performance_schema.file_summary_by_instance limit 1