diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2007-10-10 14:01:48 -0600 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2007-10-10 14:01:48 -0600 |
| commit | 5597f40f7f6edf7eb1f9c8d4b14000e041f68944 (patch) | |
| tree | a903943e1751a3dbb371a66bf2129d0c44d49b2f /sql/sql_class.cc | |
| parent | 2f26a0124f987e3539b8929fe643ae62f4c3ce62 (diff) | |
| parent | 80ace294160241e48e211965ad412ad1d4806f73 (diff) | |
| download | mariadb-git-5597f40f7f6edf7eb1f9c8d4b14000e041f68944.tar.gz | |
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
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 66a51d5bb00..5e8a8ab658a 100644 --- 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 |