diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-11 10:53:28 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-11 10:53:28 +0300 |
| commit | c86114f5948667cebbe7196238face06266d8572 (patch) | |
| tree | 787d935fe909d30905e30bc0bc9eaef07f10c940 | |
| parent | 909d362fdb5fb05cd6467beffcd1cef6b9b454b3 (diff) | |
| parent | e0c06f5396df0d38f0e211b1fb5c62d0047aaf5d (diff) | |
| download | mariadb-git-c86114f5948667cebbe7196238face06266d8572.tar.gz | |
Merge 10.3 into 10.4
| -rw-r--r-- | mysql-test/main/information_schema.result | 15 | ||||
| -rw-r--r-- | mysql-test/main/information_schema.test | 6 |
2 files changed, 13 insertions, 8 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 diff --git a/mysql-test/main/information_schema.test b/mysql-test/main/information_schema.test index 12b940c66b0..c3308224dbc 100644 --- a/mysql-test/main/information_schema.test +++ b/mysql-test/main/information_schema.test @@ -20,6 +20,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=""; @@ -1931,9 +1933,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 |