database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

MDEV-10269 - Killed queries from I_S stay in 'Killed' state for long

Browse Source 
time and don't let server shut down

Queries from I_S in "Filling schema table" state didn't check killed
flag. For large tables this phase may take a while to complete.

Fixed by adding thd->killed flag check for each processed row.
This commit is contained in:
Sergey Vojtovich
2018-03-20 17:25:49 +04:00
parent 4092f90655
commit ca291015bc
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_show.cc
View File

@@ -3483,6 +3483,13 @@ extern ST_SCHEMA_TABLE schema_tables[];
bool schema_table_store_record(THD *thd, TABLE *table) bool schema_table_store_record(THD *thd, TABLE *table)
{ {
int error; int error;
if (thd->killed)
{
thd->send_kill_message();
return 1;
}
if ((error= table->file->ha_write_tmp_row(table->record[0]))) if ((error= table->file->ha_write_tmp_row(table->record[0])))
{ {
TMP_TABLE_PARAM *param= table->pos_in_table_list->schema_table_param; TMP_TABLE_PARAM *param= table->pos_in_table_list->schema_table_param;