Modified logic.

pranavktiwari · pranavktiwari · commit a104ea0180e3 · 2026-07-30T14:26:50.000+05:30
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
@@ -2672,7 +2672,7 @@ Locked_tables_list::init_locked_tables(THD *thd)
                            &db.str, (size_t) db.length + 1,
                            &table_name.str, (size_t) table_name.length + 1,
                            &alias.str, (size_t) alias.length + 1,
-                           NullS))
+                           NullS) || thd->killed)
     {
       reset();
       return TRUE;
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
@@ -5038,10 +5038,7 @@ mysql_execute_command(THD *thd, bool is_called_from_prepared_stmt)
     {
       if (thd->variables.query_cache_wlock_invalidate)
 	query_cache_invalidate_locked_for_write(thd, first_table);
-      if (!thd->killed)
-      {
-        my_ok(thd);
-      }
+      my_ok(thd);
     }
     break;
   case SQLCOM_BACKUP:

Original file line number	Diff line number	Diff line change
`@@ -2672,7 +2672,7 @@ Locked_tables_list::init_locked_tables(THD *thd)`
`2672`	`2672`	`&db.str, (size_t) db.length + 1,`
`2673`	`2673`	`&table_name.str, (size_t) table_name.length + 1,`
`2674`	`2674`	`&alias.str, (size_t) alias.length + 1,`
`2675`		`- NullS))`
	`2675`	`+ NullS) \|\| thd->killed)`
`2676`	`2676`	`{`
`2677`	`2677`	`reset();`
`2678`	`2678`	`return TRUE;`
Original file line number	Diff line number	Diff line change
`@@ -5038,10 +5038,7 @@ mysql_execute_command(THD *thd, bool is_called_from_prepared_stmt)`
`5038`	`5038`	`{`
`5039`	`5039`	`if (thd->variables.query_cache_wlock_invalidate)`
`5040`	`5040`	`query_cache_invalidate_locked_for_write(thd, first_table);`
`5041`		`- if (!thd->killed)`
`5042`		`- {`
`5043`		`- my_ok(thd);`
`5044`		`- }`
	`5041`	`+ my_ok(thd);`
`5045`	`5042`	`}`
`5046`	`5043`	`break;`
`5047`	`5044`	`case SQLCOM_BACKUP:`