From: Nick Kew <niq@apache.org>
Date: Sun, 23 Apr 2006 19:59:23 +0000 (+0000)
Subject: PR#39386: Fix merge-config to support prepared statements (Brian J. France)
X-Git-Tag: 2.3.0~2418
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=813eb9b9c7900109548cdd7b770a9366b5af2b81;p=thirdparty%2Fapache%2Fhttpd.git

PR#39386: Fix merge-config to support prepared statements (Brian J. France)


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

diff --git a/modules/database/mod_dbd.c b/modules/database/mod_dbd.c
index 9d4ae66192f..b533db5d18f 100644
--- a/modules/database/mod_dbd.c
+++ b/modules/database/mod_dbd.c
@@ -192,6 +192,7 @@ static void *dbd_merge(apr_pool_t *pool, void *BASE, void *ADD) {
     cfg->exptime = (add->set&EXPTIME_SET) ? add->exptime : base->exptime;
 #endif
     cfg->set = add->set | base->set;
+    cfg->prepared = (add->prepared != NULL) ? add->prepared : base->prepared;
     return (void*) cfg;
 }
 /* A default nmin of >0 will help with generating meaningful