Merge 10.4 into 10.5

Author: dr-m

mysql-test/main/information_schema.result

@@ -2224,11 +2224,16 @@ SCHEMA_NAME
 # MDEV-14836: Assertion `m_status == DA_ERROR' failed in
 # Diagnostics_area::sql_errno upon query from I_S with LIMIT ROWS EXAMINED
 #
-SELECT * FROM INFORMATION_SCHEMA.`COLUMNS` LIMIT ROWS EXAMINED 10;
-ERROR HY000: Unknown error
-SHOW WARNINGS;
-Level	Code	Message
-Error	1105	Unknown error
+SELECT * FROM seq_1_to_100 LIMIT ROWS EXAMINED 10;
+seq
+1
+2
+3
+4
+5
+6
+7
+Warnings:
 Warning	1931	Query execution was interrupted. The query examined at least 11 rows, which exceeds LIMIT ROWS EXAMINED (10). The query result may be incomplete
 #
 # End of 10.2 Test

mysql-test/main/information_schema.test

@@ -17,6 +17,8 @@
 --source include/default_optimizer_switch.inc
 --source include/default_charset.inc
 
+--source include/have_sequence.inc
+
 set global sql_mode="";
 set local sql_mode="";
 
@@ -1928,9 +1930,7 @@ SELECT SCHEMA_NAME from information_schema.schemata where schema_name=REPEAT('a'
 --echo # Diagnostics_area::sql_errno upon query from I_S with LIMIT ROWS EXAMINED
 --echo #
 
---error ER_UNKNOWN_ERROR
-SELECT * FROM INFORMATION_SCHEMA.`COLUMNS` LIMIT ROWS EXAMINED 10;
-SHOW WARNINGS;
+SELECT * FROM seq_1_to_100 LIMIT ROWS EXAMINED 10;
 
 --echo #
 --echo # End of 10.2 Test