upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-20 22:59:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/mdb.RE/0.9'

Browse source
This commit is contained in:
Quanah Gibson-Mount 2024-05-07 17:29:20 +00:00
commit f0fddaa6fe
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/liblmdb/CHANGES
View file

@ -1,5 +1,8 @@
LMDB 0.9 Change Log 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) LMDB 0.9.32 Release (2024/01/29)
ITS#9378 - Add ability to replay log and replay log tool 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. ITS#10095 - partial revert of ITS#9278. The patch was incorrect and introduced numerous race conditions.

11
libraries/liblmdb/mdb.c
View file

@ -1555,7 +1555,7 @@ mdb_strerror(int err)
buf[0] = 0; buf[0] = 0;
FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_IGNORE_INSERTS, FORMAT_MESSAGE_IGNORE_INSERTS,
NULL, err, 0, ptr, MSGSIZE, (va_list *)buf+MSGSIZE); NULL, err, 0, ptr, MSGSIZE, NULL);
return ptr; return ptr;
#else #else
if (err < 0) if (err < 0)
@ -2796,9 +2796,14 @@ mdb_txn_renew0(MDB_txn *txn)
do /* LY: Retry on a race, ITS#7970. */ do /* LY: Retry on a race, ITS#7970. */
r->mr_txnid = ti->mti_txnid; r->mr_txnid = ti->mti_txnid;
while(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_txnid = r->mr_txnid;
txn->mt_u.reader = r; txn->mt_u.reader = r;
meta = env->me_metas[txn->mt_txnid & 1];
} }
} else { } else {
@ -5701,7 +5706,7 @@ mdb_page_search(MDB_cursor *mc, MDB_val *key, int flags)
MDB_node *leaf = mdb_node_search(&mc2, MDB_node *leaf = mdb_node_search(&mc2,
&mc->mc_dbx->md_name, &exact); &mc->mc_dbx->md_name, &exact);
if (!exact) if (!exact)
return MDB_NOTFOUND; return MDB_BAD_DBI;
if ((leaf->mn_flags & (F_DUPDATA|F_SUBDATA)) != F_SUBDATA) if ((leaf->mn_flags & (F_DUPDATA|F_SUBDATA)) != F_SUBDATA)
return MDB_INCOMPATIBLE; /* not a named DB */ return MDB_INCOMPATIBLE; /* not a named DB */
rc = mdb_node_read(&mc2, leaf, &data); rc = mdb_node_read(&mc2, leaf, &data);