summaryrefslogtreecommitdiff
path: root/storage/maria/ma_commit.c
diff options
context:
space:
mode:
Diffstat (limited to 'storage/maria/ma_commit.c')
-rw-r--r--storage/maria/ma_commit.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/storage/maria/ma_commit.c b/storage/maria/ma_commit.c
index 0ae3868dbf6..f557cd211e2 100644
--- a/storage/maria/ma_commit.c
+++ b/storage/maria/ma_commit.c
@@ -98,7 +98,12 @@ int maria_commit(MARIA_HA *info)
if (!info->s->now_transactional)
return 0;
trn= info->trn;
- info->trn= 0; /* checked in maria_close() */
+ /*
+ trn is reset as it's checked in maria_close
+ Note that info is still linked in info->trn->used_instances, as this is
+ used in ha_maria::implicit_commit()
+ */
+ info->trn= 0;
return ma_commit(trn);
}