From commits-return-12602-apmail-apr-commits-archive=apr.apache.org@apr.apache.org Sun Aug 5 21:10:00 2012 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 BDEC7DF67 for ; Sun, 5 Aug 2012 21:10:00 +0000 (UTC) Received: (qmail 75965 invoked by uid 500); 5 Aug 2012 21:10:00 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 75928 invoked by uid 500); 5 Aug 2012 21:10:00 -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 75921 invoked by uid 99); 5 Aug 2012 21:10:00 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 05 Aug 2012 21:10:00 +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; Sun, 05 Aug 2012 21:09:59 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3CDA823888FD for ; Sun, 5 Aug 2012 21:09:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1369682 - in /apr/apr-util/branches/1.5.x: ./ dbd/apr_dbd_freetds.c dbd/apr_dbd_mysql.c dbd/apr_dbd_pgsql.c dbd/apr_dbd_sqlite2.c Date: Sun, 05 Aug 2012 21:09:16 -0000 To: commits@apr.apache.org From: sf@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120805210916.3CDA823888FD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sf Date: Sun Aug 5 21:09:15 2012 New Revision: 1369682 URL: http://svn.apache.org/viewvc?rev=1369682&view=rev Log: Merge r1369681 from apr trunk: Allow apr_dbd_get_row() to be called with a different pool than apr_dbd_select() PR: 53533 Submitted by: Modified: apr/apr-util/branches/1.5.x/ (props changed) apr/apr-util/branches/1.5.x/dbd/apr_dbd_freetds.c apr/apr-util/branches/1.5.x/dbd/apr_dbd_mysql.c apr/apr-util/branches/1.5.x/dbd/apr_dbd_pgsql.c apr/apr-util/branches/1.5.x/dbd/apr_dbd_sqlite2.c Propchange: apr/apr-util/branches/1.5.x/ ------------------------------------------------------------------------------ Merged /apr/apr/trunk:r1369681 Modified: apr/apr-util/branches/1.5.x/dbd/apr_dbd_freetds.c URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/dbd/apr_dbd_freetds.c?rev=1369682&r1=1369681&r2=1369682&view=diff ============================================================================== --- apr/apr-util/branches/1.5.x/dbd/apr_dbd_freetds.c (original) +++ apr/apr-util/branches/1.5.x/dbd/apr_dbd_freetds.c Sun Aug 5 21:09:15 2012 @@ -327,7 +327,7 @@ static int dbd_freetds_get_row(apr_pool_ case SUCCEED: return 0; case REG_ROW: return 0; case NO_MORE_ROWS: - apr_pool_cleanup_run(pool, res->proc, clear_result); + apr_pool_cleanup_run(res->pool, res->proc, clear_result); *rowp = NULL; return -1; case FAIL: return 1; 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=1369682&r1=1369681&r2=1369682&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 Sun Aug 5 21:09:15 2012 @@ -325,7 +325,7 @@ static int dbd_mysql_get_row(apr_pool_t (*row)->len = mysql_fetch_lengths(res->res); } else { - apr_pool_cleanup_run(pool, res->res, free_result); + apr_pool_cleanup_run(res->pool, res->res, free_result); } return ret; } Modified: apr/apr-util/branches/1.5.x/dbd/apr_dbd_pgsql.c URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/dbd/apr_dbd_pgsql.c?rev=1369682&r1=1369681&r2=1369682&view=diff ============================================================================== --- apr/apr-util/branches/1.5.x/dbd/apr_dbd_pgsql.c (original) +++ apr/apr-util/branches/1.5.x/dbd/apr_dbd_pgsql.c Sun Aug 5 21:09:15 2012 @@ -265,7 +265,7 @@ static int dbd_pgsql_get_row(apr_pool_t if (res->random) { if ((row->n >= 0) && (size_t)row->n >= res->ntuples) { *rowp = NULL; - apr_pool_cleanup_run(pool, res->res, clear_result); + apr_pool_cleanup_run(res->pool, res->res, clear_result); res->res = NULL; return -1; } Modified: apr/apr-util/branches/1.5.x/dbd/apr_dbd_sqlite2.c URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/dbd/apr_dbd_sqlite2.c?rev=1369682&r1=1369681&r2=1369682&view=diff ============================================================================== --- apr/apr-util/branches/1.5.x/dbd/apr_dbd_sqlite2.c (original) +++ apr/apr-util/branches/1.5.x/dbd/apr_dbd_sqlite2.c Sun Aug 5 21:09:15 2012 @@ -152,7 +152,7 @@ static int dbd_sqlite_get_row(apr_pool_t if (row->n >= res->ntuples) { *rowp = NULL; - apr_pool_cleanup_run(pool, res->res, free_table); + apr_pool_cleanup_run(res->pool, res->res, free_table); res->res = NULL; return -1; }