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 9d4ae66192feb789d8d85dec1f88d5eb8b1974a1..b533db5d18f8158b70adc67e615e1f5d823c10af 100644 (file)
--- 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