[commits] (vajda) [16035] - applied fix for bug 11547 (patch from Sleepycat)

[commits]

Title: [commits] (vajda) [16035] - applied fix for bug 11547 (patch from Sleepycat)

Revision

16035

Author

vajda

Date

2007-12-03 17:36:52 -0800 (Mon, 03 Dec 2007)

Log Message

- applied fix for bug 11547 (patch from Sleepycat)
(http://bugzilla.osafoundation.org/show_bug.cgi?id=11547)
(App crash on compact) (debug mode only)

Modified Paths

• trunk/external/db/Makefile

Added Paths

• trunk/external/db/patch-11547.txt

Diff

Modified: trunk/external/db/Makefile (16034 => 16035)

--- trunk/external/db/Makefile	2007-12-04 00:42:22 UTC (rev 16034)
+++ trunk/external/db/Makefile	2007-12-04 01:36:52 UTC (rev 16035)
@@ -1,6 +1,6 @@
 
 VERSION=4.6.21
-RELVER=$(VERSION)-$(BRANCH_REV_PREFIX)2
+RELVER=$(VERSION)-$(BRANCH_REV_PREFIX)3
 DB=$(BUILD_ROOT)/db
 SRC=""
 TARBALL=db-$(SNAP)-$(RELVER).tar.gz
@@ -80,6 +80,7 @@
 endif
 
 apply: expand patches-$(VERSION)
+	cd $(SRC); patch -Np0 < $(DB)/patch-11547.txt; echo ok
 	patch -Nup0 < patches-$(VERSION); echo ok
 
 db-$(VERSION).tar.gz:

Added: trunk/external/db/patch-11547.txt (16034 => 16035)

--- trunk/external/db/patch-11547.txt	2007-12-04 00:42:22 UTC (rev 16034)
+++ trunk/external/db/patch-11547.txt	2007-12-04 01:36:52 UTC (rev 16035)
@@ -0,0 +1,32 @@
+*** db/db_meta.c	2007-05-18 03:17:41.000000000 +1000
+--- db/db_meta.c	2007-11-16 11:11:03.000000000 +1100
+***************
+*** 715,722 ****
+  	if ((ret = __db_lget(dbc,
+  	    LCK_ALWAYS, pgno, DB_LOCK_WRITE, 0, &metalock)) != 0)
+  		goto err;
+! 	if ((ret = __memp_fget(mpf, &pgno, dbc->txn,
+! 	    DB_MPOOL_DIRTY, &meta)) != 0)
+  		goto err;
+  
+  	if (last_pgnop != NULL)
+--- 716,722 ----
+  	if ((ret = __db_lget(dbc,
+  	    LCK_ALWAYS, pgno, DB_LOCK_WRITE, 0, &metalock)) != 0)
+  		goto err;
+! 	if ((ret = __memp_fget(mpf, &pgno, dbc->txn, 0, &meta)) != 0)
+  		goto err;
+  
+  	if (last_pgnop != NULL)
+***************
+*** 749,754 ****
+--- 749,757 ----
+  	} while (pgno != PGNO_INVALID);
+  	nelems = (u_int32_t)(lp - list);
+  
++ 	if ((ret = __memp_dirty(mpf, &meta, dbc->txn, dbc->priority, 0)) != 0)
++ 		goto err;
++ 
+  	/* Log the current state of the free list */
+  	if (DBC_LOGGING(dbc)) {
+  		ddbt.data = ""
Property changes on: trunk/external/db/patch-11547.txt
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

_______________________________________________
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits