diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-24 15:17:10 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-24 15:17:10 +0200 |
| commit | 51fc6b91d2d3c40a69b78f2e47641107d65a957b (patch) | |
| tree | 013d20a093f946da101ea005948d50b1820911c5 /sql/sp_head.cc | |
| parent | d456c0707c3da65ee43221df8ceaf662684a49c5 (diff) | |
| parent | 4d9fe4032b768e04e33482d83199882c7bb0d9d8 (diff) | |
| download | mariadb-git-51fc6b91d2d3c40a69b78f2e47641107d65a957b.tar.gz | |
Merge 10.9 into 10.10
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index 45d654c1edd..35bdd4f9f1c 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -1520,7 +1520,7 @@ sp_head::execute(THD *thd, bool merge_da_on_success) wsrep_current_error_status(thd)); thd->wsrep_cs().reset_error(); /* Reset also thd->killed if it has been set during BF abort. */ - if (thd->killed == KILL_QUERY) + if (killed_mask_hard(thd->killed) == KILL_QUERY) thd->killed= NOT_KILLED; /* if failed transaction was not replayed, must return with error from here */ if (!must_replay) err_status = 1; |