Merge branch 'mysql-5.6' into mysql-5.7

Author: Sergey Glukhov

mysql-test/r/information_schema.result

@@ -2191,23 +2191,6 @@ ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_
 #
 # Bug#26877788 SELECT FROM INFORMATION_SCHEMA.FILES RETURNS NO RECORDS WHEN ORDER BY IS USED
 #
-EXPLAIN SELECT ENGINE, SUPPORT, TRANSACTIONS FROM INFORMATION_SCHEMA.ENGINES
-WHERE
-SUPPORT IN (
-SELECT DISTINCT SUPPORT
-FROM INFORMATION_SCHEMA.ENGINES
-WHERE
-ENGINE IN (
-SELECT DISTINCT ENGINE FROM INFORMATION_SCHEMA.ENGINES
-WHERE ENGINE IN ('MEMORY')))
-ORDER BY ENGINE;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	<subquery2>	NULL	ALL	NULL	NULL	NULL	NULL	NULL	100.00	Using temporary; Using filesort
-1	SIMPLE	ENGINES	NULL	ALL	NULL	NULL	NULL	NULL	NULL	NULL	Using where; Using join buffer (Block Nested Loop)
-2	MATERIALIZED	ENGINES	NULL	ALL	NULL	NULL	NULL	NULL	NULL	NULL	Using where
-2	MATERIALIZED	ENGINES	NULL	ALL	NULL	NULL	NULL	NULL	NULL	NULL	Using where; Using join buffer (Block Nested Loop)
-Warnings:
-Note	1003	/* select#1 */ select `information_schema`.`ENGINES`.`ENGINE` AS `ENGINE`,`information_schema`.`ENGINES`.`SUPPORT` AS `SUPPORT`,`information_schema`.`ENGINES`.`TRANSACTIONS` AS `TRANSACTIONS` from `INFORMATION_SCHEMA`.`ENGINES` semi join (`INFORMATION_SCHEMA`.`ENGINES` join `INFORMATION_SCHEMA`.`ENGINES`) where ((`information_schema`.`ENGINES`.`SUPPORT` = `<subquery2>`.`SUPPORT`) and (`information_schema`.`ENGINES`.`ENGINE` = `information_schema`.`ENGINES`.`ENGINE`) and (`information_schema`.`ENGINES`.`ENGINE` = 'MEMORY')) order by `information_schema`.`ENGINES`.`ENGINE`
 SELECT ENGINE, SUPPORT, TRANSACTIONS FROM INFORMATION_SCHEMA.ENGINES
 WHERE
 SUPPORT IN (
@@ -2217,15 +2200,10 @@ WHERE
 ENGINE IN (
 SELECT DISTINCT ENGINE FROM INFORMATION_SCHEMA.ENGINES
 WHERE ENGINE IN ('MEMORY')))
-ORDER BY ENGINE;
+ORDER BY ENGINE
+LIMIT 1;
 ENGINE	SUPPORT	TRANSACTIONS
 ARCHIVE	YES	NO
-BLACKHOLE	YES	NO
-CSV	YES	NO
-InnoDB	YES	YES
-MEMORY	YES	NO
-MRG_MYISAM	YES	NO
-PERFORMANCE_SCHEMA	YES	NO
 #
 # End of 5.6 tests
 #

mysql-test/t/information_schema.test

@@ -1909,17 +1909,6 @@ CREATE PROCEDURE information_schema.is() BEGIN END;
 --echo # Bug#26877788 SELECT FROM INFORMATION_SCHEMA.FILES RETURNS NO RECORDS WHEN ORDER BY IS USED
 --echo #
 
-EXPLAIN SELECT ENGINE, SUPPORT, TRANSACTIONS FROM INFORMATION_SCHEMA.ENGINES
-WHERE
-SUPPORT IN (
-SELECT DISTINCT SUPPORT
-FROM INFORMATION_SCHEMA.ENGINES
-WHERE
-ENGINE IN (
-SELECT DISTINCT ENGINE FROM INFORMATION_SCHEMA.ENGINES
-WHERE ENGINE IN ('MEMORY')))
-ORDER BY ENGINE;
-
 SELECT ENGINE, SUPPORT, TRANSACTIONS FROM INFORMATION_SCHEMA.ENGINES
 WHERE
 SUPPORT IN (
@@ -1929,7 +1918,8 @@ WHERE
 ENGINE IN (
 SELECT DISTINCT ENGINE FROM INFORMATION_SCHEMA.ENGINES
 WHERE ENGINE IN ('MEMORY')))
-ORDER BY ENGINE;
+ORDER BY ENGINE
+LIMIT 1;
 
 
 --echo #