diff options
| author | Nick Kew <niq@apache.org> | 2006-04-23 19:59:23 +0000 |
|---|---|---|
| committer | Nick Kew <niq@apache.org> | 2006-04-23 19:59:23 +0000 |
| commit | 813eb9b9c7900109548cdd7b770a9366b5af2b81 (patch) | |
| tree | 246829d8ec58fe32af26cb1b8a45e46a84ea9732 /modules | |
| parent | e58985dcf9b1e21f6a10ad40509d3dc9fb2ea427 (diff) | |
| download | httpd-813eb9b9c7900109548cdd7b770a9366b5af2b81.tar.gz | |
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
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/database/mod_dbd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/modules/database/mod_dbd.c b/modules/database/mod_dbd.c index 9d4ae66192..b533db5d18 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 |