From: Eduardo Lima (Etrunko) <eduardo.lima@intel.com>
Date: Wed, 11 Dec 2013 13:25:07 +0000 (-0200)
Subject: patch.1.2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8f85d3d4d824d4b8c0e5c4441fbb12dd32b8a39d;p=platform%2Fupstream%2Flibdb.git

patch.1.2

http://www.oracle.com/technetwork/products/berkeleydb/patch-082767.html

Problem: DB 1.85 core dumps on certain data sets when using the B+tree access
method.

Signed-off-by: Eduardo Lima (Etrunko) <eduardo.lima@intel.com>
---

diff --git a/db.1.85/btree/bt_split.c b/db.1.85/btree/bt_split.c
index 1646d82..7ef8413 100644
--- a/db.1.85/btree/bt_split.c
+++ b/db.1.85/btree/bt_split.c
@@ -673,7 +673,7 @@ bt_psplit(t, h, l, r, pskip, ilen)
 		 * where we decide to try and copy too much onto the left page.
 		 * Make sure that doesn't happen.
 		 */
-		if (skip <= off && used + nbytes >= full) {
+		if (skip <= off && used + nbytes >= full || nxt == top - 1) {
 			--off;
 			break;
 		}
diff --git a/packaging/libdb.spec b/packaging/libdb.spec
index c6315a6..48123c2 100644
--- a/packaging/libdb.spec
+++ b/packaging/libdb.spec
@@ -7,7 +7,6 @@ Version: 5.3.21
 Release: 11
 Source0: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz
 # db-1.85 upstream patches
-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
 Patch13: http://www.oracle.com/technology/products/berkeley-db/db/update/1.85/patch.1.4
 # other patches
@@ -188,7 +187,6 @@ for building programs which use the Berkeley DB in Java.
 %setup -q -n db-%{version}
 
 pushd db.1.85
-%patch11 -p0 -b .1.2
 %patch12 -p0 -b .1.3
 %patch13 -p0 -b .1.4
 %patch20 -p1 -b .errno
diff --git a/packaging/patch.1.2 b/packaging/patch.1.2
deleted file mode 100644
index a343909..0000000
--- a/packaging/patch.1.2
+++ /dev/null
@@ -1,19 +0,0 @@
-*** btree/bt_split.c	Tue Jul 26 14:22:02 1994
---- btree/bt_split.c	Sat Jan  4 14:38:55 1997
-***************
-*** 673,679 ****
-  		 * where we decide to try and copy too much onto the left page.
-  		 * Make sure that doesn't happen.
-  		 */
-! 		if (skip <= off && used + nbytes >= full) {
-  			--off;
-  			break;
-  		}
---- 673,679 ----
-  		 * where we decide to try and copy too much onto the left page.
-  		 * Make sure that doesn't happen.
-  		 */
-! 		if (skip <= off && used + nbytes >= full || nxt == top - 1) {
-  			--off;
-  			break;
-  		}