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

MDEV-23445: LIMIT ROWS EXAMINED throws error in Debug build only

Browse Source 
Analysis: When we reach the maximum limit to examine rows killed_state is set
as ABORT. But this isn't an actual error and we still return TRUE. This
eventually sets error as UNKNOWN ERROR.
Fix: Check if need to stop execution by checking the killed state. If we have
to abort it, return false because this isn't an actual error.
This commit is contained in:
Rucha Deodhar
2020-10-08 23:05:35 +05:30
parent 311b7f94e6
commit 00bf48827f
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1932,14 +1932,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 #
if ($have_debug) {
--error ER_UNKNOWN_ERROR
SELECT * FROM INFORMATION_SCHEMA.`COLUMNS` LIMIT ROWS EXAMINED 10; 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 #
--echo # End of 10.2 Test --echo # End of 10.2 Test

5
sql/sql_show.cc
View File

@ -5273,6 +5273,11 @@ int get_all_tables(THD *thd, TABLE_LIST *tables, COND *cond)
free_root(&tmp_mem_root, MY_MARK_BLOCKS_FREE); free_root(&tmp_mem_root, MY_MARK_BLOCKS_FREE);
} }
} }
if (thd->killed == ABORT_QUERY)
{
error= 0;
goto err;
}
} }
} }
} }