upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-21 07:09: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:
Howard Chu 2017-06-01 17:52:15 +01:00
commit a58c01317c
3 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/liblmdb/CHANGES
View file

@ -1,6 +1,9 @@
LMDB 0.9 Change Log LMDB 0.9 Change Log
LMDB 0.9.20 Release Engineering LMDB 0.9.21 Release (2017/06/01)
Fix xcursor after cursor_del (ITS#8622)
LMDB 0.9.20 (Withdrawn)
Fix mdb_load with escaped plaintext (ITS#8558) Fix mdb_load with escaped plaintext (ITS#8558)
Fix mdb_cursor_last / mdb_put interaction (ITS#8557) Fix mdb_cursor_last / mdb_put interaction (ITS#8557)

4
libraries/liblmdb/lmdb.h
View file

@ -200,7 +200,7 @@ typedef int mdb_filehandle_t;
/** Library minor version */ /** Library minor version */
#define MDB_VERSION_MINOR 9 #define MDB_VERSION_MINOR 9
/** Library patch version */ /** Library patch version */
#define MDB_VERSION_PATCH 20 #define MDB_VERSION_PATCH 21
/** Combine args a,b,c into a single integer for easy version comparisons */ /** Combine args a,b,c into a single integer for easy version comparisons */
#define MDB_VERINT(a,b,c) (((a) << 24) | ((b) << 16) | (c)) #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) MDB_VERINT(MDB_VERSION_MAJOR,MDB_VERSION_MINOR,MDB_VERSION_PATCH)
/** The release date of this library version */ /** The release date of this library version */
#define MDB_VERSION_DATE "January 11, 2017" #define MDB_VERSION_DATE "June 1, 2017"
/** A stringifier for the version info */ /** A stringifier for the version info */
#define MDB_VERSTR(a,b,c,d) "LMDB " #a "." #b "." #c ": (" d ")" #define MDB_VERSTR(a,b,c,d) "LMDB " #a "." #b "." #c ": (" d ")"

17
libraries/liblmdb/mdb.c
View file

@ -8451,14 +8451,17 @@ mdb_cursor_del0(MDB_cursor *mc)
} }
if (mc->mc_db->md_flags & MDB_DUPSORT) { if (mc->mc_db->md_flags & MDB_DUPSORT) {
MDB_node *node = NODEPTR(m3->mc_pg[m3->mc_top], m3->mc_ki[m3->mc_top]); MDB_node *node = NODEPTR(m3->mc_pg[m3->mc_top], m3->mc_ki[m3->mc_top]);
/* If this node is a fake page, it needs to be reinited /* If this node has dupdata, it may need to be reinited
* because its data has moved. But just reset mc_pg[0] * because its data has moved.
* if the xcursor is already live. * If the xcursor was not initd it must be reinited.
* Else if node points to a subDB, nothing is needed.
* Else (xcursor was initd, not a subDB) needs mc_pg[0] reset.
*/ */
if ((node->mn_flags & (F_DUPDATA|F_SUBDATA)) == F_DUPDATA) { if (node->mn_flags & F_DUPDATA) {
if (m3->mc_xcursor->mx_cursor.mc_flags & C_INITIALIZED) if (m3->mc_xcursor->mx_cursor.mc_flags & C_INITIALIZED) {
m3->mc_xcursor->mx_cursor.mc_pg[0] = NODEDATA(node); if (!(node->mn_flags & F_SUBDATA))
else m3->mc_xcursor->mx_cursor.mc_pg[0] = NODEDATA(node);
} else
mdb_xcursor_init1(m3, node); mdb_xcursor_init1(m3, node);
} }
} }