apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
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 GMT
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: <arthur echo gmail com>


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;
     }



Mime
View raw message