Skip to content

M
MariaDB
Commit ed4ccf34 authored by Marko Mäkelä's avatar Marko Mäkelä
Browse files
Options

Merge 10.1 into 10.2

parents f13471c9 c738aa24
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
sql/sql_parse.cc
View file @ ed4ccf34
...@@ -6018,7 +6018,7 @@ mysql_execute_command(THD *thd) ...@@ -6018,7 +6018,7 @@ mysql_execute_command(THD *thd)
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
if (thd->spcont && else if (thd->spcont &&
(thd->wsrep_conflict_state == MUST_ABORT || (thd->wsrep_conflict_state == MUST_ABORT ||
thd->wsrep_conflict_state == ABORTED || thd->wsrep_conflict_state == ABORTED ||
thd->wsrep_conflict_state == CERT_FAILURE)) thd->wsrep_conflict_state == CERT_FAILURE))
......
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