diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-11 09:08:05 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-11 09:08:05 +0300 |
| commit | e0c06f5396df0d38f0e211b1fb5c62d0047aaf5d (patch) | |
| tree | 168ca3896f9c22e82292864bd0cf6bc539fde28b | |
| parent | bafc5c1321a7dff5f2da292111bf98fed9d1658d (diff) | |
| download | mariadb-git-e0c06f5396df0d38f0e211b1fb5c62d0047aaf5d.tar.gz | |
Work around MDEV-23445 in the MDEV-14836 test case
| -rw-r--r-- | mysql-test/main/information_schema,debug.rdiff | 17 | ||||
| -rw-r--r-- | mysql-test/main/information_schema.result | 8 | ||||
| -rw-r--r-- | mysql-test/main/information_schema.test | 7 |
3 files changed, 27 insertions, 5 deletions
diff --git a/mysql-test/main/information_schema,debug.rdiff b/mysql-test/main/information_schema,debug.rdiff new file mode 100644 index 00000000000..afbdde30ab3 --- /dev/null +++ b/mysql-test/main/information_schema,debug.rdiff @@ -0,0 +1,17 @@ +--- mysql-test/main/information_schema.result ++++ mysql-test/main/information_schema.result +@@ -2208,9 +2208,11 @@ + # Diagnostics_area::sql_errno upon query from I_S with LIMIT ROWS EXAMINED + # + 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 671 rows, which exceeds LIMIT ROWS EXAMINED (10). The query result may be incomplete ++ERROR HY000: Unknown error ++SHOW WARNINGS; ++Level Code Message ++Error 1105 Unknown error ++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.result b/mysql-test/main/information_schema.result index 94e7244a316..f7bff84e220 100644 --- a/mysql-test/main/information_schema.result +++ b/mysql-test/main/information_schema.result @@ -2208,11 +2208,9 @@ SCHEMA_NAME # 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 -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 +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 671 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 dd2b723e6ee..22baad77a69 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/maybe_debug.inc + set global sql_mode=""; set local sql_mode=""; @@ -1930,9 +1932,14 @@ 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 # +if ($have_debug) { --error ER_UNKNOWN_ERROR SELECT * FROM INFORMATION_SCHEMA.`COLUMNS` LIMIT ROWS EXAMINED 10; SHOW WARNINGS; +} +if (!$have_debug) { +SELECT * FROM INFORMATION_SCHEMA.`COLUMNS` LIMIT ROWS EXAMINED 10; +} --echo # --echo # End of 10.2 Test |