diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-11-10 20:30:50 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-12-10 08:45:20 +0100 |
| commit | 589479b3ecd3ed4df5d03a844173830a30f70d83 (patch) | |
| tree | 1177296396cbff6b3b1965709197981810179edb | |
| parent | b31912fd3525be526cd2852e376bd7d1e7ec4d31 (diff) | |
| download | mariadb-git-589479b3ecd3ed4df5d03a844173830a30f70d83.tar.gz | |
MDEV-14836 Assertion `m_status == DA_ERROR' failed in Diagnostics_area::sql_errno upon query from I_S with LIMIT ROWS EXAMINED
Make the test case more robust. We only care that the query returns
no rows and that the server doesn't crash.
| -rw-r--r-- | mysql-test/r/information_schema.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/information_schema.test | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result index dc772eecc62..db416f983e3 100644 --- a/mysql-test/r/information_schema.result +++ b/mysql-test/r/information_schema.result @@ -2194,7 +2194,7 @@ SCHEMA_NAME SELECT * FROM INFORMATION_SCHEMA.`COLUMNS` LIMIT ROWS EXAMINED 10; TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME ORDINAL_POSITION COLUMN_DEFAULT IS_NULLABLE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE DATETIME_PRECISION CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE COLUMN_KEY EXTRA PRIVILEGES COLUMN_COMMENT IS_GENERATED GENERATION_EXPRESSION Warnings: -Warning 1931 Query execution was interrupted. The query examined at least 666 rows, which exceeds LIMIT ROWS EXAMINED (10). The query result may be incomplete +Warning 1931 Query execution was interrupted. The query examined at least ### rows, which exceeds LIMIT ROWS EXAMINED (10). The query result may be incomplete # # End of 10.2 Test # diff --git a/mysql-test/t/information_schema.test b/mysql-test/t/information_schema.test index df00ff26908..cd30c2103a0 100644 --- a/mysql-test/t/information_schema.test +++ b/mysql-test/t/information_schema.test @@ -1914,6 +1914,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 # +replace_regex /at least \d+ rows/at least ### rows/; SELECT * FROM INFORMATION_SCHEMA.`COLUMNS` LIMIT ROWS EXAMINED 10; --echo # |