diff options
| author | Andrei Elkin <aelkin@mysql.com> | 2009-11-30 14:34:39 +0200 |
|---|---|---|
| committer | Andrei Elkin <aelkin@mysql.com> | 2009-11-30 14:34:39 +0200 |
| commit | 3962da934f6e2a92ba04505bd6a33dd7d8322005 (patch) | |
| tree | c5510a774ac5e8722c26070e21e3d266d6408381 /sql/handler.cc | |
| parent | 13dad4ebd268e4bf26c4d6f478f19896770d9b78 (diff) | |
| parent | a95f54c6d81f20b07e41a7e0e2246ee00641df6c (diff) | |
| download | mariadb-git-3962da934f6e2a92ba04505bd6a33dd7d8322005.tar.gz | |
merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20091104182209-iui387z35159aoyw
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 0a7ea682313..2414ba64196 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -1331,7 +1331,8 @@ int ha_rollback_trans(THD *thd, bool all) } trans->ha_list= 0; trans->no_2pc=0; - if (is_real_trans && thd->transaction_rollback_request) + if (is_real_trans && thd->transaction_rollback_request && + thd->transaction.xid_state.xa_state != XA_NOTR) thd->transaction.xid_state.rm_error= thd->main_da.sql_errno(); if (all) thd->variables.tx_isolation=thd->session_tx_isolation; |