Skip to content
Snippets Groups Projects
Commit 6e44861b authored by Howard Chu's avatar Howard Chu Committed by Quanah Gibson-Mount
Browse files

ITS#7904 init wwctx earlier

parent d871d328
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
servers/slapd/back-mdb/search.c
+ 11
− 11
View file @ 6e44861b
...@@ -682,6 +682,17 @@ dn2entry_retry: ...@@ -682,6 +682,17 @@ dn2entry_retry:
tentries = ncand; tentries = ncand;
} }
wwctx.flag = 0;
/* If we're running in our own read txn */
if ( moi == &opinfo ) {
cb.sc_writewait = mdb_writewait;
cb.sc_private = &wwctx;
wwctx.txn = ltid;
wwctx.mcd = NULL;
cb.sc_next = op->o_callback;
op->o_callback = &cb;
}
if ( get_pagedresults( op ) > SLAP_CONTROL_IGNORED ) { if ( get_pagedresults( op ) > SLAP_CONTROL_IGNORED ) {
PagedResultsState *ps = op->o_pagedresults_state; PagedResultsState *ps = op->o_pagedresults_state;
/* deferred cookie parsing */ /* deferred cookie parsing */
...@@ -740,17 +751,6 @@ dn2entry_retry: ...@@ -740,17 +751,6 @@ dn2entry_retry:
cscope = 1; /* skip original base */ cscope = 1; /* skip original base */
} else { } else {
id = mdb_idl_first( candidates, &cursor ); id = mdb_idl_first( candidates, &cursor );
wwctx.mcd = NULL;
}
wwctx.flag = 0;
/* If we're running in our own read txn */
if ( moi == &opinfo ) {
cb.sc_writewait = mdb_writewait;
cb.sc_private = &wwctx;
wwctx.txn = ltid;
cb.sc_next = op->o_callback;
op->o_callback = &cb;
} }
while (id != NOID) while (id != NOID)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment