upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-19 21:32:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of ssh://git-master.openldap.org/~git/git/openldap

Browse source
This commit is contained in:
Quanah Gibson-Mount 2016-02-05 17:56:54 -06:00
commit 67fe3c50a7
4 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/liblmdb/CHANGES
View file

@ -1,6 +1,6 @@
LMDB 0.9 Change Log
LMDB 0.9.18 Release Engineering
LMDB 0.9.18 Release (2016/02/05)
Fix robust mutex detection on glibc 2.10-11 (ITS#8330)
Fix page_search_root assert on FreeDB (ITS#8336)
Fix MDB_APPENDDUP vs. rewrite(single item) (ITS#8334)

2
libraries/liblmdb/lmdb.h
View file

@ -204,7 +204,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 "December 19, 2015"
#define MDB_VERSION_DATE "February 5, 2016"
/** A stringifier for the version info */
#define MDB_VERSTR(a,b,c,d) "LMDB " #a "." #b "." #c ": (" d ")"

2
libraries/liblmdb/mdb.c
View file

@ -9295,7 +9295,7 @@ mdb_env_copy2(MDB_env *env, const char *path, unsigned int flags)
#ifdef _WIN32
rc = utf8_to_utf16(lpath, -1, &wpath, NULL);
if (rc)
return rc;
goto leave;
newfd = CreateFileW(wpath, GENERIC_WRITE, 0, NULL, CREATE_NEW,
FILE_FLAG_NO_BUFFERING|FILE_FLAG_WRITE_THROUGH, NULL);
free(wpath);

5
servers/slapd/back-mdb/id2entry.c
View file

@ -398,8 +398,11 @@ int mdb_id2entry_delete(
return rc;
rc = mdb_cursor_get( mvc, &key, NULL, MDB_SET_RANGE );
if (rc && rc != MDB_NOTFOUND)
if (rc) {
if (rc == MDB_NOTFOUND)
rc = MDB_SUCCESS;
return rc;
}
while (*(ID *)key.mv_data == e->e_id ) {
rc = mdb_cursor_del( mvc, MDB_NODUPDATA );
if (rc)