Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Joe Martin
OpenLDAP
Commits
0fc0f8ac
Commit
0fc0f8ac
authored
Apr 29, 2015
by
Quanah Gibson-Mount
Browse files
Merge remote-tracking branch 'origin/mdb.RE/0.9' into OPENLDAP_REL_ENG_2_4
parents
8b51bb31
0fd2214a
Changes
2
Hide whitespace changes
Inline
Side-by-side
libraries/liblmdb/CHANGES
View file @
0fc0f8ac
...
...
@@ -8,6 +8,7 @@ LMDB 0.9.15 Release Engineering
Fix mdb_load with large values (ITS#8066)
Fix to retry writes on EINTR (ITS#8106)
Fix mdb_cursor_del on empty DB (ITS#8109)
Fix MDB_INTEGERDUP key compare (ITS#8117)
Added workaround for fdatasync bug in ext3fs
Build
Don't use -fPIC for static lib
...
...
libraries/liblmdb/mdb.c
View file @
0fc0f8ac
...
...
@@ -7076,13 +7076,15 @@ mdb_xcursor_init1(MDB_cursor *mc, MDB_node *node)
mx
->
mx_db
.
md_flags
|=
MDB_INTEGERKEY
;
}
}
DPRINTF
((
"Sub-db -%u root page %"
Z
"u"
,
mx
->
mx_cursor
.
mc_dbi
,
mx
->
mx_db
.
md_root
));
mx
->
mx_dbflag
=
DB_VALID
|
DB_DIRTY
;
/* DB_DIRTY guides mdb_cursor_touch */
#if UINT_MAX < SIZE_MAX
if
(
mx
->
mx_dbx
.
md_cmp
==
mdb_cmp_int
&&
mx
->
mx_db
.
md_pad
==
sizeof
(
size_t
))
if
(
mc
->
mc_dbx
->
md_dcmp
==
mdb_cmp_int
&&
mx
->
mx_db
.
md_pad
==
sizeof
(
size_t
))
{
mc
->
mc_dbx
->
md_dcmp
=
mdb_cmp_clong
;
mx
->
mx_dbx
.
md_cmp
=
mdb_cmp_clong
;
}
#endif
DPRINTF
((
"Sub-db -%u root page %"
Z
"u"
,
mx
->
mx_cursor
.
mc_dbi
,
mx
->
mx_db
.
md_root
));
mx
->
mx_dbflag
=
DB_VALID
|
DB_DIRTY
;
/* DB_DIRTY guides mdb_cursor_touch */
}
/** Initialize a cursor for a given transaction and database. */
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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