Skip to content

Commit 0718b8e

Browse files
committed
Merge 10.4 into 10.5
2 parents 1c58748 + c86114f commit 0718b8e

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

mysql-test/main/information_schema.result

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2224,11 +2224,16 @@ SCHEMA_NAME
22242224
# MDEV-14836: Assertion `m_status == DA_ERROR' failed in
22252225
# Diagnostics_area::sql_errno upon query from I_S with LIMIT ROWS EXAMINED
22262226
#
2227-
SELECT * FROM INFORMATION_SCHEMA.`COLUMNS` LIMIT ROWS EXAMINED 10;
2228-
ERROR HY000: Unknown error
2229-
SHOW WARNINGS;
2230-
Level Code Message
2231-
Error 1105 Unknown error
2227+
SELECT * FROM seq_1_to_100 LIMIT ROWS EXAMINED 10;
2228+
seq
2229+
1
2230+
2
2231+
3
2232+
4
2233+
5
2234+
6
2235+
7
2236+
Warnings:
22322237
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
22332238
#
22342239
# End of 10.2 Test

mysql-test/main/information_schema.test

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
--source include/default_optimizer_switch.inc
1818
--source include/default_charset.inc
1919

20+
--source include/have_sequence.inc
21+
2022
set global sql_mode="";
2123
set local sql_mode="";
2224

@@ -1928,9 +1930,7 @@ SELECT SCHEMA_NAME from information_schema.schemata where schema_name=REPEAT('a'
19281930
--echo # Diagnostics_area::sql_errno upon query from I_S with LIMIT ROWS EXAMINED
19291931
--echo #
19301932

1931-
--error ER_UNKNOWN_ERROR
1932-
SELECT * FROM INFORMATION_SCHEMA.`COLUMNS` LIMIT ROWS EXAMINED 10;
1933-
SHOW WARNINGS;
1933+
SELECT * FROM seq_1_to_100 LIMIT ROWS EXAMINED 10;
19341934

19351935
--echo #
19361936
--echo # End of 10.2 Test

0 commit comments

Comments
 (0)