database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.0 -> 10.1

Browse Source
This commit is contained in:
Kristian Nielsen
2015-04-20 13:21:58 +02:00
parent c6d08ecce3 519ad0f7e3
commit 791b0ab5db
41 changed files with 1196 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/handler.cc
View File

@ -1577,7 +1577,10 @@ commit_one_phase_2(THD *thd, bool all, THD_TRANS *trans, bool is_real_trans)
}
/* Free resources and perform other cleanup even for 'empty' transactions. */
if (is_real_trans)
{
thd->has_waiter= false;
thd->transaction.cleanup();
}
DBUG_RETURN(error);
}
@ -1658,7 +1661,10 @@ int ha_rollback_trans(THD *thd, bool all)
/* Always cleanup. Even if nht==0. There may be savepoints. */
if (is_real_trans)
{
thd->has_waiter= false;
thd->transaction.cleanup();
}
if (all)
thd->transaction_rollback_request= FALSE;