summaryrefslogtreecommitdiffstats
path: root/libraries/liblmdb
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--libraries/liblmdb/CHANGES5
-rw-r--r--libraries/liblmdb/lmdb.h4
-rw-r--r--libraries/liblmdb/mdb.c11
-rw-r--r--libraries/liblmdb/midl.c2
-rw-r--r--libraries/liblmdb/midl.h2
5 files changed, 17 insertions, 7 deletions
diff --git a/libraries/liblmdb/CHANGES b/libraries/liblmdb/CHANGES
index 10e81d5..20babf3 100644
--- a/libraries/liblmdb/CHANGES
+++ b/libraries/liblmdb/CHANGES
@@ -1,5 +1,10 @@
LMDB 0.9 Change Log
+LMDB 0.9.33 Release (2024/05/21)
+ ITS#9037 mdb_page_search: fix error code when DBI record is missing
+ ITS#10198 For win32, stop passing ignored parameter
+ ITS#10212 Fix meta page usage by read only tools
+
LMDB 0.9.32 Release (2024/01/29)
ITS#9378 - Add ability to replay log and replay log tool
ITS#10095 - partial revert of ITS#9278. The patch was incorrect and introduced numerous race conditions.
diff --git a/libraries/liblmdb/lmdb.h b/libraries/liblmdb/lmdb.h
index d638a67..199382a 100644
--- a/libraries/liblmdb/lmdb.h
+++ b/libraries/liblmdb/lmdb.h
@@ -200,7 +200,7 @@ typedef int mdb_filehandle_t;
/** Library minor version */
#define MDB_VERSION_MINOR 9
/** Library patch version */
-#define MDB_VERSION_PATCH 32
+#define MDB_VERSION_PATCH 33
/** Combine args a,b,c into a single integer for easy version comparisons */
#define MDB_VERINT(a,b,c) (((a) << 24) | ((b) << 16) | (c))
@@ -210,7 +210,7 @@ typedef int mdb_filehandle_t;
MDB_VERINT(MDB_VERSION_MAJOR,MDB_VERSION_MINOR,MDB_VERSION_PATCH)
/** The release date of this library version */
-#define MDB_VERSION_DATE "January 29, 2024"
+#define MDB_VERSION_DATE "May 21, 2024"
/** A stringifier for the version info */
#define MDB_VERSTR(a,b,c,d) "LMDB " #a "." #b "." #c ": (" d ")"
diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index 0570dea..668f966 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -1555,7 +1555,7 @@ mdb_strerror(int err)
buf[0] = 0;
FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_IGNORE_INSERTS,
- NULL, err, 0, ptr, MSGSIZE, (va_list *)buf+MSGSIZE);
+ NULL, err, 0, ptr, MSGSIZE, NULL);
return ptr;
#else
if (err < 0)
@@ -2796,9 +2796,14 @@ mdb_txn_renew0(MDB_txn *txn)
do /* LY: Retry on a race, ITS#7970. */
r->mr_txnid = ti->mti_txnid;
while(r->mr_txnid != ti->mti_txnid);
+ if (!r->mr_txnid && (env->me_flags & MDB_RDONLY)) {
+ meta = mdb_env_pick_meta(env);
+ r->mr_txnid = meta->mm_txnid;
+ } else {
+ meta = env->me_metas[r->mr_txnid & 1];
+ }
txn->mt_txnid = r->mr_txnid;
txn->mt_u.reader = r;
- meta = env->me_metas[txn->mt_txnid & 1];
}
} else {
@@ -5701,7 +5706,7 @@ mdb_page_search(MDB_cursor *mc, MDB_val *key, int flags)
MDB_node *leaf = mdb_node_search(&mc2,
&mc->mc_dbx->md_name, &exact);
if (!exact)
- return MDB_NOTFOUND;
+ return MDB_BAD_DBI;
if ((leaf->mn_flags & (F_DUPDATA|F_SUBDATA)) != F_SUBDATA)
return MDB_INCOMPATIBLE; /* not a named DB */
rc = mdb_node_read(&mc2, leaf, &data);
diff --git a/libraries/liblmdb/midl.c b/libraries/liblmdb/midl.c
index 1cbe879..dc3a1f5 100644
--- a/libraries/liblmdb/midl.c
+++ b/libraries/liblmdb/midl.c
@@ -3,7 +3,7 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2000-2022 The OpenLDAP Foundation.
+ * Copyright 2000-2024 The OpenLDAP Foundation.
* Portions Copyright 2001-2021 Howard Chu, Symas Corp.
* All rights reserved.
*
diff --git a/libraries/liblmdb/midl.h b/libraries/liblmdb/midl.h
index ff740ae..1abdc8a 100644
--- a/libraries/liblmdb/midl.h
+++ b/libraries/liblmdb/midl.h
@@ -11,7 +11,7 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2000-2022 The OpenLDAP Foundation.
+ * Copyright 2000-2024 The OpenLDAP Foundation.
* Portions Copyright 2001-2021 Howard Chu, Symas Corp.
* All rights reserved.
*