Re: [PATCH] Support both BDB 4.0 and 4.1

Branko ÄŒibej <brane@xbc.nu> writes:

> Here's a second version of this patch, slightly cleaned up. I moved
> svn_bdb__check_version into its own file, and I realised there's no
> need to remember the compile-time DB version in static variables --
> those defines are constants, anyway. I also reverted the include of
> bdb_compat.h from the headers that didn't use any of its features.

The .dsp bit didn't apply, but what do I care about that gooey stuff :)

It still doesn't work over ra_dav, I've built BDB 4.1 with debug so I
now know exactly where it's failing:

(gdb)
977 __db_err(dbenv,
(gdb) bt
#0 __db_txn_auto (dbp=0x8129020, txnidp=0xbffff7d4)
    at ../dist/../db/db_iface.c:977
#1 0x40171c20 in __db_open (dbp=0x8129020, txn=0x0,
    name=0x8128ff0 "/tmp/repo/dav/activities", subdb=0x0, type=DB_HASH,
    flags=8388609, mode=511) at ../dist/../db/db_open.c:71
#2 0x40119242 in vt_db_open (pdb=0xbffff89c,
    pathname=0x8128ff0 "/tmp/repo/dav/activities", mode=3, perm=4095,
    pool=0x80ea928) at apr_dbm_berkeleydb.c:206
#3 0x40118df4 in apr_dbm_open (pdb=0xbffff89c,
    pathname=0x8128ff0 "/tmp/repo/dav/activities", mode=3, perm=4095,
    pool=0x80ea928) at apr_dbm.c:124
#4 0x403f4d59 in dav_svn_store_activity (repos=0x8126630,
    activity_id=0x8126552 "e379665f-b3ad-0310-955b-bb9cc82369b2",
    txn_name=0x80e5498 "3") at ../svn/subversion/mod_dav_svn/activity.c:87
#5 0x403fd753 in dav_svn_make_activity (resource=0x8126580)
    at ../svn/subversion/mod_dav_svn/version.c:584
#6 0x403dbef5 in dav_method_make_activity (r=0x80eafb0) at mod_dav.c:4074
#7 0x08090146 in ap_run_handler (r=0x80eafb0) at config.c:195
#8 0x0809061e in ap_invoke_handler (r=0x80eafb0) at config.c:401
#9 0x08080743 in ap_process_request (r=0x80eafb0) at http_request.c:288
#10 0x0807c945 in ap_process_http_connection (c=0x8125958) at http_core.c:293
#11 0x0809901a in ap_run_process_connection (c=0x8125958) at connection.c:85
#12 0x0808ed00 in child_main (child_num_arg=135434840) at prefork.c:696
#13 0x0808eea2 in make_child (s=0x80fe548, slot=0) at prefork.c:736
#14 0x0808eefb in startup_children (number_to_start=5) at prefork.c:808
#15 0x0808f5f1 in ap_mpm_run (_pconf=0x808e5e0, plog=0x80d7870, s=0x80fe548)
    at prefork.c:1024
#16 0x0809420c in main (argc=2, argv=0xbffffb94) at main.c:651

The relevant BDB code is

        if (!TXN_ON(dbenv)) {
                __db_err(dbenv,
    "DB_AUTO_COMMIT may not be specified in non-transactional environment");
                return (EINVAL);
        }

The AUTO_COMMIT flag is added by vt_db_open in apr_dbm_open.c.

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org