Skip to content
Permalink
Browse files
MDEV-23445: LIMIT ROWS EXAMINED throws error in Debug build only
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.
  • Loading branch information
mariadb-RuchaDeodhar committed Oct 20, 2020
1 parent 311b7f9 commit 00bf488
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
@@ -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 #

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

0 comments on commit 00bf488

Please sign in to comment.