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

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

Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
f6d110dc · tsmith@ramayana.hindu.god · 26b38b04 · ced64f85 · f6d110dc
Commit f6d110dc authored Oct 10, 2007 by tsmith@ramayana.hindu.god
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

sql/sql_class.cc sql/sql_class.cc +5 -2

No files found.
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -2725,8 +2725,11 @@ void THD::restore_sub_statement_state(Sub_statement_state *backup)
 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