From: Chris Darroch <chrisd@apache.org>
Date: Sat, 19 May 2007 05:01:44 +0000 (+0000)
Subject: apr_dbd_check_conn() just returns APR_SUCCESS or APR_EGENERAL, so we
X-Git-Tag: 2.3.0~1797
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af98980f19c705fd33f608b1dd8a16e200a3666c;p=thirdparty%2Fapache%2Fhttpd.git

apr_dbd_check_conn() just returns APR_SUCCESS or APR_EGENERAL, so we
don't actually have a driver-specific value to pass to apr_dbd_error(),
but that's OK because most/all drivers just ignore this value anyway


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@539687 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/database/mod_dbd.c b/modules/database/mod_dbd.c
index 9914875caf1..5679b6e003d 100644
--- a/modules/database/mod_dbd.c
+++ b/modules/database/mod_dbd.c
@@ -706,7 +706,10 @@ static apr_status_t dbd_check(apr_pool_t *pool, server_rec *s, ap_dbd_t *rec)
         return APR_SUCCESS;
     }
 
-    errmsg = apr_dbd_error(rec->driver, rec->handle, rv);
+    /* we don't have a driver-specific error code, so we'll just pass
+     * a "success" value and rely on the driver to ignore it
+     */
+    errmsg = apr_dbd_error(rec->driver, rec->handle, 0);
     if (!errmsg) {
         errmsg = "(unknown)";
     }