summaryrefslogtreecommitdiff
path: root/mysql-test/main/information_schema.result
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-08-11 10:53:28 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-08-11 10:53:28 +0300
commitc86114f5948667cebbe7196238face06266d8572 (patch)
tree787d935fe909d30905e30bc0bc9eaef07f10c940 /mysql-test/main/information_schema.result
parent909d362fdb5fb05cd6467beffcd1cef6b9b454b3 (diff)
parente0c06f5396df0d38f0e211b1fb5c62d0047aaf5d (diff)
downloadmariadb-git-c86114f5948667cebbe7196238face06266d8572.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/main/information_schema.result')
-rw-r--r--mysql-test/main/information_schema.result15
1 files changed, 10 insertions, 5 deletions
diff --git a/mysql-test/main/information_schema.result b/mysql-test/main/information_schema.result
index b1eff9eb237..cf43d201ecb 100644
--- a/mysql-test/main/information_schema.result
+++ b/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