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

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
930656d5 · unknown · a0e05ed6 · 1e03f6a7 · 930656d5
Commit 930656d5 authored Oct 10, 2007 by unknown
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;
-  thd->transaction_rollback_request= all;
+  if (thd)
+  {
+    thd->is_fatal_sub_stmt_error= TRUE;
+    thd->transaction_rollback_request= all;
+  }
 }
 /***************************************************************************
  Handling of XA id cacheing