Commit 12855b51 authored by Nick Kew's avatar Nick Kew
Browse files

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
parent 2f5a749b

modules/database/mod_dbd.c

+1 −0
Changes for modules/database/mod_dbd.c: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -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