database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Auto-merge from mysql-5.1.

Browse Source
This commit is contained in:
Alexander Nozdrin
2009-11-05 12:38:14 +03:00
parent f51d08921a 612a8ccb2c
commit b591221eb1
4 changed files with 97 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/handler.cc
View File

@@ -1312,7 +1312,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;