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