diff options
| author | Sunny Bains <Sunny.Bains@Oracle.Com> | 2012-02-10 13:04:10 +1100 |
|---|---|---|
| committer | Sunny Bains <Sunny.Bains@Oracle.Com> | 2012-02-10 13:04:10 +1100 |
| commit | f36fb62badf445b4b1995564368f0ea4b39e3d6d (patch) | |
| tree | 1c639d3995a9ca8241becc17c36254cf8bfc798d /storage/innobase/trx | |
| parent | 17eea529541ecd6615f1c96eea13b07b22ab2fc8 (diff) | |
| parent | c54be492e5fe5322167740183fd715db76ec9852 (diff) | |
| download | mariadb-git-f36fb62badf445b4b1995564368f0ea4b39e3d6d.tar.gz | |
Merge from mysql-5.1-innodb.
Diffstat (limited to 'storage/innobase/trx')
| -rw-r--r-- | storage/innobase/trx/trx0trx.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/innobase/trx/trx0trx.c b/storage/innobase/trx/trx0trx.c index 7b99b86c732..ebbb3f2e447 100644 --- a/storage/innobase/trx/trx0trx.c +++ b/storage/innobase/trx/trx0trx.c @@ -1065,6 +1065,8 @@ trx_commit_off_kernel( ut_ad(UT_LIST_GET_LEN(trx->trx_locks) == 0); UT_LIST_REMOVE(trx_list, trx_sys->trx_list, trx); + + trx->error_state = DB_SUCCESS; } /****************************************************************//** |