diff options
| author | Bjorn Munch <bjorn.munch@oracle.com> | 2011-02-24 15:13:23 +0100 |
|---|---|---|
| committer | Bjorn Munch <bjorn.munch@oracle.com> | 2011-02-24 15:13:23 +0100 |
| commit | 6781bc56d59974c50a4ef2c96b49d8e827e1a259 (patch) | |
| tree | 594478f4b05c403185ebe67179c146e19f6ce481 /sql/transaction.cc | |
| parent | 7391a6356c504b2742e56bfc8cb3e5dd9193f05f (diff) | |
| parent | 69b82937591f6e5cf30ec75d1ba7caf0cb69ead4 (diff) | |
| download | mariadb-git-6781bc56d59974c50a4ef2c96b49d8e827e1a259.tar.gz | |
merge from 5.5 main
Diffstat (limited to 'sql/transaction.cc')
| -rw-r--r-- | sql/transaction.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/transaction.cc b/sql/transaction.cc index b331fea89fe..85686810893 100644 --- a/sql/transaction.cc +++ b/sql/transaction.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2008 Sun/MySQL +/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -635,8 +635,9 @@ bool trans_xa_commit(THD *thd) if (xa_trans_rolled_back(&thd->transaction.xid_state)) { - if ((res= test(ha_rollback_trans(thd, TRUE)))) + if (ha_rollback_trans(thd, TRUE)) my_error(ER_XAER_RMERR, MYF(0)); + res= thd->is_error(); } else if (xa_state == XA_IDLE && thd->lex->xa_opt == XA_ONE_PHASE) { |