Commit 930656d5 authored by unknown's avatar unknown

Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


sql/sql_class.cc:
  Auto merged
parents a0e05ed6 1e03f6a7
...@@ -2725,8 +2725,11 @@ void THD::restore_sub_statement_state(Sub_statement_state *backup) ...@@ -2725,8 +2725,11 @@ void THD::restore_sub_statement_state(Sub_statement_state *backup)
void mark_transaction_to_rollback(THD *thd, bool all) void mark_transaction_to_rollback(THD *thd, bool all)
{ {
thd->is_fatal_sub_stmt_error= TRUE; if (thd)
thd->transaction_rollback_request= all; {
thd->is_fatal_sub_stmt_error= TRUE;
thd->transaction_rollback_request= all;
}
} }
/*************************************************************************** /***************************************************************************
Handling of XA id cacheing Handling of XA id cacheing
......
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