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

svoj · svoj · commit ca291015bcb9 · 2018-03-23T15:33:53.000+04:00
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-&gt;killed flag check for each processed row.
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
@@ -3483,6 +3483,13 @@ extern ST_SCHEMA_TABLE schema_tables[];
 bool schema_table_store_record(THD *thd, TABLE *table)
 {
   int error;
+
+  if (thd->killed)
+  {
+    thd->send_kill_message();
+    return 1;
+  }
+
   if ((error= table->file->ha_write_tmp_row(table->record[0])))
   {
     TMP_TABLE_PARAM *param= table->pos_in_table_list->schema_table_param;

Original file line number	Diff line number	Diff line change
`@@ -3483,6 +3483,13 @@ extern ST_SCHEMA_TABLE schema_tables[];`
`3483`	`3483`	`bool schema_table_store_record(THD thd, TABLE table)`
`3484`	`3484`	`{`
`3485`	`3485`	`int error;`
	`3486`	`+`
	`3487`	`+ if (thd->killed)`
	`3488`	`+ {`
	`3489`	`+ thd->send_kill_message();`
	`3490`	`+ return 1;`
	`3491`	`+ }`
	`3492`	`+`
`3486`	`3493`	`if ((error= table->file->ha_write_tmp_row(table->record[0])))`
`3487`	`3494`	`{`
`3488`	`3495`	`TMP_TABLE_PARAM *param= table->pos_in_table_list->schema_table_param;`