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
4c8f5761
Commit
4c8f5761
authored
Dec 21, 2013
by
Hallvard Furuseth
Browse files
Fix commit "Raise safe max MDB_MAXKEYSIZE."
I.e.
d69d2ce2
, it left out some changes.
parent
a2ed0364
Changes
1
Hide whitespace changes
Inline
Side-by-side
libraries/liblmdb/mdb.c
View file @
4c8f5761
...
...
@@ -4507,8 +4507,6 @@ mdb_node_search(MDB_cursor *mc, MDB_val *key, int *exactp)
}
#endif
assert
(
nkeys
>
0
);
low
=
IS_LEAF
(
mp
)
?
0
:
1
;
high
=
nkeys
-
1
;
cmp
=
mc
->
mc_dbx
->
md_cmp
;
...
...
@@ -4571,7 +4569,7 @@ mdb_node_search(MDB_cursor *mc, MDB_val *key, int *exactp)
node
=
NODEPTR
(
mp
,
i
);
}
if
(
exactp
)
*
exactp
=
(
rc
==
0
);
*
exactp
=
(
rc
==
0
&&
nkeys
>
0
);
/* store the key index */
mc
->
mc_ki
[
mc
->
mc_top
]
=
i
;
if
(
i
>=
nkeys
)
...
...
@@ -5968,7 +5966,8 @@ prep_subDB:
rdata
=
&
xdata
;
flags
|=
F_DUPDATA
;
do_sub
=
1
;
mdb_node_del
(
mc
->
mc_pg
[
mc
->
mc_top
],
mc
->
mc_ki
[
mc
->
mc_top
],
0
);
if
(
!
insert
)
mdb_node_del
(
mc
->
mc_pg
[
mc
->
mc_top
],
mc
->
mc_ki
[
mc
->
mc_top
],
0
);
goto
new_sub
;
}
current:
...
...
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