summaryrefslogtreecommitdiff
path: root/sql/handler.cc
diff options
context:
space:
mode:
authorserg@sergbook.mysql.com <>2002-11-06 09:52:13 +0100
committerserg@sergbook.mysql.com <>2002-11-06 09:52:13 +0100
commitecfa37baa52bb124db1a8e35a2f8b7bef448a816 (patch)
tree80b3f1d019ca187e40e729161a67c9b7941a047c /sql/handler.cc
parent2e1a324a858f2c3fda1ae794e4d1b8c89343cea3 (diff)
parent98579955d60015e3026528b7d7905f31d35a751d (diff)
downloadmariadb-git-ecfa37baa52bb124db1a8e35a2f8b7bef448a816.tar.gz
Merge
Diffstat (limited to 'sql/handler.cc')
-rw-r--r--sql/handler.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/handler.cc b/sql/handler.cc
index 4a43186103c..f2e3e531854 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -311,7 +311,8 @@ int ha_commit_trans(THD *thd, THD_TRANS* trans)
error=1;
}
else
- transaction_commited= 1;
+ if (!(thd->options & OPTION_BEGIN))
+ transaction_commited= 1;
trans->bdb_tid=0;
}
#endif