diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-01-12 12:33:19 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-01-12 12:33:19 +0200 |
| commit | 0261eac57f137c5daae90f5bb1eaa4bf48ee431b (patch) | |
| tree | 8a21fa13152bd3715b332dc3c15d93e0cb3b3c05 /sql/lock.cc | |
| parent | 428b057ee06dca05a3d20f5b4cc32ceedbc37836 (diff) | |
| parent | 017d1b867b12ff36b3b871c3d57719907a905659 (diff) | |
| download | mariadb-git-0261eac57f137c5daae90f5bb1eaa4bf48ee431b.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'sql/lock.cc')
| -rw-r--r-- | sql/lock.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/lock.cc b/sql/lock.cc index f6cdd40fa0b..9f53ffb3a69 100644 --- a/sql/lock.cc +++ b/sql/lock.cc @@ -356,7 +356,7 @@ bool mysql_lock_tables(THD *thd, MYSQL_LOCK *sql_lock, uint flags) end: THD_STAGE_INFO(thd, org_stage); - if (thd->killed) + if (thd->killed && !thd->get_stmt_da()->is_ok()) { thd->send_kill_message(); if (!rc) |