Skip to content

M
MariaDB
Commit 958ad5a8 authored by Jan Lindström's avatar Jan Lindström
Browse files
Options

MW-388 Fix conflict handling of SPs with DECLARE ... HANDLER 

Adapt to MariaDB case
parent 76f1195f
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
sql/sql_parse.cc
View file @ 958ad5a8
...@@ -5621,7 +5621,7 @@ case SQLCOM_PREPARE: ...@@ -5621,7 +5621,7 @@ case SQLCOM_PREPARE:
if (thd->is_error() || (thd->variables.option_bits & OPTION_MASTER_SQL_ERROR)) if (thd->is_error() || (thd->variables.option_bits & OPTION_MASTER_SQL_ERROR))
trans_rollback_stmt(thd); trans_rollback_stmt(thd);
#ifdef WITH_WSREP #ifdef WITH_WSREP
else if (thd->sp_runtime_ctx && else if (thd->spcont &&
!thd->is_error() && !thd->is_error() &&
!thd->in_multi_stmt_transaction_mode() && !thd->in_multi_stmt_transaction_mode() &&
(thd->wsrep_conflict_state == MUST_ABORT || (thd->wsrep_conflict_state == MUST_ABORT ||
...@@ -5637,7 +5637,7 @@ case SQLCOM_PREPARE: ...@@ -5637,7 +5637,7 @@ case SQLCOM_PREPARE:
*/ */
trans_rollback_stmt(thd); trans_rollback_stmt(thd);
thd->wsrep_conflict_state= NO_CONFLICT; thd->wsrep_conflict_state= NO_CONFLICT;
thd->killed= THD::NOT_KILLED; thd->killed= NOT_KILLED;
} }
#endif /* WITH_WSREP */ #endif /* WITH_WSREP */
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7