--- inn-2.4.3/frontends/ovdb_stat.c.orig 2006-03-20 05:14:57.000000000 +0100 +++ inn-2.4.3/frontends/ovdb_stat.c 2006-03-25 17:39:18.741186250 +0100 @@ -266,13 +266,21 @@ { INT32, F(st_nobjects), -1, -1, "Current objects" }, { INT32, F(st_maxnobjects), -1, -1, "Maximum objects" }, #endif +#if DB_VERSION_MAJOR >= 5 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 4) + { INT32, F(st_lock_wait), -1, -1, "Lock conflicts" }, +#else { INT32, F(st_nconflicts), -1, -1, "Lock conflicts" }, +#endif { INT32, F(st_nrequests), -1, -1, "Lock requests" }, { INT32, F(st_nreleases), -1, -1, "Lock releases" }, { DIFF32, F(st_nrequests), F(st_nreleases), F(st_ndeadlocks), "Outstanding locks" }, #if DB_VERSION_MAJOR >= 4 || (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR > 0) +#if DB_VERSION_MAJOR >= 5 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 4) + { INT32, F(st_lock_nowait), -1, -1, "Lock requests that would have waited" }, +#else { INT32, F(st_nnowaits), -1, -1, "Lock requests that would have waited" }, #endif +#endif { INT32, F(st_ndeadlocks), -1, -1, "Deadlocks" }, #if DB_VERSION_MAJOR >= 4 { INT32, F(st_nlocktimeouts), -1, -1, "Lock timeouts" }, --- inn-2.4.3/storage/ovdb/ovdb.c.orig 2006-03-20 05:14:57.000000000 +0100 +++ inn-2.4.3/storage/ovdb/ovdb.c 2008-02-17 20:01:57.255599805 +0100 @@ -1526,7 +1526,14 @@ OVDBenv->set_errcall(OVDBenv, OVDBerror); OVDBenv->set_cachesize(OVDBenv, 0, ovdb_conf.cachesize, 1); +#if DB_VERSION_MAJOR >= 4 + /* ->set_lk_max is deprecated since 4.0, removed in 4.5 */ + OVDBenv->set_lk_max_locks(OVDBenv, ovdb_conf.maxlocks); + OVDBenv->set_lk_max_lockers(OVDBenv, ovdb_conf.maxlocks); + OVDBenv->set_lk_max_objects(OVDBenv, ovdb_conf.maxlocks); +#else OVDBenv->set_lk_max(OVDBenv, ovdb_conf.maxlocks); +#endif #if DB_VERSION_MAJOR >= 4 || (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR >= 2) if(ovdb_conf.txn_nosync)