Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 19414 invoked from network); 25 Apr 2006 08:27:01 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 25 Apr 2006 08:27:01 -0000 Received: (qmail 38569 invoked by uid 500); 25 Apr 2006 08:26:52 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 38499 invoked by uid 500); 25 Apr 2006 08:26:51 -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 38484 invoked by uid 99); 25 Apr 2006 08:26:51 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Apr 2006 01:26:51 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 25 Apr 2006 01:26:51 -0700 Received: (qmail 19219 invoked by uid 65534); 25 Apr 2006 08:26:20 -0000 Message-ID: <20060425082620.19217.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r396811 - /apr/apr-util/trunk/dbd/apr_dbd_pgsql.c Date: Tue, 25 Apr 2006 08:26:18 -0000 To: commits@apr.apache.org From: bojan@apache.org X-Mailer: svnmailer-1.0.8 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: bojan Date: Tue Apr 25 01:26:09 2006 New Revision: 396811 URL: http://svn.apache.org/viewcvs?rev=396811&view=rev Log: Check bad transaction state in dbd_pgsql_pquery()/dbd_pgsql_pselect() Modified: apr/apr-util/trunk/dbd/apr_dbd_pgsql.c Modified: apr/apr-util/trunk/dbd/apr_dbd_pgsql.c URL: http://svn.apache.org/viewcvs/apr/apr-util/trunk/dbd/apr_dbd_pgsql.c?rev=396811&r1=396810&r2=396811&view=diff ============================================================================== --- apr/apr-util/trunk/dbd/apr_dbd_pgsql.c (original) +++ apr/apr-util/trunk/dbd/apr_dbd_pgsql.c Tue Apr 25 01:26:09 2006 @@ -358,6 +358,11 @@ { int ret; PGresult *res; + + if (sql->trans && sql->trans->errnum) { + return sql->trans->errnum; + } + if (statement->prepared) { res = PQexecPrepared(sql->conn, statement->name, nargs, values, 0, 0, 0); @@ -414,6 +419,11 @@ PGresult *res; int rv; int ret = 0; + + if (sql->trans && sql->trans->errnum) { + return sql->trans->errnum; + } + if (seek) { /* synchronous query */ if (statement->prepared) { res = PQexecPrepared(sql->conn, statement->name, nargs, values, 0,