rpms/db4/F-9 patch.4.6.21.2,NONE,1.1 db4.spec,1.57,1.58

[Jindrich Novy (jnovy)]

Author: jnovy

Update of /cvs/extras/rpms/db4/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8712

Modified Files:
	db4.spec 
Added Files:
	patch.4.6.21.2 
Log Message:
* Wed Jun 25 2008 Jindrich Novy <jnovy at redhat.com> 4.6.21-6
- apply new upstream patch - fixes potentially wrong number of mutexes
  to be allocated
- update URLs to patches



--- NEW FILE patch.4.6.21.2 ---
*** mp/mp_region.c	2007-05-18 03:18:01.000000000 +1000
--- mp/mp_region.c	2008-06-24 13:15:56.000000000 +1000
***************
*** 249,256 ****
  		mtx_base = htab[0].mtx_hash;
  	}
  
  	if (mtx_base != MUTEX_INVALID)
! 		mtx_base += reginfo_off * htab_buckets;
  
  	/* Allocate hash table space and initialize it. */
  	if ((ret = __env_alloc(infop,
--- 249,262 ----
  		mtx_base = htab[0].mtx_hash;
  	}
  
+ 	/*
+ 	 * We preallocated all of the mutexes in a block, so for regions after
+ 	 * the first, we skip mutexes in use in earlier regions.  Each region
+ 	 * has the same number of buckets and there are two mutexes per hash
+ 	 * bucket (the bucket mutex and the I/O mutex).
+ 	 */
  	if (mtx_base != MUTEX_INVALID)
! 		mtx_base += reginfo_off * htab_buckets * 2;
  
  	/* Allocate hash table space and initialize it. */
  	if ((ret = __env_alloc(infop,


Index: db4.spec
===================================================================
RCS file: /cvs/extras/rpms/db4/F-9/db4.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- db4.spec	4 Apr 2008 08:32:54 -0000	1.57
+++ db4.spec	25 Jun 2008 10:14:35 -0000	1.58
@@ -8,11 +8,12 @@
 Summary: The Berkeley DB database library (version 4) for C
 Name: db4
 Version: 4.6.21
-Release: 5%{?dist}
+Release: 6%{?dist}
 Source0: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz
 Source1: http://download.oracle.com/berkeley-db/db.1.85.tar.gz
-Patch1: http://www.oracle.com/technology/products/berkeley-db/xml/update/4.6.21/patch.4.6.21.1
+Patch1: http://www.oracle.com/technology/products/berkeley-db/db/update/4.6.21/patch.4.6.21.1
 Patch2: db-4.3.29-sparc64.patch
+Patch3: http://www.oracle.com/technology/products/berkeley-db/db/update/4.6.21/patch.4.6.21.2
 Patch10: http://www.oracle.com/technology/products/berkeley-db/db/update/1.85/patch.1.1
 Patch11: http://www.oracle.com/technology/products/berkeley-db/db/update/1.85/patch.1.2
 Patch12: http://www.oracle.com/technology/products/berkeley-db/db/update/1.85/patch.1.3
@@ -109,6 +110,7 @@
 %setup -q -n db-%{version} -a 1
 %patch1 -p0 -b .4.6.21.1
 %patch2 -p1 -b .sparc64
+%patch3 -p0 -b .4.6.21.2
 
 pushd dist
 libtoolize --copy --force
@@ -352,6 +354,11 @@
 %endif
 
 %changelog
+* Wed Jun 25 2008 Jindrich Novy <jnovy at redhat.com> 4.6.21-6
+- apply new upstream patch - fixes potentially wrong number of mutexes
+  to be allocated
+- update URLs to patches
+
 * Fri Apr  3 2008 Jindrich Novy <jnovy at redhat.com> 4.6.21-5
 - add upstream patch to fix a race condition between checkpoint
   and DB->close which can result in the checkpoint thread self-deadlocking