From 5cc1f635b81f47c12ddbbd747bab25a76b25335c Mon Sep 17 00:00:00 2001 From: Graham Leggett Date: Tue, 29 Nov 2011 21:29:11 +0000 Subject: [PATCH] Backport: mod_dbd: The dbd_prepared_init() function reported the result of the last prepared statement, obscuring earlier errors. Fixed. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1208081 13f79535-47bb-0310-9956-ffa450edef68 --- modules/database/mod_dbd.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/database/mod_dbd.c b/modules/database/mod_dbd.c index a4a266d16a..e21297c4f7 100644 --- a/modules/database/mod_dbd.c +++ b/modules/database/mod_dbd.c @@ -435,7 +435,6 @@ static apr_status_t dbd_prepared_init(apr_pool_t *pool, dbd_cfg_t *cfg, ap_dbd_t *rec) { apr_hash_index_t *hi; - apr_status_t rv = APR_SUCCESS; rec->prepared = apr_hash_make(pool); @@ -453,14 +452,14 @@ static apr_status_t dbd_prepared_init(apr_pool_t *pool, dbd_cfg_t *cfg, stmt = NULL; if (apr_dbd_prepare(rec->driver, pool, rec->handle, query, label, &stmt)) { - rv = APR_EGENERAL; + return APR_EGENERAL; } else { apr_hash_set(rec->prepared, label, APR_HASH_KEY_STRING, stmt); } } - return rv; + return APR_SUCCESS; } static apr_status_t dbd_init_sql_init(apr_pool_t *pool, dbd_cfg_t *cfg, -- 2.40.0