You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by tr...@apache.org on 2014/09/16 13:45:16 UTC
svn commit: r1625249 - in /apr/apr-util/branches/1.5.x: ./ CHANGES
dbd/apr_dbd_mysql.c
Author: trawick
Date: Tue Sep 16 11:45:15 2014
New Revision: 1625249
URL: http://svn.apache.org/r1625249
Log:
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>
Modified:
apr/apr-util/branches/1.5.x/ (props changed)
apr/apr-util/branches/1.5.x/CHANGES
apr/apr-util/branches/1.5.x/dbd/apr_dbd_mysql.c
Propchange: apr/apr-util/branches/1.5.x/
------------------------------------------------------------------------------
Merged /apr/apr/trunk:r1625247
Modified: apr/apr-util/branches/1.5.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/CHANGES?rev=1625249&r1=1625248&r2=1625249&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/CHANGES [utf-8] (original)
+++ apr/apr-util/branches/1.5.x/CHANGES [utf-8] Tue Sep 16 11:45:15 2014
@@ -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>]
Modified: apr/apr-util/branches/1.5.x/dbd/apr_dbd_mysql.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/dbd/apr_dbd_mysql.c?rev=1625249&r1=1625248&r2=1625249&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/dbd/apr_dbd_mysql.c (original)
+++ apr/apr-util/branches/1.5.x/dbd/apr_dbd_mysql.c Tue Sep 16 11:45:15 2014
@@ -1050,9 +1050,9 @@ static int dbd_mysql_end_transaction(apr
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