diff options
| author | unknown <serg@sergbook.mysql.com> | 2002-11-06 09:52:13 +0100 |
|---|---|---|
| committer | unknown <serg@sergbook.mysql.com> | 2002-11-06 09:52:13 +0100 |
| commit | f9b7e3abc8bb0b3440fd2a10e0b201cefb587f4a (patch) | |
| tree | 80b3f1d019ca187e40e729161a67c9b7941a047c /sql/handler.cc | |
| parent | 781c7901cbe120bec3776fcec23fe6fc13ca1e64 (diff) | |
| parent | 0e56af0744cb2d66cc44ee9685f6e94bf6e6a946 (diff) | |
| download | mariadb-git-f9b7e3abc8bb0b3440fd2a10e0b201cefb587f4a.tar.gz | |
Merge
Docs/manual.texi:
SCCS merged
sql/field.h:
SCCS merged
sql/ha_innodb.cc:
SCCS merged
sql/handler.cc:
SCCS merged
sql/item_cmpfunc.cc:
SCCS merged
sql/mysqld.cc:
SCCS merged
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 3 |
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 |