1 diff -urN db-4.7.25.NC/lock/lock.c db-4.7.25.NC.new/lock/lock.c
2 --- db-4.7.25.NC/lock/lock.c 2008-05-07 14:27:35.000000000 +0200
3 +++ db-4.7.25.NC.new/lock/lock.c 2009-11-08 12:52:19.000000000 +0100
4 @@ -1274,10 +1274,12 @@
6 <->obj_tab[obj_ndx], sh_obj, links, __db_lockobj);
7 if (sh_obj->lockobj.size > sizeof(sh_obj->objdata)) {
8 - LOCK_REGION_LOCK(env);
9 + if (region->part_t_size != 1)
10 + LOCK_REGION_LOCK(env);
11 __env_alloc_free(<->reginfo,
12 SH_DBT_PTR(&sh_obj->lockobj));
13 - LOCK_REGION_UNLOCK(env);
14 + if (region->part_t_size != 1)
15 + LOCK_REGION_UNLOCK(env);
18 &FREE_OBJS(lt, part_id), sh_obj, links, __db_lockobj);
19 @@ -1467,15 +1469,21 @@
20 if (obj->size <= sizeof(sh_obj->objdata))
23 - LOCK_REGION_LOCK(env);
25 + * If we have only one partition, the region is locked.
27 + if (region->part_t_size != 1)
28 + LOCK_REGION_LOCK(env);
30 __env_alloc(<->reginfo, obj->size, &p)) != 0) {
32 "No space for lock object storage");
33 - LOCK_REGION_UNLOCK(env);
34 + if (region->part_t_size != 1)
35 + LOCK_REGION_UNLOCK(env);
38 - LOCK_REGION_UNLOCK(env);
39 + if (region->part_t_size != 1)
40 + LOCK_REGION_UNLOCK(env);
43 memcpy(p, obj->data, obj->size);