diff options
| author | unknown <jimw@mysql.com> | 2006-01-06 08:34:55 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2006-01-06 08:34:55 -0800 |
| commit | bf1ebe98dfe51c7f7b13e783cd13d8362a26afbf (patch) | |
| tree | 2051ec4c25b53bd0dfb5b8f24c5b125bbc2c45f9 /sql/handler.cc | |
| parent | f3915a41647978a71aedb209a28f8b61f1dd4cd5 (diff) | |
| parent | 4d09673065bba0434909ad09b7f9ecd82752c8db (diff) | |
| download | mariadb-git-bf1ebe98dfe51c7f7b13e783cd13d8362a26afbf.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-5.0-14212
into mysql.com:/home/jimw/my/mysql-5.0-clean
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
mysql-test/r/bdb.result:
Resolve conflict
mysql-test/t/bdb.test:
Resolve conflict
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 4b4c446f09b..4e128eb5938 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -1926,7 +1926,8 @@ int ha_enable_transaction(THD *thd, bool on) is an optimization hint that storage engine is free to ignore. So, let's commit an open transaction (if any) now. */ - error= end_trans(thd, COMMIT); + if (!(error= ha_commit_stmt(thd))) + error= end_trans(thd, COMMIT); } DBUG_RETURN(error); } |