diff options
| author | Peter Wemm <peter@FreeBSD.org> | 2014-09-24 18:12:23 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 2014-09-24 18:12:23 +0000 |
| commit | f5bbf7923e42e842c4c6d067e48b2a94bc40de0d (patch) | |
| tree | 6ea640c5c2b764bc35cadc62d9134dd04f2288be /dbd/apr_dbd_mysql.c | |
| parent | 5bf7090be49a8f79350e8a04ecf260984cb126cf (diff) | |
Vendor import apr-util-1.5.4 - a minor bug fix release.vendor/apr-util/apr-util-1.5.4
Notes
svn path=/vendor/apr-util/dist/; revision=272074
svn path=/vendor/apr-util/apr-util-1.5.4/; revision=272075; tag=vendor/apr-util/apr-util-1.5.4
Diffstat (limited to 'dbd/apr_dbd_mysql.c')
| -rw-r--r-- | dbd/apr_dbd_mysql.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dbd/apr_dbd_mysql.c b/dbd/apr_dbd_mysql.c index 1141c6fd9772..3b8017d85249 100644 --- a/dbd/apr_dbd_mysql.c +++ b/dbd/apr_dbd_mysql.c @@ -1050,9 +1050,9 @@ static int dbd_mysql_end_transaction(apr_dbd_transaction_t *trans) else { ret = mysql_commit(trans->handle->conn); } + ret |= mysql_autocommit(trans->handle->conn, 1); + trans->handle->trans = NULL; } - ret |= mysql_autocommit(trans->handle->conn, 1); - trans->handle->trans = NULL; return ret; } /* Whether or not transactions work depends on whether the |