/[Apache-SVN]/httpd/httpd/trunk/modules/database/mod_dbd.c
ViewVC logotype

Diff of /httpd/httpd/trunk/modules/database/mod_dbd.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 664160, Fri Jun 6 22:21:07 2008 UTC revision 689224, Tue Aug 26 21:03:46 2008 UTC
# Line 464  static apr_status_t dbd_construct(void * Line 464  static apr_status_t dbd_construct(void *
464      apr_pool_t *rec_pool, *prepared_pool;      apr_pool_t *rec_pool, *prepared_pool;
465      ap_dbd_t *rec;      ap_dbd_t *rec;
466      apr_status_t rv;      apr_status_t rv;
467        const char *err = "";
468    
469      rv = apr_pool_create(&rec_pool, pool);      rv = apr_pool_create(&rec_pool, pool);
470      if (rv != APR_SUCCESS) {      if (rv != APR_SUCCESS) {
# Line 507  static apr_status_t dbd_construct(void * Line 508  static apr_status_t dbd_construct(void *
508          return rv;          return rv;
509      }      }
510    
511      rv = apr_dbd_open(rec->driver, rec->pool, cfg->params, &rec->handle);      rv = apr_dbd_open_ex(rec->driver, rec->pool, cfg->params, &rec->handle, &err);
512      if (rv != APR_SUCCESS) {      if (rv != APR_SUCCESS) {
513          switch (rv) {          switch (rv) {
514          case APR_EGENERAL:          case APR_EGENERAL:
515              ap_log_error(APLOG_MARK, APLOG_ERR, rv, cfg->server,              ap_log_error(APLOG_MARK, APLOG_ERR, rv, cfg->server,
516                           "DBD: Can't connect to %s", cfg->name);                           "DBD: Can't connect to %s: %s", cfg->name, &err);
517              break;              break;
518          default:          default:
519              ap_log_error(APLOG_MARK, APLOG_ERR, rv, cfg->server,              ap_log_error(APLOG_MARK, APLOG_ERR, rv, cfg->server,

Legend:
Removed from v.664160  
changed lines
  Added in v.689224

apache@apache.org
ViewVC Help
Powered by ViewVC 1.1.2