summaryrefslogtreecommitdiff
path: root/berkeleydb
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2007-06-26 11:39:14 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2007-06-26 11:39:14 +0000
commite88e092b6186adeb7109ce3edb711cb7a8005751 (patch)
treeebd4a3b62a8dce918710f9b0a00c1d18d8e73f76 /berkeleydb
parent2369a677e4dfcd384706f0c90739d79482c025e5 (diff)
INTEGRATION: CWS helplinker01redux (1.2.12); FILE MERGED
2007/06/17 14:43:16 cmc 1.2.12.1: #i78530# ah, the old db4 has a stinker in it
Diffstat (limited to 'berkeleydb')
-rw-r--r--berkeleydb/db-4.2.52-mingw.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/berkeleydb/db-4.2.52-mingw.patch b/berkeleydb/db-4.2.52-mingw.patch
index b8417b210dc9..611ba1381621 100644
--- a/berkeleydb/db-4.2.52-mingw.patch
+++ b/berkeleydb/db-4.2.52-mingw.patch
@@ -163,3 +163,22 @@
-o $@ $(JAVA_OBJS) $(C_OBJS) $(LIBJSO_LIBS)
# Shared Tcl library.
+*** misc/build/db-4.2.52.NC/btree/bt_put.c.orig 2003-11-17 19:58:20.000000000 +0000
+--- misc/build/db-4.2.52.NC/btree/bt_put.c 2007-06-17 15:05:09.000000000 +0100
+***************
+*** 702,708 ****
+
+ /* Sum up all the data items. */
+ for (cnt = 0, first = indx;
+! inp[first] == inp[indx] && indx < NUM_ENT(h);
+ ++cnt, indx += P_INDX) {
+ bk = GET_BKEYDATA(dbp, h, indx + O_INDX);
+ sz += B_TYPE(bk->type) == B_KEYDATA ?
+--- 702,708 ----
+
+ /* Sum up all the data items. */
+ for (cnt = 0, first = indx;
+! indx < NUM_ENT(h) && inp[first] == inp[indx];
+ ++cnt, indx += P_INDX) {
+ bk = GET_BKEYDATA(dbp, h, indx + O_INDX);
+ sz += B_TYPE(bk->type) == B_KEYDATA ?