From 83dc42c5cab8999a5d9c20bf696b03d657170c51 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Tue, 26 Mar 2024 14:50:17 +0000 Subject: [PATCH 1/5] ITS#9037 mdb_page_search: fix error code when DBI record is missing Use the more relevant MDB_BAD_DBI instead of MDB_NOTFOUND error code --- libraries/liblmdb/mdb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c index 0570deab23..53e1b4c257 100644 --- a/libraries/liblmdb/mdb.c +++ b/libraries/liblmdb/mdb.c @@ -5701,7 +5701,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); From 7077d5e601f555895233d1d942a7b65938691358 Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Tue, 26 Mar 2024 16:25:55 +0000 Subject: [PATCH 2/5] ITS#9037 --- libraries/liblmdb/CHANGES | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libraries/liblmdb/CHANGES b/libraries/liblmdb/CHANGES index 10e81d5bd3..bf4c808dc5 100644 --- a/libraries/liblmdb/CHANGES +++ b/libraries/liblmdb/CHANGES @@ -1,5 +1,8 @@ LMDB 0.9 Change Log +LMDB 0.9.33 Engineering + ITS#9037 mdb_page_search: fix error code when DBI record is missing + 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. From d3ae7c36e56e29f227e26f1fea5809f11288124e Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Thu, 4 Apr 2024 07:15:24 +0100 Subject: [PATCH 3/5] ITS#10198 Win32 mdb_strerror - stop passing "ignored" parameter The M$ docs say the parameter is ignored, but it actually isn't, and will cause a SEGV if the pointed memory isn't an init'd va_list. --- libraries/liblmdb/mdb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c index 53e1b4c257..6fc72631dd 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) From 37829ce4933cc45068cca4e076f97a2a738f3fc6 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Thu, 2 May 2024 16:29:03 +0100 Subject: [PATCH 4/5] ITS#10212 LMDB: init txnid for read-only DBs --- libraries/liblmdb/mdb.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c index 6fc72631dd..83bd131d1a 100644 --- a/libraries/liblmdb/mdb.c +++ b/libraries/liblmdb/mdb.c @@ -2771,6 +2771,10 @@ mdb_txn_renew0(MDB_txn *txn) UNLOCK_MUTEX(rmutex); return MDB_READERS_FULL; } + if ((env->me_flags & MDB_RDONLY) && !ti->mti_txnid) { + meta = mdb_env_pick_meta(env); + ti->mti_txnid = meta->mm_txnid; + } r = &ti->mti_readers[i]; /* Claim the reader slot, carefully since other code * uses the reader table un-mutexed: First reset the From d83d6b4ebece1f9fc310443d58187bf7869fbfe2 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Fri, 3 May 2024 20:43:39 +0100 Subject: [PATCH 5/5] ITS#10212 LMDB: better fix --- libraries/liblmdb/mdb.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c index 83bd131d1a..668f9660f2 100644 --- a/libraries/liblmdb/mdb.c +++ b/libraries/liblmdb/mdb.c @@ -2771,10 +2771,6 @@ mdb_txn_renew0(MDB_txn *txn) UNLOCK_MUTEX(rmutex); return MDB_READERS_FULL; } - if ((env->me_flags & MDB_RDONLY) && !ti->mti_txnid) { - meta = mdb_env_pick_meta(env); - ti->mti_txnid = meta->mm_txnid; - } r = &ti->mti_readers[i]; /* Claim the reader slot, carefully since other code * uses the reader table un-mutexed: First reset the @@ -2800,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 {