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:40:03 UTC

svn commit: r1625247 - /apr/apr/trunk/dbd/apr_dbd_mysql.c

Author: trawick
Date: Tue Sep 16 11:40:03 2014
New Revision: 1625247

URL: http://svn.apache.org/r1625247
Log:
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/trunk/dbd/apr_dbd_mysql.c

Modified: apr/apr/trunk/dbd/apr_dbd_mysql.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/apr_dbd_mysql.c?rev=1625247&r1=1625246&r2=1625247&view=diff
==============================================================================
--- apr/apr/trunk/dbd/apr_dbd_mysql.c (original)
+++ apr/apr/trunk/dbd/apr_dbd_mysql.c Tue Sep 16 11:40:03 2014
@@ -1057,9 +1057,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