upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-23 08: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:
Quanah Gibson-Mount 2018-02-09 18:49:21 +00:00
commit 735b6c995e
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/liblmdb/CHANGES
View file

@ -1,6 +1,10 @@
LMDB 0.9 Change Log LMDB 0.9 Change Log
LMDB 0.9.22 Engineering
LMDB 0.9.21 Release (2017/06/01) LMDB 0.9.21 Release (2017/06/01)
Fix regression with new db from 0.9.19 (ITS#8760)
Fix liblmdb to build on Solaris (ITS#8612)
Fix xcursor after cursor_del (ITS#8622) Fix xcursor after cursor_del (ITS#8622)
LMDB 0.9.20 (Withdrawn) LMDB 0.9.20 (Withdrawn)

9
libraries/liblmdb/mdb.c
View file

@ -113,6 +113,10 @@ typedef SSIZE_T ssize_t;
/* Most platforms have posix_memalign, older may only have memalign */ /* Most platforms have posix_memalign, older may only have memalign */
#define HAVE_MEMALIGN 1 #define HAVE_MEMALIGN 1
#include <malloc.h> #include <malloc.h>
/* On Solaris, we need the POSIX sigwait function */
#if defined (__sun)
# define _POSIX_PTHREAD_SEMANTICS 1
#endif
#endif #endif
#if !(defined(BYTE_ORDER) || defined(__BYTE_ORDER)) #if !(defined(BYTE_ORDER) || defined(__BYTE_ORDER))
@ -9754,8 +9758,11 @@ int mdb_dbi_open(MDB_txn *txn, const char *name, unsigned int flags, MDB_dbi *db
MDB_node *node = NODEPTR(mc.mc_pg[mc.mc_top], mc.mc_ki[mc.mc_top]); MDB_node *node = NODEPTR(mc.mc_pg[mc.mc_top], mc.mc_ki[mc.mc_top]);
if ((node->mn_flags & (F_DUPDATA|F_SUBDATA)) != F_SUBDATA) if ((node->mn_flags & (F_DUPDATA|F_SUBDATA)) != F_SUBDATA)
return MDB_INCOMPATIBLE; return MDB_INCOMPATIBLE;
} else if (! (rc == MDB_NOTFOUND && (flags & MDB_CREATE))) { } else {
if (rc != MDB_NOTFOUND || !(flags & MDB_CREATE))
return rc; return rc;
if (F_ISSET(txn->mt_flags, MDB_TXN_RDONLY))
return EACCES;
} }
/* Done here so we cannot fail after creating a new DB */ /* Done here so we cannot fail after creating a new DB */