diff --git a/sql/xa.cc b/sql/xa.cc index 6abc12b..aa94652 100644 --- a/sql/xa.cc +++ b/sql/xa.cc @@ -324,7 +331,7 @@ bool Sql_cmd_xa_commit::trans_xa_commit(THD *thd) my_error(ER_XAER_NOTA, MYF(0)); DBUG_RETURN(true); } - else if (thd->in_multi_stmt_transaction_mode()) + else if (thd->in_active_multi_stmt_transaction()) { my_error(ER_XAER_RMFAIL, MYF(0), xid_state->state_name()); LogDebug("xid_state:%s",xid_state->to_string(xid_state_str).c_str()); @@ -546,7 +561,7 @@ bool Sql_cmd_xa_rollback::trans_xa_rollback(THD *thd) my_error(ER_XAER_NOTA, MYF(0)); DBUG_RETURN(true); } - else if (thd->in_multi_stmt_transaction_mode()) + else if (thd->in_active_multi_stmt_transaction()) { my_error(ER_XAER_RMFAIL, MYF(0), xid_state->state_name()); LogDebug("xid_state:%s",xid_state->to_string(xid_state_str).c_str());