diff options
| author | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2014-09-16 11:45:15 +0000 |
|---|---|---|
| committer | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2014-09-16 11:45:15 +0000 |
| commit | 80181719d7f204b8451f605f385ef9b1884cb8c5 (patch) | |
| tree | 8fd0b8372332a334d36355ed26ae2ead8bb70161 | |
| parent | 74d883cb59263731e2a7923da9a1a8bffa7efc71 (diff) | |
| download | libapr-util-80181719d7f204b8451f605f385ef9b1884cb8c5.tar.gz | |
Merge r1625247 from apr trunk:
MySQL driver: Fix incorrect check for bad parameter in the
driver support for apr_dbd_transaction_end().
PR: 56330
Submitted by: Weiqiang Li <weiqiang_li hotmail.com>
git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/branches/1.5.x@1625249 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | dbd/apr_dbd_mysql.c | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -1,6 +1,10 @@ -*- coding: utf-8 -*- Changes with APR-util 1.5.4 + *) MySQL driver: Fix incorrect handling of bad parameter in the + driver support for apr_dbd_transaction_end(). PR 56330. + [Weiqiang Li <weiqiang_li hotmail.com>] + *) apr_crypto_get_driver(): Fix invalid storage reference on error path. [Philip Martin <philip.martin wandisco.com>] diff --git a/dbd/apr_dbd_mysql.c b/dbd/apr_dbd_mysql.c index 1141c6fd..3b8017d8 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 |