diff options
| author | Jeff Trawick <trawick@apache.org> | 2014-09-16 11:40:03 +0000 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2014-09-16 11:40:03 +0000 |
| commit | fa7f9f638a44832a98f05fe796ab2e5f04d66d10 (patch) | |
| tree | b06e6ad4018ae49555b9cce284dc27be0a0aad19 /dbd | |
| parent | 999c37c5609a3d74a9f29b06bd03da00fbf50eed (diff) | |
| download | apr-fa7f9f638a44832a98f05fe796ab2e5f04d66d10.tar.gz | |
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: https://svn.apache.org/repos/asf/apr/apr/trunk@1625247 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'dbd')
| -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 e38925ee4..9d715855b 100644 --- a/dbd/apr_dbd_mysql.c +++ b/dbd/apr_dbd_mysql.c @@ -1057,9 +1057,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 |