Howard Chu
4b49291653
Add _M_IX86 macro for MSVC
2013-05-25 10:16:55 -07:00
Howard Chu
a3de7c29ae
ITS#7604 fix modrdn, base-scope search
2013-05-24 11:08:25 -07:00
Howard Chu
1748f03041
ITS#7588 fix possible NULL-deref in prev commit
2013-05-24 08:23:44 -07:00
Stef Walter
ffe383c27b
ITS#7583 Fix ldap_init_fd() for LDAP_PROTO_UDP
...
ldap_init_fd() tried to handle UDP sockets but was missing
certain key pieces to make it work. Fill in the address and
set the UDP flag correctly.
2013-05-23 12:40:09 -07:00
Howard Chu
63312f109f
ITS#7582 CLDAP, avoid ref to uninit'd memory
2013-05-23 12:36:15 -07:00
Howard Chu
e31c7d3b31
ITS#7594 De-init other subcursors in page_touch
2013-05-23 12:17:21 -07:00
Howard Chu
3d5e7ef0d2
ITS#7581 more for prev commit
2013-05-23 11:45:05 -07:00
Howard Chu
82d7e9d8ab
ITS#7581 fix back-meta config checks
...
Allow base entry to be added online with targets
added later. Add SLAP_SERVER_RUNNING flag to note
that main slap_startup has already occurred.
2013-05-23 10:54:50 -07:00
Hallvard Furuseth
92fe958805
Drop unused liblmdb MIDL-range support.
2013-05-21 23:58:57 +02:00
Hallvard Furuseth
feaeab0c04
Factor out mdb_find_oldest,mdb_dlist_free,dirty_list.
...
Do not rescan reader table (mdb_find_oldest) after "goto again".
Skip clearing dirty_list[nonzero].mid in mdb_dlist_free(); it
was not done in mdb_reset0() anyway.
2013-05-21 23:55:13 +02:00
Hallvard Furuseth
5ea1cd8f6d
mdb_stat cleanup.
...
Exit with success when there was no failure.
Do not use data containing NUL as a DB name (which is a C string).
2013-05-21 23:48:27 +02:00
Hallvard Furuseth
a1b16ce5f0
ITS#7598 Tweak MDB_<NEXT/PREV>_NODUP,fix mdb_stat.
...
MDB_NEXT_NODUP, MDB_PREV_NODUP: Allow for non-MDB_DUPSORT databases.
No mdb.c code changes needed.
mdb_stat.c: Use MDB_NEXT_NODUP, to avoid a crash with a DUPSORT mainDB.
2013-05-21 22:44:51 +02:00
Hallvard Furuseth
1b6d7ee7e1
ITS#7598 mdb_dbi_open(named DB): Check mainDB flags.
...
Reject attempts to open named databases if the main
database has flag MDB_DUPSORT or MDB_INTEGERKEY.
DUPSORT would require an xcursor for the DB, INTEGERKEY
would expect the DB name to be a binary integer.
2013-05-21 19:04:52 +02:00
Hallvard Furuseth
a2ce25482a
ITS#7515 Fix nested txn touch of subpage/ovpage.
...
mdb_page_touch(): Don't touch a subpage, replacing with non-subpage.
mdb_cursor_put(): Don't overwrite ancestor txn's dirty overflow page.
2013-05-20 23:12:52 +02:00
Hallvard Furuseth
5bdf2aae6e
Tweak mdb_page_malloc(),mdb_page_get() semantics.
...
mdb_page_malloc(): Add "number of pages" parameter.
mdb_page_get(): Add output param for how page was found.
Do not set return params on error.
mdb_cursor_put(): Catch mdb_page_get() error.
Prepares for next commit, no change in caller behavior other
than on mdb_page_get error.
2013-05-20 23:12:26 +02:00
Hallvard Furuseth
2eb50b1d2e
More ITS#7589 followup: OVPAGES() -> mp_pages.
2013-05-19 19:08:07 +02:00
Hallvard Furuseth
e4ce404992
More ITS#7589: Fix prev commit.
...
mp_pages gives #pages in the ovpage. OVPAGES() no longer does.
2013-05-19 18:38:13 +02:00
Hallvard Furuseth
0cdd9dffdd
ITS#7589 mdb_cursor_put(): Update ovpage nodesize.
...
Update the nodesize when overwriting an overflow page.
As before, do not attempt to shrink the page.
2013-05-17 19:31:17 +02:00
Howard Chu
a8c1438688
ITS#7577 more alias deref checks
2013-05-17 09:15:36 -07:00
Howard Chu
37c8b35ebd
Cleanup, fix syncrepl config errmsg
2013-05-17 07:51:23 -07:00
Howard Chu
5ba27410ae
Merge remote-tracking branch 'origin/mdb.master'
2013-05-16 17:23:29 -07:00
Howard Chu
833cd905b7
Include <netinet/in.h> for Solaris 8
...
Needed for <resolv.h>, which is needed for BYTE_ORDER.
2013-05-15 11:50:40 -07:00
Howard Chu
81f4d50c77
Merge remote-tracking branch 'origin/mdb.master'
2013-05-14 17:12:33 -07:00
Howard Chu
7233bc295b
Fix mdb_page_split - nested split
...
If updating a page's separator triggers a split in its parent,
we may have missed adjusting the parent's cursor position.
2013-05-14 16:57:50 -07:00
Howard Chu
1105aa35ba
Doxygen cleanup
2013-05-13 12:36:47 -07:00
Howard Chu
68cb9ae250
ITS#7588 fix double-free for sorted paged search
2013-05-13 08:12:40 -07:00
Howard Chu
4a6adbf589
Merge remote-tracking branch 'origin/mdb.master'
2013-05-10 13:04:44 -07:00
Howard Chu
9ebd5992c9
Fix 66c839f029
...
Forgot #include <errno.h>
2013-05-10 05:56:16 -07:00
Howard Chu
66c839f029
Refactor mdb_midl_append, add mdb_midl_grow()
2013-05-09 17:27:29 -07:00
Hallvard Furuseth
2d6aed7537
ITS#7515 Fix nested transaction error handling.
...
mdb_txn_begin(): Do not free(mt_free_pgs), it needs mdb_midl_free().
mdb_txn_commit(): Catch commit(child) error.
2013-05-05 15:13:31 +02:00
Hallvard Furuseth
521fdb00cc
Fix mdb_env_close(unopened MDB_env).
...
Do not try to scan me_dbxs in a closed/never-opened MDB_env.
Broken by 7d643d3acb
and 151c416b46
.
2013-05-05 14:26:05 +02:00
Hallvard Furuseth
0b9a208530
Simplify/cleanup mdb_cursor_init, C_ALLOCD.
...
No real change.
mdb_cursor_init() checks if it needs mx, so pass it unconditionally.
Set C_ALLOCD for shadow cursors, for clarity. (It was always set as
it should anyway from the origin cursor, which would have C_ALLOCD.)
2013-05-04 12:53:43 +02:00
Hallvard Furuseth
f355de0298
MDB warning cleanup.
...
Unused function when MDB_DEBUG. Unused 'excl' param.
2013-05-04 12:41:28 +02:00
Hallvard Furuseth
b389341b4b
mdb_dcmp(): Assume the database has MDB_DUPSORT.
...
There was little point in returning EINVAL when not: Comparing (A,B)
and (B,A) would claim (A > B && B > A), which could confuse callers.
2013-05-04 12:34:49 +02:00
Hallvard Furuseth
91a93004ce
Update MDB doc: Cursors, DB handles, data lifetime
2013-05-04 12:34:20 +02:00
Hallvard Furuseth
385889b0be
Allow mdb_cursor_close() after readonly txn ends.
...
Catch mdb_cursor_renew(write txn's cursor). Add flag C_UNTRACK, so
mdb_cursor_close need not peek inside a possibly-freed readonly txn.
2013-05-04 12:34:02 +02:00
Hallvard Furuseth
17ffe9c992
Close cursors when commit(writer). Factor out code.
...
Close remaining cursors when committing a write txn. The doc says this
happens, and it avoids cursor tracking when updating mainDB + freeDB.
Rename mdb_cursor_merge() -> mdb_cursors_close() for code reuse,
and add a merge option. Simplify its loop a bit.
Factor out cleanup of DBIs.
2013-05-04 12:33:06 +02:00
Hallvard Furuseth
dca0cef678
Plug txn leak and MDB_NOTLS slot leaks on error.
...
On mdb_env_copy() error: Abort the txn.
On mdb_txn_renew0() error: Release new MDB_NOTLS reader slot.
2013-05-04 12:31:31 +02:00
Hallvard Furuseth
f45d40a88b
Cleaner "Support mdb_txn_abort(a reset txn)".
...
Redo 8a562f560e
so !mt_dbxs indicates
"txn was reset", so mt_numdbs gets one magic value instead of two.
2013-05-04 10:03:19 +02:00
Hallvard Furuseth
151c416b46
Update fixes for dbi_open/close, ITS#7515.
...
Reset me_dbflags[dbi] when closing DBI, to get rid of MDB_VALID flag.
mdb_env_close(): Re-fix DB-name memleak. DBIs > me_numdbs may exist.
2013-05-04 10:03:19 +02:00
Howard Chu
21da623bf4
Allow reading freelist while working on it
...
The circular dependency issues appear to have been resolved.
Still, need to watch closely, maybe revert this change if
problems arise.
2013-05-01 22:45:15 -07:00
Howard Chu
054812517f
Merge remote branch 'origin/mdb.master'
2013-04-30 23:18:01 -07:00
Howard Chu
568c22c4cc
Avoid assert
...
Due to underfilled branch page. We're in the process of merging/moving
nodes to it because we already know it's underfilled. Took this approach
rather than just removing the assert in mdb_page_search_root, because
that assert may yet catch other situations we don't know about.
(Although, it has been there since the original commit of mdb.c and
has never triggered any other times...)
2013-04-30 21:09:09 -07:00
Hallvard Furuseth
37bd48a618
Plug mdb_cursor_renew() memleak
2013-04-30 21:06:36 -07:00
Howard Chu
201ddbe3e4
ITS#7577 more for previous commit
2013-04-28 12:47:14 -07:00
Howard Chu
fb537d747c
ITS#7577 alias fixes
2013-04-28 12:25:58 -07:00
Ted C. Cheng
d3633632e1
ITS#7513 added TCP keepalive support to back-meta
2013-04-24 01:22:17 -07:00
Howard Chu
1e68029078
Drop ldap_int_sasl_mutex
...
It was introduced for Cyrus 1.5 in 2001; we've been on 2.x since 2002 and
Cyrus does its own locking when needed.
2013-04-24 00:52:52 -07:00
Howard Chu
9381d04b87
Don't expire a conn if it's still referenced
2013-04-24 00:27:26 -07:00
Jorge Perez Burgos
69f4f4b673
ITS#7524 make sure binding flag is set before trying to bind
2013-04-24 00:25:04 -07:00