Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Joe Martin
OpenLDAP
Commits
c73f5b78
Commit
c73f5b78
authored
Feb 09, 2018
by
Quanah Gibson-Mount
Browse files
Merge remote-tracking branch 'origin/mdb.RE/0.9' into OPENLDAP_REL_ENG_2_4
parents
762f36e0
e20e3079
Changes
2
Hide whitespace changes
Inline
Side-by-side
libraries/liblmdb/CHANGES
View file @
c73f5b78
LMDB 0.9 Change Log
LMDB 0.9.22 Engineering
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)
LMDB 0.9.20 (Withdrawn)
...
...
libraries/liblmdb/mdb.c
View file @
c73f5b78
...
...
@@ -113,6 +113,10 @@ typedef SSIZE_T ssize_t;
/* Most platforms have posix_memalign, older may only have memalign */
#define HAVE_MEMALIGN 1
#include
<malloc.h>
/* On Solaris, we need the POSIX sigwait function */
#if defined (__sun)
# define _POSIX_PTHREAD_SEMANTICS 1
#endif
#endif
#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
]);
if
((
node
->
mn_flags
&
(
F_DUPDATA
|
F_SUBDATA
))
!=
F_SUBDATA
)
return
MDB_INCOMPATIBLE
;
}
else
if
(
!
(
rc
==
MDB_NOTFOUND
&&
(
flags
&
MDB_CREATE
)))
{
return
rc
;
}
else
{
if
(
rc
!=
MDB_NOTFOUND
||
!
(
flags
&
MDB_CREATE
))
return
rc
;
if
(
F_ISSET
(
txn
->
mt_flags
,
MDB_TXN_RDONLY
))
return
EACCES
;
}
/* Done here so we cannot fail after creating a new DB */
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment