database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2020-08-11 11:12:45 +03:00
parent 1c58748196 c86114f594
commit 0718b8ecbf
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mysql-test/main/information_schema.result
View File

@ -2224,11 +2224,16 @@ SCHEMA_NAME
# MDEV-14836: Assertion `m_status == DA_ERROR' failed in # MDEV-14836: Assertion `m_status == DA_ERROR' failed in
# Diagnostics_area::sql_errno upon query from I_S with LIMIT ROWS EXAMINED # Diagnostics_area::sql_errno upon query from I_S with LIMIT ROWS EXAMINED
# #
SELECT * FROM INFORMATION_SCHEMA.`COLUMNS` LIMIT ROWS EXAMINED 10; SELECT * FROM seq_1_to_100 LIMIT ROWS EXAMINED 10;
ERROR HY000: Unknown error seq
SHOW WARNINGS; 1
Level Code Message 2
Error 1105 Unknown error 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 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 # End of 10.2 Test

6
mysql-test/main/information_schema.test
View File

@ -17,6 +17,8 @@
--source include/default_optimizer_switch.inc --source include/default_optimizer_switch.inc
--source include/default_charset.inc --source include/default_charset.inc
--source include/have_sequence.inc
set global sql_mode=""; set global sql_mode="";
set local 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 # Diagnostics_area::sql_errno upon query from I_S with LIMIT ROWS EXAMINED
--echo # --echo #
--error ER_UNKNOWN_ERROR SELECT * FROM seq_1_to_100 LIMIT ROWS EXAMINED 10;
SELECT * FROM INFORMATION_SCHEMA.`COLUMNS` LIMIT ROWS EXAMINED 10;
SHOW WARNINGS;
--echo # --echo #
--echo # End of 10.2 Test --echo # End of 10.2 Test