database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

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

Browse Source 
Adapt to MariaDB case
This commit is contained in:
Jan Lindström
2017-11-08 12:25:46 +02:00
parent 76f1195f5b
commit 958ad5a880
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_parse.cc
View File

@ -5621,7 +5621,7 @@ finish:
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 @@ finish:
*/ */
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