Return-Path: X-Original-To: apmail-apr-commits-archive@www.apache.org Delivered-To: apmail-apr-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D393E11A48 for ; Tue, 16 Sep 2014 11:40:27 +0000 (UTC) Received: (qmail 8985 invoked by uid 500); 16 Sep 2014 11:40:27 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 8930 invoked by uid 500); 16 Sep 2014 11:40:27 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 8920 invoked by uid 99); 16 Sep 2014 11:40:27 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Sep 2014 11:40:27 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Sep 2014 11:40:05 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0F5C023889D5; Tue, 16 Sep 2014 11:40:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1625247 - /apr/apr/trunk/dbd/apr_dbd_mysql.c Date: Tue, 16 Sep 2014 11:40:03 -0000 To: commits@apr.apache.org From: trawick@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140916114004.0F5C023889D5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 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